959 Commits

Author	SHA1	Message	Date
Nordsoft91	802e1bb961	Merge pull request #3042 from Laserlicht/crash_preview ... [fix] crash with custom campaign preview	2023-10-13 10:57:02 +02:00
Nordsoft91	ab36692847	Merge pull request #3037 from Laserlicht/missing_res	2023-10-13 10:36:33 +02:00
nordsoft	fadf086e61	Fix review comments	2023-10-12 13:30:01 +02:00
nordsoft	7ccd4cdcb2	Refactor quests progress	2023-10-11 21:10:42 +02:00
Nordsoft91	ecd01fd53c	Merge pull request #3039 from Laserlicht/townhall_click	2023-10-11 18:43:59 +02:00
Laserlicht	abab917ef9	fix crash with custom campaign preview	2023-10-11 11:23:38 +02:00
nordsoft	bb238f9b72	New quests work	2023-10-10 23:44:29 +02:00
Laserlicht	8a3e58cd5e	red is the most liked color	2023-10-10 23:15:40 +02:00
Laserlicht	926bf71814	make townhall clickable	2023-10-10 21:02:40 +02:00
Laserlicht	25f7bb40d0	new layout	2023-10-09 22:50:07 +02:00
Laserlicht	fa9d5e9971	show missing resources	2023-10-09 21:43:43 +02:00
nordsoft	d7d435dcb7	Add game pause	2023-10-08 16:03:57 +02:00
Ivan Savenko	b75a67ef7c	Merge pull request #2973 from IvanSavenko/identifier_explicit_constructor ... Improvements to type safety of Identifier class	2023-10-05 00:33:07 +03:00
Ivan Savenko	037efdf5fc	Improvements to type safety of Identifier class ... - Constructor of Identifier from integer is now explicit - Lobby hero/town selection now uses Identifiers instead of int's - Removed serialization workaround for hero portraits - Added dummy objects for custom heroes portraits for ID resolver to use - HeroInstance now stores portrait ID only in case of custom portrait - Fixed loading of campaign heroes portraits on RoE maps	2023-10-04 18:05:23 +03:00
Ivan Savenko	39a92cdde3	Add query for dwellings dialog	2023-10-04 17:47:12 +03:00
Ivan Savenko	898733eed7	Added Query to track visit duration for Taverns and Markets	2023-10-04 17:47:12 +03:00
Ivan Savenko	e322d0a084	Merge pull request #2966 from IvanSavenko/simplify_ui_lock ... Simplified locking of game UI state	2023-10-04 16:50:23 +03:00
Laserlicht	ec8580b99e	Merge branch 'develop' into patch-4map_overview_rework	2023-10-02 21:03:16 +02:00
Laserlicht	12ca3ea0ec	pos from texture	2023-10-01 19:44:04 +02:00
Laserlicht	cbd014ac88	code review	2023-10-01 17:35:56 +02:00
Laserlicht	23b8a321f6	file ending	2023-10-01 00:46:29 +02:00
Laserlicht	648a37310f	description	2023-10-01 00:35:11 +02:00
Laserlicht	65c21064b5	added var	2023-10-01 00:18:25 +02:00
Laserlicht	58dfc55ca3	only calc minimaps once	2023-09-30 23:50:27 +02:00
Laserlicht	61aae7bccc	code review	2023-09-30 22:49:22 +02:00
Laserlicht	8b835c9253	load game support	2023-09-30 20:03:33 +02:00
Laserlicht	c6adcc40f5	add date; cleanup	2023-09-30 17:56:51 +02:00
Laserlicht	79e66c38df	layout	2023-09-30 17:14:22 +02:00
Laserlicht	718bafc8af	map overview rework	2023-09-30 15:05:12 +02:00
nordsoft	0ac893b80f	Rumors meta string	2023-09-27 23:22:45 +02:00
Ivan Savenko	d6b9fa8fbd	Replaced CPlayerInterface::pim with CGuiHandler::interfaceLock ... - Removed CPlayerInterface::pim since this lock does not actually protects LOCPLINT but rather entire game UI state - added more logical CGuiHandler::interfaceLock - interface lock is now non-recursive and is locked only once by initial caller that want to access GUI	2023-09-27 18:33:52 +03:00
Ivan Savenko	97097c20ad	Merge pull request #2874 from SoundSSGood/exchange-window-update ... Exchange window update	2023-09-27 15:50:52 +03:00
Ivan Savenko	efe3393408	Merge pull request #2947 from Laserlicht/enableUiEnhancements_button ... enableUiEnhancements button	2023-09-27 15:47:25 +03:00
Laserlicht	7cf654992f	code review	2023-09-25 16:34:36 +02:00
Laserlicht	5061792cce	enableUiEnhancements button	2023-09-25 13:11:08 +02:00
Laserlicht	28f4046937	ready	2023-09-25 01:04:06 +02:00
Laserlicht	3e4a5b7d80	border and variable	2023-09-25 00:31:32 +02:00
Laserlicht	a6b68be2df	offsets	2023-09-24 23:50:50 +02:00
Laserlicht	8b5c9db21b	basic offset	2023-09-24 23:15:09 +02:00
Laserlicht	240d291de9	big spellbook	2023-09-24 22:24:51 +02:00
Ivan Savenko	42d9ba6c82	Merge pull request #2877 from IvanSavenko/simturn_fixes ... Changes for simturns support	2023-09-20 22:09:25 +03:00
Ivan Savenko	7b37c2353a	Merge pull request #2865 from IvanSavenko/market_ownership_check_fix ... Cleaned up and fixed ownership checks for market netpack	2023-09-19 23:43:33 +03:00
Ivan Savenko	2af7d7c085	Ignore garrison update events of another towns for our castleInt	2023-09-19 19:24:35 +03:00
SoundSSGood	6280e778dc	fix build	2023-09-19 16:04:37 +03:00
SoundSSGood	9cc623c981	Fixed move checks. Backpack buttons.	2023-09-19 13:31:59 +03:00
SoundSSGood	f47def3588	refactoring	2023-09-19 13:31:57 +03:00
SoundSSGood	a83f290e13	bulk move artifacts only equipped, only backpack	2023-09-19 13:31:42 +03:00
Ivan Savenko	3d04e9c9ed	Cleaned up and fixed ownership checks for market netpack	2023-09-18 17:22:30 +03:00
Laserlicht	5125bcc67f	added probabilities	2023-09-17 23:01:18 +02:00
Laserlicht	7978e5a9b7	adjusted army and warmachine space	2023-09-17 21:55:35 +02:00
Laserlicht	21f37cfafb	simplified	2023-09-17 21:41:55 +02:00
Laserlicht	05fad115b5	Added new Widgets an functions for simplification	2023-09-17 20:34:31 +02:00
Laserlicht	d33101187b	simplify	2023-09-17 16:55:26 +02:00
Laserlicht	a994fa00aa	fixes; translation	2023-09-17 16:15:17 +02:00
Laserlicht	69da4d59bf	basic function ready	2023-09-17 15:28:05 +02:00
Laserlicht	cfc5bac540	layout	2023-09-17 14:31:07 +02:00
Laserlicht	59b5c46a32	right side draft	2023-09-17 13:22:39 +02:00
Laserlicht	79e872da68	left side ready	2023-09-17 04:10:08 +02:00
Laserlicht	b674682fe3	left side	2023-09-17 03:21:29 +02:00
Laserlicht	73fe924544	draw background	2023-09-17 02:14:03 +02:00
Laserlicht	ff96b1af0a	initial hero overview	2023-09-17 00:32:10 +02:00
Nordsoft91	717a765123	Merge pull request #2813 from Laserlicht/textcolor ... Textcolor support	2023-09-16 14:12:17 +02:00
Laserlicht	063c7f3ca0	move function; optional; json static	2023-09-15 15:27:26 +02:00
Laserlicht	922a775108	Update CMessage.h	2023-09-15 15:27:26 +02:00
Laserlicht	f5505c9f6d	support for predefined colors	2023-09-15 15:27:26 +02:00
Laserlicht	f776422c67	color linesplit	2023-09-15 15:27:26 +02:00
Laserlicht	d948cb72a0	Alignment	2023-09-15 15:27:26 +02:00
Laserlicht	39838fdd3c	extend for all selections	2023-09-15 15:24:17 +02:00
Laserlicht	03316c62bf	Easy choosing for a secondary skill in Level Up Dialog by double clicking it	2023-09-15 15:24:17 +02:00
Ivan Savenko	f8541d0ae4	Merge branch 'vcmi/master' into 'vcmi/develop'	2023-09-15 13:59:02 +03:00
Dydzio	56c969be4f	Fix commanders requirements for special skills to match WoG	2023-09-13 23:08:22 +02:00
Ivan Savenko	d070953c28	Fix open backpack strings	2023-09-12 21:28:36 +03:00
Ivan Savenko	e8453916cf	Merge remote-tracking branch 'vcmi/beta' into develop	2023-09-08 18:49:06 +03:00
Ivan Savenko	72858cd0d8	Merge pull request #2768 from IvanSavenko/cherry_picked_fixes ... (1.3.2) Cherry picked fixes	2023-09-08 13:15:34 +03:00
SoundSSGood	f1a6116088	CHeroArea fix	2023-09-07 11:54:50 +03:00
Ivan Savenko	f39fbe5151	Merge pull request #2757 from IvanSavenko/filesystem_refactor ... Filesystem refactor - part 1	2023-09-07 10:51:02 +03:00
Ivan Savenko	41210c1dbf	Client-side support for multiple battles	2023-09-06 16:03:47 +03:00
Gwart	707400d764	#2646 add a null check if creature is empty	2023-09-05 23:32:12 +03:00
SoundSSGood	a7cedea73c	Support for different backpack capacities	2023-09-04 20:59:24 +03:00
Ivan Savenko	1d0e696db6	Added RenderHandler that acts as factory for images and animations	2023-09-04 18:22:34 +03:00
Ivan Savenko	9cfcf5ea19	Fix regressions	2023-09-04 18:22:34 +03:00
Ivan Savenko	0f88b8969b	Removed some usages of std string as resource path	2023-09-04 18:22:34 +03:00
Ivan Savenko	97b7d44c88	Use ResourcePath for video accessing	2023-09-04 18:22:34 +03:00
Ivan Savenko	6f0108e462	Use ResourcePath for referencing texts and json's	2023-09-04 18:22:34 +03:00
Ivan Savenko	823ffa7a07	Always use ResourcePath for referencing images and animations	2023-09-04 18:22:34 +03:00
Gwart	05ba56a873	#2646 add a null check if creature is empty	2023-09-02 16:21:54 +02:00
Ivan Savenko	7255dda624	Merge pull request #2629 from dydzio0614/neutral-creature-popup ... Improve neutral creature adventure map popup	2023-08-31 15:44:19 +03:00
Ivan Savenko	3ce99e8613	Merge pull request #2710 from dydzio0614/artifacts-backpack-graphics ... Split artifacts bag button background and icon	2023-08-31 15:42:50 +03:00
Dydzio	e1e41d1107	Implement TOPCENTER text alignment	2023-08-30 00:35:31 +02:00
Dydzio	03ef5b6b0f	Split artifacts bag button background and icon	2023-08-29 18:53:50 +02:00
Dydzio	bafe8baa15	Fix "ghost" icons in commander grandmaster abilities list	2023-08-29 00:20:44 +02:00
Dydzio	2769782d0a	Fix broken grandmaster ability description updating on select/deselect	2023-08-28 23:49:07 +02:00
Dydzio	dacf6c9d08	Add border around selected commander "grandmaster ability" on levelup	2023-08-28 23:36:45 +02:00
Ivan Savenko	695a51d8c8	Merge remote-tracking branch 'vcmi/beta' into develop	2023-08-28 21:19:53 +03:00
Ivan Savenko	5be87b30c1	Merge pull request #2625 from dydzio0614/artifacts-backpack-gui ... Artifacts backpack GUI	2023-08-28 19:59:11 +03:00
Ivan Savenko	e54287ea5d	Converted remaining identifier to new system	2023-08-25 13:38:02 +03:00
Ivan Savenko	0240ee886d	Converted (almost) all namespace enum's to enum classes	2023-08-25 13:38:02 +03:00
Ivan Savenko	62cd8b12d4	Converted several namespace enums to enum class	2023-08-25 13:38:02 +03:00
Ivan Savenko	43096f0ed1	Merge pull request #2617 from dydzio0614/configurable-autobattle-spells ... Configurable autobattle spells usage	2023-08-25 01:29:16 +03:00
Konstantin	d746a96d55	vcmi: use SpellSchool identifier instead of enum ... Use identifier instead of enum inside callbacks. It is better and more expandable solution.	2023-08-23 17:53:09 +03:00
Konstantin	344593e891	vcmi: made some CSpell properties private ... There are getters for it.	2023-08-23 17:53:08 +03:00
Konstantin	8724181a0f	vcmi: spell resistance rework ... Now instead of XXX_IMMUNITY bonuses we have 2 bonuses with spellSchool subtype: SPELL_SCHOOL_IMMUNITY and NEGATIVE_EFFECT_IMMUNITY. All previous bonuses of subtype 0 is covered by SPELL_SCHOOL_IMMUNITY, and all previous bonuses of subtype 1 is covered by NEGATIVE_EFFECT_IMMUNITY. Unit tests are updated accordingly.	2023-08-23 17:52:16 +03:00
Ivan Savenko	44d16b32fe	Use API identical to std classes where possible	2023-08-23 16:32:29 +03:00
Dydzio	28fe28adf5	Fix player coloring	2023-08-21 17:08:15 +02:00
Dydzio	ed12f20609	Improve neutral creature adventure map popup	2023-08-21 14:42:41 +02:00
Dydzio	cab6fb76aa	Draft version of backpack button + new setting for original H3 UI mode	2023-08-20 17:45:43 +02:00
Dydzio	f24910e5d2	Artifacts backpack window GUI improvements	2023-08-20 00:52:03 +02:00
Dydzio	f409b6ced9	Fix counting wood mines starting from 8 in kingdom overview	2023-08-19 21:09:02 +02:00
Dydzio	6bfbe80cc9	Allow toggling quick combat spells usage	2023-08-19 17:23:55 +02:00
Ivan Savenko	f13a53c1d9	Merge remote-tracking branch 'vcmi/beta' into develop	2023-08-12 17:28:47 +03:00
SoundSSGood	119d51d1ef	altar sacrifice all fix	2023-08-11 18:51:59 +03:00
Ivan Savenko	ad2bd897d0	Replace boost::format with MetaString ... Looks like some of H3 localizations don't have string replacements for building / war machine name, resulting in exceptions on formatting attempt. MetaString handles this case silently.	2023-08-11 18:50:39 +03:00
Ivan Savenko	0dca5c45bd	Workaround for potential crash on opening town dwelling with no valid ... creatures	2023-08-06 12:46:29 +03:00
Ivan Savenko	537f9fa048	Merged master into develop	2023-08-03 23:38:32 +03:00
Ivan Savenko	723c674d81	Merge pull request #2447 from IvanSavenko/modding_handler_refactoring ... (develop) Modding handler refactoring	2023-08-02 21:26:05 +03:00
Ivan Savenko	43795c39a5	Replaced all usage of SDL_Color outside of render with ColorRGBA	2023-07-31 21:07:30 +03:00
Ivan Savenko	62fddca21e	Split massive CModHandler class/file into multiple parts: ... - IdentifierStorage is now a separate handler in VLC - Renamed ModHandler::Incompatibility exception to ModIncompatibility - Extracted ModScope namespace from ModHandler - Extracted ModUtilities namespace from ModHandler - Split CModHandler.cpp on per-class basis - Replaced some direct members with unique_ptr to reduce header includes	2023-07-30 22:17:47 +03:00
Ivan Savenko	5d2dd4c633	Show creature popup window on right-click in town fort	2023-07-30 15:29:18 +03:00
Ivan Savenko	01d588ab54	Fix keyboard shortcuts on selection dialogs	2023-07-22 22:29:05 +03:00
Ivan Savenko	a494dc4870	Refactoring of CGarrisonInt	2023-07-21 15:47:42 +03:00
Ivan Savenko	cefbe5152e	Merge pull request #2359 from IvanSavenko/crashfixing ... Fix crashes from 1.2.1 statistics on Google Play	2023-07-21 15:44:37 +03:00
Ivan Savenko	3f4e88c396	Merge pull request #2325 from SoundSSGood/hero-backpack-window ... Hero backpack window prototyping	2023-07-21 15:43:34 +03:00
Ivan Savenko	ddda46a7fd	Merge pull request #2358 from dydzio0614/persistent-hero-info-window ... Add option for persistent hero info window as in HD mod	2023-07-19 14:46:16 +03:00
Ivan Savenko	ab6a4be105	Merge pull request #2357 from SoundSSGood/picked-art-fix ... Fixed hero skills if artifact picked	2023-07-19 14:45:58 +03:00
SoundSSGood	ca977d7105	backpack window slider	2023-07-18 21:01:55 +03:00
Ivan Savenko	c7d88271a9	Removed asynchronous calls from exchange window	2023-07-18 17:31:21 +03:00
Ivan Savenko	317183e00d	Merge branch 'develop' into info-box-army-management	2023-07-18 16:05:09 +03:00
Dydzio	48a72f90f7	Add option for persistent hero info window as in HD mod	2023-07-17 23:25:16 +02:00
SoundSSGood	ff278d5f3a	cleanup unused	2023-07-17 22:26:21 +03:00
SoundSSGood	f33dec9337	picked art fixed	2023-07-17 22:24:43 +03:00
SoundSSGood	b1351d8532	two scrolling modes demo	2023-07-16 21:16:12 +03:00
Dydzio	ee663b1595	Changes from code review	2023-07-16 15:56:42 +02:00
Dydzio	fe26ab4501	Add settings entry, immediately refresh info bar on setting toggle	2023-07-16 14:52:43 +02:00
Ivan Savenko	61750d30c2	Implemented dragging map via left mouse click (off by default)	2023-07-16 12:00:40 +03:00
Dydzio	ea0ee87299	Interactable hero status - alternative infobox component	2023-07-15 23:14:59 +02:00
Dydzio	484d03334c	New garrison interface layout: Reversed two rows + labels below slot	2023-07-15 23:11:21 +02:00
SoundSSGood	9427de6344	initial files	2023-07-15 22:15:32 +03:00
SoundSSGood	3ea6f530ad	backpack window initial	2023-07-15 22:15:32 +03:00
Ivan Savenko	8129cbc514	Allow dismissing hero from town	2023-07-15 16:09:44 +03:00
Ivan Savenko	3e8debc243	Allow dismissing heroes from kingdom overview window	2023-07-15 16:09:44 +03:00
Ivan Savenko	8a92941681	Allow merging stack on recruitment to give place for recruited unit	2023-07-15 16:09:44 +03:00
Ivan Savenko	8dc009e2c9	Always show correct game resolution in settings, unaffected by scaling	2023-07-15 16:09:44 +03:00
Ivan Savenko	e4e353449e	Recreate screen on UI scaling change	2023-07-15 16:09:44 +03:00
Ivan Savenko	9ef959a7f8	Merge pull request #2310 from IvanSavenko/left_click_refactor ... Left click input refactor	2023-07-13 13:03:06 +03:00
Ivan Savenko	b30db5fc1f	Merge pull request #2301 from Laserlicht/haptic_feedback ... Haptic feedback	2023-07-13 12:56:54 +03:00
Michael	1abd8bbe92	Update client/windows/settings/GeneralOptionsTab.cpp ... Co-authored-by: Ivan Savenko <saven.ivan@gmail.com>	2023-07-12 22:56:35 +02:00
Ivan Savenko	9acab48bc3	Merge pull request #2268 from SoundSSGood/CArtifactInstance-rework ... CArtifact CArtifactInstance refactoring	2023-07-11 14:36:08 +03:00
Ivan Savenko	18db944083	Replaced clickReleased with clickPressed where applicable in H3	2023-07-09 17:48:25 +03:00
Michael	ff51b8f46b	Setting for haptic feedback	2023-07-08 18:47:38 +02:00
Ivan Savenko	ca889a5c2a	Replaced clickLeft with clickPressed clickReleased methods	2023-07-08 14:33:04 +03:00