5275 Commits

Author	SHA1	Message	Date
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	17d3d663ee	Converted creature ID and spell ID to new form	2023-08-25 13:38:02 +03:00
Ivan Savenko	ec8d31bbfc	First step at unifying game identifiers code	2023-08-25 13:38:01 +03:00
SoundSSGood	730ab449b6	backpack window fix	2023-08-25 10:08:08 +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
Ivan Savenko	b0eec85aca	Merge pull request #2632 from rilian-la-te/resist-rework-pt1 ... Spell resistance rework: part 1	2023-08-25 01:13:57 +03:00
Ivan Savenko	f9410145d6	Fix handling of "7 days without town" loss condition	2023-08-24 23:34:33 +03:00
Ivan Savenko	b057230d85	Fix quest log button block status	2023-08-24 23:34:33 +03:00
Ivan Savenko	c171a3d6be	Fix resource bar UI in hotseat	2023-08-24 23:34:33 +03:00
Ivan Savenko	97ef69c9ab	Remove incorrect message on another player defeat	2023-08-24 23:34:33 +03:00
Ivan Savenko	e40dc76304	Fix giving commands in battles in hotseat	2023-08-24 23:34:33 +03:00
Nordsoft91	979cf129bc	Merge pull request #2637 from Laserlicht/autosave	2023-08-25 00:09:49 +04:00
Nordsoft91	07210973f4	Merge pull request #2653 from Nordsoft91/turn-timer	2023-08-25 00:09:00 +04:00
Michael	37e2292720	count unicode chars to extra function	2023-08-24 18:34:00 +02:00
Andrii Danylchenko	f459c13bc3	Merge pull request #2661 from Nordsoft91/loading-bar ... Fix removing loading screen	2023-08-24 16:34:11 +03:00
nordsoft	6efccb2503	Fix removing loading screen	2023-08-24 15:01:43 +04:00
Michael	e6f1677d3a	missing header...	2023-08-23 23:34:33 +02:00
Michael	9f68a0bf49	avoid destroing utf-8; no extra Autosave text	2023-08-23 23:25:48 +02:00
Michael	485af4b4b5	avoid forbidden chars in path	2023-08-23 22:23:05 +02:00
Michael	b22a9ff2d0	Merge branch 'develop' into autosave	2023-08-23 21:39:04 +02:00
Michael	1586b9fbd1	possibility to restart	2023-08-23 21:37:44 +02:00
Michael	4784ae94b5	revert uuid	2023-08-23 20:03:40 +02:00
Ivan Savenko	a5501abd01	Fix skipping battle intro via click	2023-08-23 18:46:56 +03:00
Ivan Savenko	81242d3500	Fixed ending of battles due to retreat/surrender	2023-08-23 18:46:56 +03:00
nordsoft	b8ab64f448	Make options tab configurable	2023-08-23 19:29:50 +04: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	3eb19e6ed7	Fix possible unprotected access to battleint	2023-08-23 16:32:29 +03:00
Ivan Savenko	a44c08a847	Slightly better thread names	2023-08-23 16:32:29 +03:00
Ivan Savenko	0613756abc	Remove unused code	2023-08-23 16:32:29 +03:00
Ivan Savenko	dfe8ca3d61	Use more lightweight scoped_lock	2023-08-23 16:32:29 +03:00
Ivan Savenko	44d16b32fe	Use API identical to std classes where possible	2023-08-23 16:32:29 +03:00
Ivan Savenko	87957e74c1	Replaced boost::thread_specific_ptr with thread_local	2023-08-23 16:32:29 +03:00
Ivan Savenko	142889e3a5	Give all threads created by client human-readable name for debug	2023-08-23 16:32:29 +03:00
Nordsoft91	1bad0e96ef	Merge pull request #2635 from Nordsoft91/loading-bar ... Loading progress bar	2023-08-23 17:28:19 +04:00
Michael	d2bbe0f35a	starttime in foldername	2023-08-23 01:47:55 +02:00
Michael	fed9ae5157	Merge branch 'develop' into autosave	2023-08-23 00:37:15 +02:00
Michael	51ba22a631	code review	2023-08-23 00:35:44 +02:00
Nordsoft91	e09b13c00a	Merge pull request #2576 from Nordsoft91/turn-timer ... Implement turn timer feature	2023-08-23 01:48:12 +04:00
nordsoft	937935ce8c	Fix compiling (how does it work on mac?)	2023-08-23 01:20:29 +04:00
Michael	68a1b883eb	autosave folders	2023-08-22 20:43:44 +02:00
nordsoft	dfaf778d16	Redesign loading solution	2023-08-22 20:10:20 +04:00
nordsoft	d9a2a7bfd0	Fix minor points	2023-08-22 16:00:14 +04:00
Nordsoft91	ec4da06b56	Merge pull request #2631 from Laserlicht/date_alignment ... date alignment	2023-08-22 02:00:49 +04:00
nordsoft	d50edc28ab	Merge remote-tracking branch 'upstream/develop' into turn-timer ... # Conflicts: # server/CGameHandler.cpp # server/CGameHandler.h	2023-08-22 00:54:38 +04:00
nordsoft	dbc3a93013	Merge remote-tracking branch 'upstream/develop' into loading-bar ... # Conflicts: # server/CGameHandler.h	2023-08-22 00:46:54 +04:00
nordsoft	b1bfc2239f	Backward compatibility with mods	2023-08-22 00:32:26 +04:00
Michael	0dab3b83a0	date alignment	2023-08-21 20:45:00 +02:00
nordsoft	a60d503078	Fix progress bar	2023-08-21 19:21:32 +04:00
nordsoft	45f13c7964	Progress update on client side	2023-08-21 19:21:27 +04:00
nordsoft	584dd20943	Progress on server side for rmg	2023-08-21 19:21:22 +04:00
Dydzio	28fe28adf5	Fix player coloring	2023-08-21 17:08:15 +02:00
Dydzio	b73f9325ad	Fixes from code review	2023-08-21 16:56:50 +02:00
Ivan Savenko	1c552ba9d9	Remove unused code	2023-08-21 17:55:49 +03:00
Ivan Savenko	013417fb7e	Code cleanup	2023-08-21 17:55:49 +03:00
Ivan Savenko	6297140bf5	Start of stabilization - battles now start correctly	2023-08-21 17:55:49 +03:00
Ivan Savenko	44832f3797	Split BattleProcessor into few more parts	2023-08-21 17:55:49 +03:00
Dydzio	ed12f20609	Improve neutral creature adventure map popup	2023-08-21 14:42:41 +02:00
Nordsoft91	4edee00a97	Merge pull request #2605 from Laserlicht/map_preview ... Map preview	2023-08-21 14:56:21 +04:00
Michael	05a88bd8ac	another try...	2023-08-20 23:34:09 +02:00
Michael	080630b39f	try to fix	2023-08-20 22:22:46 +02:00
Dydzio	b53894ac2d	Add artifact slots backgrounds	2023-08-20 18:57:53 +02:00
Dydzio	cab6fb76aa	Draft version of backpack button + new setting for original H3 UI mode	2023-08-20 17:45:43 +02:00
Michael	5c5576313b	handle long texts better; big window also for only one layer	2023-08-20 16:58:13 +02:00
nordsoft	989a0859ef	Fix tutorial loading	2023-08-20 17:58:40 +04:00
Nordsoft91	ef4fddd0c4	Merge pull request #2570 from Laserlicht/town_selection_window ... Town selection window	2023-08-20 17:37:45 +04:00
Michael	952ce3061b	avoid crash if any error in map	2023-08-20 14:28:10 +02:00
Michael	e3a4c65100	code review	2023-08-20 14:14:47 +02:00
Michael	1d94536299	code review	2023-08-20 13:16:39 +02:00
Michael	52ed824100	add sound; possibility to click outside to close	2023-08-20 13:05:25 +02:00
Ivan Savenko	b92e45d7b4	Merge pull request #2616 from dydzio0614/battle-hero-window-mana-fix ... Fix updating opponent hero spellpoints in battle window	2023-08-20 10:54:30 +03:00
nordsoft	a09cb23a85	Better handling other players for turn timer	2023-08-20 04:06:52 +04: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
nordsoft	314a17cdd9	Paint timer color into player color	2023-08-19 19:45:25 +04:00
Dydzio	6bfbe80cc9	Allow toggling quick combat spells usage	2023-08-19 17:23:55 +02:00
nordsoft	2fff74deea	Remove uninitialized variable	2023-08-19 18:59:31 +04:00
Nordsoft91	4a6deedd5e	Merge pull request #2530 from Nordsoft91/tutorial ... Support tutorial	2023-08-19 18:06:15 +04:00
Dydzio	6cb6a6d785	Fix updating opponent hero spellpoints in battle window	2023-08-18 20:24:31 +02:00
Ivan Savenko	d0b3319f6a	Merge remote-tracking branch 'vcmi/beta' into develop	2023-08-18 15:08:23 +03:00
Michael	8635c24166	fix	2023-08-18 00:15:47 +02:00
Michael	f9fa27b180	fix	2023-08-17 23:40:19 +02:00
Michael	e44f713f01	side by side map; player colors	2023-08-17 23:09:20 +02:00
Michael	af347242b4	fix compile error	2023-08-17 20:34:31 +02:00
Michael	ac64b9f2b5	fix	2023-08-17 18:52:00 +02:00
Michael	077ec65bf6	simplify	2023-08-17 18:15:42 +02:00
Michael	e61dc2ec23	constants	2023-08-17 17:54:53 +02:00
Michael	e1e16018d1	code review first batch	2023-08-17 17:29:31 +02:00
Ivan Savenko	ec0a51bd5c	Fixed border scrolling when game window is maximized	2023-08-17 12:25:02 +03:00
Michael	edc11fd451	Map preview initial draft	2023-08-17 09:56:50 +02:00
Ivan Savenko	074fd42d84	Added missing includes	2023-08-17 10:26:01 +03:00
Nordsoft91	96e820ddac	Merge pull request #2517 from Laserlicht/folders	2023-08-17 10:09:37 +04:00
nordsoft	647c7c15a3	Add sound notification for timer	2023-08-17 01:10:03 +04:00
Michael	71bcc611f5	review	2023-08-15 20:19:13 +02:00
Michael	0452dbd80d	remove copy of cropped asset	2023-08-14 23:08:20 +02:00
Michael	b2c8cab9f1	use playerColored	2023-08-14 22:22:43 +02:00
nordsoft	d26fdaefe4	Battle timer	2023-08-14 23:31:44 +04:00
Tomasz Zieliński	c59014ce18	Merge remote-tracking branch 'origin/beta' into fix_rmg_teams	2023-08-14 18:59:45 +02:00
nordsoft	0c76ae89f8	Revert "Auxiliary commit to revert individual files from e426924930c761b5f10e4fd8e777b55f8db329e2" ... This reverts commit c1d6b2836fca30f99d49012c5ae989cdc5ad0e4f.	2023-08-14 16:33:41 +04:00
nordsoft	e426924930	Close window at time expiring	2023-08-14 15:37:21 +04:00
nordsoft	0c38187916	Fix freezes while turn ends at hero move	2023-08-14 04:06:26 +04:00
Michael	079e8ba1ba	naming	2023-08-14 00:40:12 +02:00
Michael	7bfbfeb48f	missing	2023-08-14 00:16:53 +02:00
nordsoft	3c9c302fd2	TurnTimerInfo	2023-08-14 02:16:25 +04:00
Michael	bb5ada3bb3	not from this PR	2023-08-14 00:10:06 +02:00
Michael	1d76f456ad	change servercode to make it more robust	2023-08-14 00:08:48 +02:00
nordsoft	f01973a4f0	Configurable turn timer	2023-08-14 01:13:37 +04:00
Michael	ae63088564	outline; squared	2023-08-13 22:58:49 +02:00
nordsoft	093e226bff	Fix compilation	2023-08-13 23:50:40 +04:00
Michael	9a63161866	added random; added names	2023-08-13 20:21:09 +02:00
Michael	e66a41e90b	simplify	2023-08-13 19:23:27 +02:00
Michael	c14448ee32	change design	2023-08-13 15:09:48 +02:00
nordsoft	4b1224ec8c	Implement turn timer feature	2023-08-13 14:07:48 +04:00
Ivan Savenko	abf7c48593	Merge pull request #2566 from IvanSavenko/fix_lobby_thread_race ... Fix crash on video playback (and who knows how many more)	2023-08-13 00:45:24 +03:00
Michael	daa8bc547f	icon fix	2023-08-12 23:28:53 +02:00
Michael	f71f4a874b	Grid and Activaed	2023-08-12 22:59:45 +02:00
Michael	b73f9d6e30	calculate size	2023-08-12 21:50:40 +02:00
Michael	18b963f376	fix	2023-08-12 20:31:00 +02:00
Michael	3d08ecf024	rename	2023-08-12 20:02:36 +02:00
Michael	92159e57ef	Update SelectionTab.cpp ... fix possible -1	2023-08-12 19:51:18 +02:00
Michael	8bb7fd31cd	basically running...	2023-08-12 19:33:25 +02:00
Michael	481cd89dc8	drawing	2023-08-12 18:20:44 +02:00
Michael	c40c747ccf	saving states	2023-08-12 17:46:35 +02:00
Michael	876dc28e48	rework	2023-08-12 16:49:42 +02:00
Ivan Savenko	f13a53c1d9	Merge remote-tracking branch 'vcmi/beta' into develop	2023-08-12 17:28:47 +03:00
Ivan Savenko	92ce97bbc7	Merge remote-tracking branch 'vcmi/master' into beta	2023-08-12 16:20:06 +03:00
Michael	bc4d331888	Title	2023-08-12 15:19:40 +02:00
Michael	0c4f4daf70	base rendering	2023-08-12 15:05:26 +02:00
Michael	b4f6c7abab	big images; basic heroes support	2023-08-12 13:19:58 +02:00
Ivan Savenko	626664b8f6	Fix possible thread race on accessing GuiHandler from server handler ... thread without acquiring lock	2023-08-12 14:16:47 +03:00
Ivan Savenko	8cbc52364a	Merge pull request #2496 from IvanSavenko/saves_in_mods ... Allowed loading saves from inside mods	2023-08-12 11:27:15 +03:00
Ivan Savenko	e386309fbc	Merge pull request #2547 from IvanSavenko/instant_fadeout ... Make object fade-out / fade-in instant on instant movement speed	2023-08-12 11:23:26 +03:00
Michael	d0522b0fee	initial window	2023-08-12 02:41:48 +02:00
Michael	f0b60cf166	suggestions; use internally uppercase; fix; fullname	2023-08-11 23:56:20 +02:00
Michael	6ca5518ff1	Buxfix	2023-08-11 20:09:41 +02:00
nordsoft	70d04ad957	Replace thread approach with callback based	2023-08-11 20:04:14 +04:00
Ivan Savenko	20e10cd5ab	Fix potential access to empty std function on hero vs hero combat	2023-08-11 18:52:22 +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	9d7f46f985	Fix crash on right-clicking player flags in RMG UI	2023-08-11 18:50:39 +03:00
Ivan Savenko	631e93e846	Fix missing lock of player interface	2023-08-11 18:50:39 +03:00
SoundSSGood	213eda5e1e	altar sacrifice all fix	2023-08-11 14:19:06 +03:00
Ivan Savenko	8ba3f771be	Merge pull request #2529 from IvanSavenko/hero_defeat_fix ... Fix potential access to empty std function on hero vs hero combat	2023-08-11 11:37:12 +03:00
Ivan Savenko	78bb7230a4	Merge pull request #2512 from IvanSavenko/obstacles_priority_fix ... Fixed rendering priority of battlefield background obstacles	2023-08-11 11:36:44 +03:00
Michael	2d9bb34825	format	2023-08-11 01:49:10 +02:00
Michael	2b093b8850	case handling	2023-08-11 01:46:22 +02:00
Michael	092a0d72a1	whitespace format	2023-08-11 00:19:24 +02:00
Michael	c260ce5814	current folder in first line	2023-08-10 23:52:16 +02:00
Michael	48747eea9d	bigger line for folder	2023-08-10 23:37:19 +02:00
Michael	f24c636d17	code review suggestions	2023-08-10 22:15:32 +02:00
Ivan Savenko	e9fb0c9b8c	Make object fade-out / fade-in instant on instant movement speed	2023-08-10 13:02:34 +03:00
nordsoft	ef7008a753	Unblock UI while tutorial loading	2023-08-10 01:27:13 +04:00
Michael	92fd317a84	erase -> pop_back	2023-08-09 20:27:24 +02:00
nordsoft	f4869cbfb0	Tutorial load game mode	2023-08-09 15:29:48 +04:00
nordsoft	04c0124759	Remove unnecessary strings	2023-08-09 14:59:26 +04:00
nordsoft	1def98a862	Tutorial implemented	2023-08-09 03:54:09 +04:00
Michael	6013549ef8	no old selection	2023-08-09 00:41:13 +02:00
Michael	8693dab9ec	fix filter	2023-08-09 00:13:02 +02:00
Ivan Savenko	dc2135da7f	Fix potential access to empty std function on hero vs hero combat	2023-08-09 00:46:55 +03:00
Michael	bbe04c747d	Folder Icon, Save, Folder on top...	2023-08-08 23:46:30 +02:00
Ivan Savenko	45215f12f3	Merged master into beta	2023-08-08 20:43:47 +03:00
Ivan Savenko	d947c14495	Few more H3 data validation checks	2023-08-08 12:50:16 +03:00
Michael	855b94b316	fix	2023-08-08 02:30:28 +02:00
Michael	8b8006c0e0	bring it to work...	2023-08-08 02:04:06 +02:00
Michael	5e1f1294e5	rework	2023-08-08 00:38:13 +02:00
Ivan Savenko	ed066cb7ba	Fixed possible multithreading races in sound/music callbacks	2023-08-08 00:27:03 +03:00
Ivan Savenko	62a5eeebbc	Fixed rendering priority of battlefield background obstacles	2023-08-07 21:18:43 +03:00
Michael	e5627b4bb7	tests	2023-08-07 00:10:06 +02:00
Ivan Savenko	9bd27c50a0	Allowed loading saves from inside mods	2023-08-06 19:39:55 +03:00
Ivan Savenko	0b99fc0ccb	Show message box when H3 data is missing	2023-08-06 18:16:32 +03:00
Ivan Savenko	6ddac8376d	Fixed possible crash on attempt to load missing font(?)	2023-08-06 17:47:12 +03:00
Ivan Savenko	c524caee5c	Fixed possible uncaught exception on starting map	2023-08-06 17:46:49 +03:00
Ivan Savenko	0c9e2d6fdd	Workaround for crash on map rendering	2023-08-06 14:11:31 +03:00
Ivan Savenko	5faaf175f9	Added debug information to SDL-related crashes	2023-08-06 13:31:10 +03:00
Ivan Savenko	a4ff408c9d	Removed unused code	2023-08-06 13:29:57 +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	b9e804954d	Merge pull request #2462 from IvanSavenko/fix_assertion_failure ... (1.3.1) Fix assertion failure on screen resize	2023-08-05 23:50:27 +03:00
Ivan Savenko	c3d8607c8b	Merge pull request #2466 from IvanSavenko/battle_assertions_fix ... (1.3.1) Fix assertion failures in battle	2023-08-05 23:50:18 +03:00
Ivan Savenko	c8ec0d5419	Added caching for creature icons in garrisons ... More complete version of caching will be done for 1.4 Fixes freezes on hero movement when hota mod is used	2023-08-05 14:26:54 +03:00
Ivan Savenko	ab4fb2a228	Prefer composition over inheritance	2023-08-05 14:25:57 +03:00
Ivan Savenko	00f3804604	Workaround for crash?	2023-08-05 13:39:08 +03:00
Ivan Savenko	537f9fa048	Merged master into develop	2023-08-03 23:38:32 +03:00
Ivan Savenko	57d7dc97bf	Fix assertion failure on swiping during spellcast	2023-08-03 14:21:15 +03:00
Ivan Savenko	3213800097	Fix assertion failure on teleport cast	2023-08-03 14:20:54 +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	3f7e5fcfc3	Fix possible assertion failure on resolution change	2023-08-02 21:23:27 +03:00
Ivan Savenko	791eb1a37b	Added workaround for running game with outdated extras mod from 1.2	2023-08-01 14:47:17 +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	d9e7a8f88a	Merge pull request #2446 from IvanSavenko/bugfixing ... (1.3.0) Bugfixing	2023-07-31 16:21:43 +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	7f72f7a82c	Cleanup server connection code a bit	2023-07-30 20:15:32 +03:00
Ivan Savenko	593b82d178	Removed all references to boost::interprocess library	2023-07-30 20:14:57 +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	d86c0a969d	Fix conflicting market/town hotkeys	2023-07-30 12:34:34 +03:00
Ivan Savenko	a73146751c	Execute cursor changes in main thread on any platform	2023-07-30 12:30:56 +03:00
Michael	aaa115cf4b	Button-Sound -> haptic feedback	2023-07-29 00:11:16 +02:00
Ivan Savenko	6c52293dd9	Merge pull request #2425 from IvanSavenko/fix_combat_replay ... Attempt to fix combat replay queries	2023-07-29 00:03:44 +03:00
Ivan Savenko	4d08a131d3	Reorganization of boost filesystem usage ... - Removed (most of) boost filesystem namespace usings - Replaced boost::filesystem::fstream with std::fstream and different constructor that should be available on any plaftorm	2023-07-28 19:12:04 +03:00
Ivan Savenko	aed8c411fc	Minor rework & cleanup of combat replays	2023-07-27 19:25:55 +03:00
Dydzio	0b5cea0320	Use new adventure map state to detect opponent human turn	2023-07-27 17:26:52 +02:00
Dydzio	ff1a635e9e	Unblock basic adventure map actions (scrolling / right-click) in multiplayer	2023-07-26 21:20:11 +02:00
Ivan Savenko	ff2ae1d2d3	Merge pull request #2414 from IvanSavenko/fix_autocombat_crash ... Fix autocombat crash	2023-07-26 02:02:28 +03:00
Ivan Savenko	32f7a95e38	Use capture by value since thread might start after local method returns	2023-07-25 22:33:59 +03:00
Ivan Savenko	1335a834e2	Merge pull request #2408 from IvanSavenko/remove_log_warning ... Remove log warning	2023-07-25 18:15:52 +03:00
Ivan Savenko	eccd8590f5	Merge pull request #2406 from IvanSavenko/fix_mutex ... Fix game hang/crash on locking mutex	2023-07-25 18:15:37 +03:00
Ivan Savenko	705cdb846d	Merge pull request #2403 from IvanSavenko/error_detection_fix ... Attempt to fix & improve error reporting	2023-07-25 18:15:28 +03:00
Ivan Savenko	823080be86	Fix error on opening map list with hota maps	2023-07-24 23:27:26 +03:00
Ivan Savenko	f827571f9b	Fix assertion failure on exit due to mutex lock	2023-07-24 23:01:44 +03:00
Ivan Savenko	be3ed014a7	Merge pull request #2404 from dydzio0614/autosave-fix ... End turn autosave fix	2023-07-24 22:26:43 +03:00
DjWarmonger	9b3618b664	Merge pull request #2378 from vcmi/default_template_to_random ... Rename default map template to random map template	2023-07-24 19:16:02 +02:00
Dydzio	a4f9cde57d	Fix autosave at end of turn starting with AI turn on load	2023-07-24 18:24:57 +02:00
Ivan Savenko	21e794268b	Attempt to fix & improve error detection: ... - use std::fstream instead of boost::iostreams for properly working flush - removed some catch-all blocks - reduce catch scope of some try/catch blocks to clearly indicate intent	2023-07-24 18:48:56 +03:00
Tomasz Zieliński	d26e46ddfe	Remove old id, replace with randomTemplate	2023-07-24 17:39:32 +02:00
Tomasz Zieliński	6522cec969	Just the notes	2023-07-24 08:44:37 +02:00
Ivan Savenko	a280cc8845	Merge pull request #2384 from IvanSavenko/bugfixing_beta ... Bugfixing iteration	2023-07-24 00:49:34 +03:00
Ivan Savenko	558855b772	Merge pull request #2387 from Laserlicht/patch-3 ... allow clipboard paste	2023-07-24 00:49:19 +03:00
Ivan Savenko	8dd1545e25	Merge pull request #2390 from dydzio0614/hero-window-mana-fix ... Fix for hero info window mana points not getting spent on spellcast - option 1	2023-07-24 00:48:54 +03:00
Michael	ce00069dcd	haptic feedback on radial menu action	2023-07-23 15:17:30 +02:00
Ivan Savenko	639880a426	Fix handling of tactics by AI	2023-07-23 14:03:22 +03:00
Ivan Savenko	112a40a254	Fix pinch gesture on mobile?	2023-07-23 11:46:11 +03:00
Dydzio	47b6358e6e	Improve feature by triggering hero window refresh in response to netpack	2023-07-22 21:51:14 +02:00
Ivan Savenko	5be4f6ec2f	Fix visibility of creature amount label after casting spell before turn	2023-07-22 22:49:48 +03:00
Ivan Savenko	01d588ab54	Fix keyboard shortcuts on selection dialogs	2023-07-22 22:29:05 +03:00
Dydzio	05735a20e1	Fix for hero info window mana points not getting spent on spellcast	2023-07-22 15:32:00 +02:00
Michael	e8771e40a5	Update client/eventsSDL/InputSourceKeyboard.cpp ... Co-authored-by: Ivan Savenko <saven.ivan@gmail.com>	2023-07-22 14:36:13 +02:00
Michael	746f8c5e62	added missing check for ctrl	2023-07-22 14:26:37 +02:00
Michael	59f3740aea	allow clipboard paste	2023-07-22 13:17:16 +02:00
Tomasz Zieliński	e8855e20c4	Merge remote-tracking branch 'origin/beta' into fix_rmg_teams	2023-07-22 12:16:14 +02:00
Ivan Savenko	a912770e29	Fix activation of radial menu on touchscreen	2023-07-22 12:33:05 +03:00
Ivan Savenko	e6d8b65e2c	Fix toggling of auto combat	2023-07-22 12:15:27 +03:00
Ivan Savenko	1acc936e51	Do not activate radial wheel if cursor stays in the center	2023-07-21 17:01:53 +03:00
Ivan Savenko	6cd219738b	Added option to disable radial wheel in config (no UI)	2023-07-21 15:47:42 +03:00
Ivan Savenko	3a3306863a	Moved new texts to config	2023-07-21 15:47:42 +03:00
Ivan Savenko	e2ad8bbf58	Added initial version of selection highlight	2023-07-21 15:47:42 +03:00
Ivan Savenko	816adecca0	Added "split stack" action to wheel	2023-07-21 15:47:42 +03:00
Ivan Savenko	cb28a90a3b	Create items only if action is possible	2023-07-21 15:47:42 +03:00
Ivan Savenko	a45a0d1c40	Activate nearest radial menu item, even if not hovered	2023-07-21 15:47:42 +03:00
Ivan Savenko	5b2ac27e90	Fix slot positioning	2023-07-21 15:47:42 +03:00
Ivan Savenko	f3508bdfda	Show option description on hovering	2023-07-21 15:47:42 +03:00
Ivan Savenko	8c4faa24f4	Add alpha channel to radial menu items	2023-07-21 15:47:42 +03:00
Ivan Savenko	e3f5ab57f2	Fixed input event ordering. Fixes radial menu show/hide logic	2023-07-21 15:47:42 +03:00
Ivan Savenko	d26595cef7	Radial menu is now a proper window. Minor fixes to positioning.	2023-07-21 15:47:42 +03:00
Ivan Savenko	a494dc4870	Refactoring of CGarrisonInt	2023-07-21 15:47:42 +03:00
Ivan Savenko	dca3785f84	Initial version of radial wheel for army management	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	692c40c0f3	Merge pull request #2364 from Laserlicht/map-select-popup ... Mapselection - popup	2023-07-21 15:44:18 +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
Michael	0f16cec3b9	whitespace	2023-07-20 22:05:09 +02:00
Michael	f313597968	Use boost::format	2023-07-20 22:02:39 +02:00
Michael	36e870ae45	Descriptions	2023-07-20 21:37:23 +02:00
Tomasz Zieliński	57bb011468	- Do not allow 0 or 1 teams ... - Do not allow player to set only 1 team in GUI	2023-07-20 20:34:00 +02:00
Michael	a86406d090	check list length	2023-07-20 02:20:54 +02:00
Michael	3484059a40	fix indentation	2023-07-20 02:01:00 +02:00
Michael	c28c0d2a13	Popup - Mapselection	2023-07-20 01:53:33 +02:00
Ivan Savenko	280085b95d	Merge pull request #2308 from IvanSavenko/remove_client_savegame ... Remove client savegames	2023-07-19 14:46:46 +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
Ivan Savenko	07a8c75bec	Merge pull request #2305 from dydzio0614/unlimited-autosave ... Ability to change autosave limit + set autosave prefix	2023-07-19 14:45:51 +03:00
Ivan Savenko	9e58f67ab5	Fix autocombat AI threading	2023-07-19 12:09:03 +03:00
Ivan Savenko	556763fb7b	Fixed handling of tactics	2023-07-18 22:02:35 +03:00
SoundSSGood	ca977d7105	backpack window slider	2023-07-18 21:01:55 +03:00
Ivan Savenko	79be1c66fb	Fix quick combat regression	2023-07-18 20:06:39 +03:00
Ivan Savenko	1bf6bbd9b6	Significantly simplified threading model in battles	2023-07-18 19:55:59 +03:00
Ivan Savenko	f27f5ebc7c	Split BattleAI::activeStack into several smaller methods	2023-07-18 17:35:19 +03:00
Ivan Savenko	5e8a778e7d	Attempt to fix / trace crashes from Google Play statistics	2023-07-18 17:31:21 +03:00
Ivan Savenko	c7d88271a9	Removed asynchronous calls from exchange window	2023-07-18 17:31:21 +03:00
Ivan Savenko	bb17cc13b1	Implemented lazy totalRedraw to prevent multiple redraws on single frame	2023-07-18 17:31:21 +03:00
Ivan Savenko	9168a1150f	Remove catch-all that only blocks debugging (and Google Play reports)	2023-07-18 17:31:21 +03:00
Ivan Savenko	7b06c41929	Merge pull request #2338 from dydzio0614/info-box-army-management ... Info box army management	2023-07-18 16:45:17 +03:00
Dydzio	f4f789804d	Update client/battle/BattleWindow.cpp ... Co-authored-by: Ivan Savenko <saven.ivan@gmail.com>	2023-07-18 15:15:58 +02:00
Ivan Savenko	1e155c1ac7	Merge pull request #2355 from IvanSavenko/bugfixing ... Bugfixing iteration	2023-07-18 16:06:00 +03:00
Ivan Savenko	317183e00d	Merge branch 'develop' into info-box-army-management	2023-07-18 16:05:09 +03:00
Ivan Savenko	e0977693b0	Merge pull request #2336 from IvanSavenko/left_button_map_drag ... Left button map drag	2023-07-18 16:03:05 +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
Ivan Savenko	64a22d8590	Workaround for false double-clicking of elements in hero/town lists	2023-07-17 17:40:28 +03:00
Ivan Savenko	36efef0ee3	Do not play new day animation on game start	2023-07-17 16:30:12 +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	1b676933e5	Fix indent ... Co-authored-by: Ivan Savenko <saven.ivan@gmail.com>	2023-07-16 15:46:43 +02:00
Dydzio	5882cbae78	Merge branch 'develop' into unlimited-autosave	2023-07-16 15:19:04 +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	f8fbafff2f	Fix github #2335 - town garrison not updating in info box	2023-07-16 10:18:43 +02:00
Dydzio	dbfcb5a749	Implement interactable town tooltip	2023-07-16 10:17:37 +02:00
Dydzio	013d4cd208	Fix slot deselect when selected shortly after new day animation bypass	2023-07-15 23:15:59 +02: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
Michael	4e242f98fd	Battleintro: Skip with mouse button	2023-07-15 21:18:04 +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	a4ba5a9b65	Merge pull request #2327 from IvanSavenko/bugfixing_from_stream ... Fix accumulated minor bugs	2023-07-15 21:55:19 +03:00
Dydzio	1711b3848f	Remove unused variable	2023-07-15 20:03:07 +02:00
Ivan Savenko	3c0037efca	Fix dismissing hero from opening hero window in town window that is ... opened in kindom overview window	2023-07-15 16:09:44 +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	189a0c6e0d	Re-center map on active object after screen resize	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	366239bf8d	Do not play movement sound on non-movement actions	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	c0f0c3cedd	Fix shortcuts not working sometimes	2023-07-15 16:09:44 +03:00
Ivan Savenko	0ec9af7d9b	Replaced WoG opening with H3:SoD files	2023-07-15 16:09:44 +03:00
Ivan Savenko	3836217da5	Fix updating of heroes when moving to/from garrison	2023-07-15 16:09:44 +03:00
Ivan Savenko	3e1125570d	Fix updating of hero & town lists on adventure map	2023-07-15 16:09:44 +03:00
Michael	bea6effcb7	haptic feedback only if menu opens ... fix	2023-07-14 22:49:44 +02:00
Michael	c6e860720e	haptic feedback only if menu opens	2023-07-14 22:47:13 +02:00
Dydzio	ad66acdd79	End turn autosave support + making it default	2023-07-13 22:07:42 +02:00
Dydzio	616916714a	Unrelated typo fix	2023-07-13 21:56:53 +02:00
Dydzio	404ab23bc6	Get autosave day without leading 0, delete ancient saveprefix stuff	2023-07-13 21:55:51 +02:00
Dydzio	bcb061b58f	Merge branch 'develop' into unlimited-autosave	2023-07-13 20:53:10 +02: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	fb00bf4067	Merge pull request #2322 from dydzio0614/resolution-fix ... Fix for fullscreen game always starting in native resolution	2023-07-13 12:57:32 +03:00
Ivan Savenko	c2845d120b	Merge pull request #2324 from mikeiit/develop ... Fixed selection update in saving screen	2023-07-13 12:57: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
Mike	3c707d8e31	Cleanup	2023-07-11 23:12:59 -07:00
Mike	5134583111	Added missing redraw after selection update	2023-07-11 23:10:02 -07:00
Mike	90397a9604	Merge remote-tracking branch 'upstream/develop' into develop	2023-07-11 19:06:21 -07:00
Dydzio	42db24b4b2	Fix for fullscreen game always starting in native resolution	2023-07-11 17:59:22 +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	78415c573b	Merge pull request #2289 from IvanSavenko/resolution_fixes ... Fix issues with changing game resolution	2023-07-11 14:35:07 +03:00
DjWarmonger	f6cc61e0be	Merge pull request #2297 from vcmi/rmg_roads ... Rmg roads	2023-07-11 09:25:24 +02:00
Ivan Savenko	d99fab8496	Reduce usage of getCursorPosition	2023-07-09 18:09:22 +03:00
Ivan Savenko	0deeff30b9	replaced clickPressed with clickReleased where applicable to H3	2023-07-09 17:55:39 +03:00
Ivan Savenko	18db944083	Replaced clickReleased with clickPressed where applicable in H3	2023-07-09 17:48:25 +03:00
Ivan Savenko	9449899098	Fix regressions	2023-07-09 17:08:37 +03:00
Ivan Savenko	8750aa2c5b	Merged server savegame and (broken and unused) client savegame files	2023-07-09 15:30:47 +03:00
Mike	b327f890f2	Partially fixed initial loading of save file ... Brought back the missing save file info in the info card. Still need to fix the input text box and selection highlight.	2023-07-08 23:00:48 -07:00
Dydzio	fbf0bf78d6	Configurable autosave limit and prefix - ingame handling	2023-07-08 23:04:01 +02:00
Michael	d911756827	changes from code review	2023-07-08 21:02:03 +02:00
Michael	70b7f992de	fix	2023-07-08 20:34:11 +02:00
Michael	06541211d5	Rename var	2023-07-08 19:11:26 +02:00
Michael	050a22c257	only pop up for now	2023-07-08 18:50:59 +02:00
Michael	ff51b8f46b	Setting for haptic feedback	2023-07-08 18:47:38 +02:00
Michael	da8bcdd2dd	ios Support	2023-07-08 18:15:36 +02:00
Michael	a5fe6cc80b	hapticFeedback	2023-07-08 17:02:44 +02:00
Ivan Savenko	ca889a5c2a	Replaced clickLeft with clickPressed clickReleased methods	2023-07-08 14:33:04 +03:00
Tomasz Zieliński	730b36612c	Respect GUI settings for roads. By default, all road types are enabled.	2023-07-08 08:44:10 +02:00
Ivan Savenko	2a634b2ec0	Fixed UI updates on switching to/from fullscreen	2023-07-07 15:26:42 +03:00
Ivan Savenko	7e00a702c1	Fix switching to exclusive fullscreen to borderless windowed	2023-07-07 14:29:03 +03:00
Ivan Savenko	0c83e34093	Implemented reserved area for iOS notch / cutout	2023-07-07 14:29:03 +03:00
Ivan Savenko	5143ca266d	Moved SDL renderer access to ScreenHandler class	2023-07-07 14:29:03 +03:00
Ivan Savenko	fa4a0004b2	Merge pull request #2291 from IvanSavenko/terrain_animations_config ... Moved hardcoded terrain palette-cycling animations to config	2023-07-07 14:28:39 +03:00
Ivan Savenko	ae8579558d	Merge pull request #2282 from IvanSavenko/adventure_map_fixes ... Adventure map fixes for 1.3	2023-07-07 14:27:58 +03:00
Ivan Savenko	a9d25b0109	Fix map grid visibility on game load	2023-07-07 01:27:57 +03:00
Ivan Savenko	41755c9d87	Fix slider scroll via UI buttons	2023-07-07 01:23:17 +03:00
Mike	6414e3b3fc	Changed resource cost value label position	2023-07-05 18:43:52 -07:00
Ivan Savenko	3bce245780	Moved hardcoded terrain palette-cycling animations to config	2023-07-05 22:07:20 +03:00
SoundSSGood	9b5f6ec7cf	CArtifact getters setters	2023-07-05 15:48:08 +03:00
Ivan Savenko	85655d5534	Block map level toggle on maps without underground	2023-07-04 21:42:37 +03:00
Ivan Savenko	b775385179	Fix usage of left/right button to select amounts, e.g. in recruit screen	2023-07-04 21:35:26 +03:00
Ivan Savenko	07d9674828	Mouse click that activates a window will also trigger mouse event	2023-07-04 20:28:02 +03:00
Ivan Savenko	1dff721747	Fix infobox resetting to current hero during enemy turn	2023-07-04 20:28:02 +03:00
Ivan Savenko	1cbc6457ce	Fix possible assertion failure on removing non-owned town	2023-07-04 20:28:02 +03:00
Ivan Savenko	4fd5a2b3ea	Fixed sorting maps breaking after multiple clicks in succession	2023-07-04 20:28:00 +03:00
Ivan Savenko	f914ec9d57	Fix activation of in-game console in other windows	2023-07-04 20:27:45 +03:00
Ivan Savenko	900b1c1763	Simplified text input handling, fixes hotkeys on windows with text input	2023-07-04 18:42:52 +03:00
Ivan Savenko	81b9aec527	Fix map edge scrolling after swiping usage	2023-07-03 23:50:09 +03:00
SoundSSGood	fd9c7352a0	suggested changes	2023-07-03 22:54:03 +03:00
Ivan Savenko	4e80356bea	Do not hide minimap on human player turn	2023-07-03 19:36:10 +03:00
Ivan Savenko	8b61c0d59b	Replaced CIntObject::type bitfield with bool's. Added input blocking.	2023-07-03 19:24:12 +03:00
Ivan Savenko	48eb8ab54f	Play sound when receiving message, not just on sending ours	2023-07-03 17:12:31 +03:00
Ivan Savenko	aacef72125	Attempt to remove native pinch handling from ios	2023-07-03 17:00:03 +03:00
Ivan Savenko	8efa7911b7	Implemented "Allied Adventure Map AI" option	2023-07-03 14:34:53 +03:00
SoundSSGood	060aecc61c	CArtifact refactoring	2023-06-30 19:41:26 +03:00
SoundSSGood	d44821e733	CArtifactInstance moved to own file	2023-06-30 19:41:19 +03:00
SoundSSGood	f8023ad283	CScrollArtifactInstance	2023-06-30 19:41:04 +03:00
SoundSSGood	07c811dd67	CCombinedArtifactInstance refactoring	2023-06-30 19:40:57 +03:00
Ivan Savenko	9cd246ab8b	Merge pull request #2259 from IvanSavenko/campaign_refactoring ... Fix accumulated issues with campaigns	2023-06-30 12:59:48 +03:00
Mike	c35d9d66a6	Brought back missing fort level in info box ... This is to fix #2158	2023-06-28 22:21:34 -07:00
Ivan Savenko	cdc27d1fcf	Play correct music file in campaign menu	2023-06-27 20:09:11 +03:00
Ivan Savenko	0fdbf54937	Use HeroTypeID instead of int	2023-06-27 19:32:27 +03:00
Ivan Savenko	96eab03b16	Fix UI updates	2023-06-27 14:09:04 +03:00
Ivan Savenko	88566cb1ef	Fix another unprotected UI access	2023-06-26 22:14:21 +03:00
Ivan Savenko	0f8d53e978	Replaced SDL user events list with dispatching of arbitrary functors	2023-06-26 21:51:10 +03:00
Ivan Savenko	3d66455cd1	Fix build	2023-06-26 19:44:38 +03:00
Ivan Savenko	e2bd98e21e	CampaignRegions class encapsulation	2023-06-26 17:15:59 +03:00
Ivan Savenko	f6b2f58da9	Use inheritance instead of composition for campaign header	2023-06-26 17:15:59 +03:00
Ivan Savenko	a08fe09517	Added encapsulation for CampaignState class	2023-06-26 17:15:59 +03:00
Ivan Savenko	8420a90aa4	Reorganization of campaigns code	2023-06-26 17:15:59 +03:00
Ivan Savenko	d1e5a347ff	Refactoring of campaign handler: rename types and use strong typing	2023-06-26 17:15:59 +03:00
Ivan Savenko	85262cf4f5	Moved CGameState files into a separate directory	2023-06-26 17:15:59 +03:00
Mike	75820c3bdf	Fixed overlapped text display in adventure map settings	2023-06-25 16:27:00 -07:00
Ivan Savenko	6546242c03	Workaround-ish fix for last scenario of Angel Wings (un)equipping	2023-06-25 17:42:36 +03:00
Ivan Savenko	08cfbe79cf	Added encapsulation for movement points access	2023-06-25 17:42:36 +03:00
Ivan Savenko	edf7756783	Recalculate paths on (un)equipping Angel Wings	2023-06-25 17:42:36 +03:00
Ivan Savenko	90c68588f9	Implemented fly movement sound	2023-06-25 17:42:36 +03:00
Ivan Savenko	a84ccb37c2	Merge pull request #2250 from IvanSavenko/event_handling_fixes ... Slider input event fix	2023-06-25 17:39:55 +03:00
krs	27c488e62f	Small changes after review.	2023-06-23 20:05:15 +03:00
krs	afe0146021	Renamed settings option to reflect that same option is used for both ranges.	2023-06-23 19:50:39 +03:00
krs	b6ab1e1505	Removed #regions	2023-06-23 19:13:39 +03:00
krs	1cba41a3c3	IsHexInRangeLimit() is now a common function ... Plus some minor rearranging of code.	2023-06-23 19:13:39 +03:00
krs	1ba9a2a42a	calculateRangeLimitAndHighlightImages() is now separate function	2023-06-23 19:13:39 +03:00
krs	e668ea3a03	A common function is used for getting hexes in a certain range ... getRangeHexes()	2023-06-23 19:13:39 +03:00
krs	192f82152d	A common function is used to get range limit hexes ... getRangeLimitHexes()	2023-06-23 19:13:39 +03:00
krs	33bbbefdeb	First working prototype that mimics rangedFullDamageLimit code ... Next step is to create more generic functions that can be shared between the 2.	2023-06-23 19:13:39 +03:00
Ivan Savenko	6a08a96d0c	Added createObject call as wrapper around NewObject netpack	2023-06-23 13:42:08 +03:00
Ivan Savenko	d8879f1e53	NewObject pack now receives visitable position instead of h3m position	2023-06-23 13:34:51 +03:00
Ivan Savenko	56680e102d	Merge pull request #2245 from IvanSavenko/platform_settings ... Allow defining default values of settings per platform	2023-06-23 13:32:30 +03:00
Ivan Savenko	69dc95c3c8	Merge pull request #2235 from IvanSavenko/hota_h3m_support ... Hota h3m support	2023-06-23 13:32:10 +03:00
Ivan Savenko	a505cc464e	Fixed slider's behavior, especially for mobile systems	2023-06-22 23:49:38 +03:00
Ivan Savenko	7c5dcfd47b	Fix closing dropdown box via clicking outside bounds	2023-06-22 22:34:05 +03:00
Ivan Savenko	dfeeeb1f5f	Removed no longer used	2023-06-22 22:12:05 +03:00
Ivan Savenko	4e7412faa6	Split mouseDragged event from mouseMoved	2023-06-22 22:11:48 +03:00
Ivan Savenko	ccc85ff4eb	Merge pull request #2246 from IvanSavenko/pathfinding_reorganization ... Pathfinding code reorganization	2023-06-21 18:22:44 +03:00
Ivan Savenko	ebc7a82c2e	Converted pathfinder enum's to enum class	2023-06-21 15:38:57 +03:00
Ivan Savenko	bd4d2788ed	Split pathfinder into multiple smaller files	2023-06-21 13:46:09 +03:00
Ivan Savenko	87fcfa4add	Removed excessive pathfinder includes	2023-06-21 12:00:44 +03:00
Ivan Savenko	8f602b2ef6	Allow defining default values of settings per platform	2023-06-21 10:55:30 +03:00
Ivan Savenko	967dc95867	Rename panning->gesturing for consistency	2023-06-20 19:58:05 +03:00
Ivan Savenko	0be9aff99f	Fix battle queue stack highlighting	2023-06-20 19:58:05 +03:00
Ivan Savenko	108688389e	Fix accessing potentially non-existing UI element	2023-06-20 19:58:05 +03:00
Ivan Savenko	e5df7656a2	Added debug option to test touchscreen input on desktop systems	2023-06-20 19:58:05 +03:00
Ivan Savenko	ffdac314e9	Added selection of long touch duration	2023-06-20 19:58:05 +03:00
Ivan Savenko	06437cbde6	Renamed gesture-related methods, remove unused code	2023-06-20 19:58:05 +03:00
Ivan Savenko	563d7dd41f	Renamed RCLICK -> SHOW_POPUP	2023-06-20 19:58:05 +03:00
Ivan Savenko	8ad577255f	Replaced isMouseButtonPressed with isMouseLeftButtonPressed	2023-06-20 19:58:05 +03:00
Ivan Savenko	82288996a2	Fix cursor visibility on closing popup	2023-06-20 19:58:05 +03:00
Ivan Savenko	85a11c090e	Enter popup await mode only if there is an active popup	2023-06-20 19:58:05 +03:00
Ivan Savenko	e9788e2904	Cleaned up EventDispatcher code	2023-06-20 19:58:05 +03:00
Ivan Savenko	d4aa778547	Replaced clickRight event with showPopupWindow/closePopupWindow	2023-06-20 19:58:05 +03:00
Ivan Savenko	80f67337d8	Do not send mouseMoved to elements that have just unsubscribed	2023-06-20 19:37:27 +03:00
Ivan Savenko	f0a154037c	Attempt to improve def palette detection	2023-06-20 19:37:27 +03:00
Ivan Savenko	d51fe62804	Win/loss condition texts use MetaString	2023-06-20 19:37:27 +03:00
Ivan Savenko	56d69e790b	Renamed MetaString methods to more logical names	2023-06-20 19:37:27 +03:00
Ivan Savenko	2636a0dcc3	Moved MetaString to a new file	2023-06-20 19:37:27 +03:00
Ivan Savenko	f35b3a0dc3	Replace MetaString operator << with member function	2023-06-20 19:37:27 +03:00
Ivan Savenko	c43783db58	Use string ID's instead of raw strings for win/loss conditions	2023-06-20 19:37:27 +03:00
Ivan Savenko	487f441f47	Implemented boat selection for town shipyards	2023-06-16 17:59:49 +03:00
Ivan Savenko	6aedb99117	Cleaned up IShipyard interface	2023-06-16 17:59:10 +03:00
Tomasz Zieliński	f1356dd5bf	Merge remote-tracking branch 'origin/develop' into water_prison_tavern	2023-06-14 20:58:02 +02:00
Ivan Savenko	3924f0f081	Merge pull request #2211 from SoundSSGood/art-refactoring-hotfix ... Fixing regressions	2023-06-14 16:06:35 +03:00
Ivan Savenko	8614419954	Merge pull request #2208 from IvanSavenko/obstacles_foreground ... Implemented foreground/background obstacles	2023-06-14 15:49:08 +03:00
Ivan Savenko	caf627a652	Merge pull request #2207 from IvanSavenko/fix_black_color ... Fix colors in def palette turning into transparency unconditionally	2023-06-14 15:48:15 +03:00
krs	5158a5f7db	Fix After Merge	2023-06-11 19:31:50 +03:00
krs	0a8daf4d02	Now less source images are used. Flipped versions will be calculated.	2023-06-11 18:46:38 +03:00
krs	0ee1866f73	Added SDLImage::doubleFlip()	2023-06-11 18:45:14 +03:00
krs	21306b9097	Fixed a glitch when only top and bottom were needed.	2023-06-11 18:45:14 +03:00
krs	a8a82e89ea	Some renamings for consistency	2023-06-11 18:45:14 +03:00
krs	4a3426bb70	Hex Edge Highlight Images moved to VCMI mod	2023-06-11 18:44:42 +03:00
krs	56b8fb39f3	Removed neighbouringTilesWithDirection and using ... allNeighbouringTiles	2023-06-11 18:40:47 +03:00
krs	b8ad5b41f3	UnitState has getRangedFullDamageDistance()	2023-06-11 18:40:47 +03:00
krs	c562ce9c06	Using hex.isAvailable() instead of battleFieldWithoutSideColumns	2023-06-11 18:40:47 +03:00
krs	c0591573bf	Working Version	2023-06-11 18:40:47 +03:00
Tomasz Zieliński	982a2723de	Fix missing change	2023-06-08 09:49:28 +02:00
SoundSSGood	f6c2d5cba7	hotfix	2023-06-07 13:08:04 +03:00
Ivan Savenko	428fb832c6	Implemented foreground/background obstacles: ... - obstacles now have "foreground" field - if "foreground" field set, obstacle will appear on top of other objects, such as units - if "foreground" is not set, obstacle will appear below units - updated schema and cleared up obstacles config	2023-06-06 15:53:14 +03:00
Ivan Savenko	61a8c53bb6	Fix colors in def palette turning into transparency unconditionally	2023-06-05 23:51:18 +03:00
Ivan Savenko	4e834db017	Fix relative cursor mode	2023-06-05 19:28:29 +03:00
Ivan Savenko	238a02eb5e	It is now possible to cancel attack-via-swiping by moving finger away	2023-06-05 19:20:20 +03:00
Ivan Savenko	6283329aeb	Added option to disable edge scrolling	2023-06-05 19:20:20 +03:00
Ivan Savenko	ec55ec76b6	Show cursor (including attack direction) when swiping in battle	2023-06-05 19:20:18 +03:00
Ivan Savenko	db1045aecd	Fix panning limits for minimap	2023-06-05 19:20:08 +03:00
Ivan Savenko	0f2a339ab5	Implemented pinch gesture to scale adventure map	2023-06-05 19:20:08 +03:00
Ivan Savenko	a08ff1e6ef	Removed no longer used touchscreen option	2023-06-05 19:20:08 +03:00
Ivan Savenko	e6e91c64b6	Implemented minimap panning gesture	2023-06-05 19:20:08 +03:00
Ivan Savenko	84934d931a	Minor improvements to swipe in battle	2023-06-05 19:20:08 +03:00
Ivan Savenko	b20109c830	Test version of swipe gesture for in-combat attacks	2023-06-05 19:20:08 +03:00
Ivan Savenko	70155b48e1	Only show touchscreen options on systems that have one	2023-06-05 19:20:08 +03:00
Ivan Savenko	2c7b94d17f	Remove unused map swipe option	2023-06-05 19:20:08 +03:00
Ivan Savenko	1cec6918a0	Fix spellcast cancelation in battle	2023-06-05 19:20:06 +03:00
Ivan Savenko	0e36a3ab5a	Use Scrollable class for all appropriate locations	2023-06-05 19:18:33 +03:00
Ivan Savenko	052d0d314a	Implemented Scrollable class, to server as common base for such classes	2023-06-05 19:17:04 +03:00
Ivan Savenko	6fe00ad55c	Moved slider class to a separate file	2023-06-05 19:16:01 +03:00
Ivan Savenko	18388b2d72	Right-click popups will stay till next tap, in line with Android UI	2023-06-05 19:12:26 +03:00
Ivan Savenko	57df1c3e0d	Implemented gesture for town/hero lists and town/hero selection	2023-06-05 19:12:24 +03:00
Ivan Savenko	360bf48031	Implemented panning/swiping gesture for sliders	2023-06-05 19:09:56 +03:00
Ivan Savenko	2a30eccb2d	Allow mouse wheel for astart options setup (town/hero/bonus)	2023-06-05 19:00:57 +03:00
Ivan Savenko	261308b942	Hero/town lists are now scrollable with mouse wheel	2023-06-05 19:00:57 +03:00
Ivan Savenko	dc8e9cd048	wheelScrolled event now accepts distance instead of bool	2023-06-05 19:00:57 +03:00
Ivan Savenko	e2a85e25fa	Removed old code	2023-06-05 19:00:57 +03:00
Ivan Savenko	26fd651917	Implemented panning gesture via touch input	2023-06-05 19:00:57 +03:00
Ivan Savenko	48859e186e	Added panning gesture, activated by mouse wheel press	2023-06-05 19:00:56 +03:00
Ivan Savenko	1a5c69a424	Implemented left & right click support for touch input	2023-06-05 19:00:56 +03:00
Ivan Savenko	c9d42d59c3	Formatting fix	2023-06-05 19:00:56 +03:00
Ivan Savenko	dc16781877	Move keyboard tests to keyboard handler	2023-06-05 19:00:56 +03:00
Ivan Savenko	503bd1dd66	Fix double-clicking to start scenario	2023-06-05 19:00:56 +03:00
Ivan Savenko	34123c7f07	Minor refactoring of mouse input handling	2023-06-05 19:00:56 +03:00
Ivan Savenko	1e9eea30e1	Merge remote-tracking branch 'soundsgood/CArtHandler-rework' into develop	2023-06-05 18:53:17 +03:00
Ivan Savenko	8d278e653f	Merge pull request #2202 from IvanSavenko/map_objects_reorganization ... Map objects code reorganization	2023-06-05 18:35:05 +03:00
Ivan Savenko	8e8601f39d	Fix build	2023-06-02 21:54:52 +03:00
Ivan Savenko	d6a357fd17	Split some map object files into smaller files. Reduced includes usage.	2023-06-02 21:47:37 +03:00
Ivan Savenko	8ea0ecaec1	show/showAll methods now use Canvas instead of SDL_Surface ... - added compatibility method to Canvas to allow SDL_Surface access - added drawBorder method to Canvas to replace CSDL_Ext method - added drawColor method to Canvas to replace CSDL_Ext method - minor changes to Tavern and Trade windows to adapt to new API	2023-06-02 16:42:18 +03:00
Ivan Savenko	b04b11b9d1	Merge pull request #2175 from IvanSavenko/map_format_mappings ... HotA map format support - object mapping	2023-06-01 22:06:18 +03:00
Ivan Savenko	acac42291e	Remove excessive CMap.h includes	2023-05-31 23:18:38 +03:00
Ivan Savenko	62595cb039	Split massive CMap.h a bit	2023-05-31 23:01:57 +03:00
Ivan Savenko	de769a04d6	Remove unnecessary includes from headers	2023-05-31 23:01:57 +03:00
Ivan Savenko	daaaf84392	Icon index for map format is now defined in config	2023-05-31 23:01:57 +03:00
Ivan Savenko	fb55719671	Map format support status can now be loaded from gameSettings	2023-05-31 23:01:57 +03:00
Michael	eb618fbff9	rename function	2023-05-28 17:29:11 +02:00
Michael	8672fc7e3d	Allows to translate default playername	2023-05-28 16:57:24 +02:00
Michael	3ee7610015	added missing translation strings	2023-05-28 14:58:21 +02:00
Ivan Savenko	2c3e8c3390	Merge pull request #2168 from IvanSavenko/gui_handler_event_handling_refactoring ... Event handling refactoring	2023-05-23 15:08:10 +03:00
Ivan Savenko	10fc6cecef	Merge pull request #2157 from IvanSavenko/interface_layouts ... Update in-game settings window to recent changes	2023-05-20 19:25:34 +03:00
Ivan Savenko	956ff22e64	Merge pull request #2163 from IvanSavenko/adventure_map_zoom ... Adventure map zoom	2023-05-20 13:35:53 +03:00
Ivan Savenko	867c5355da	Fix tower shooters animation updates	2023-05-20 13:11:52 +03:00
Ivan Savenko	6981848288	Better documentation & cleanup	2023-05-20 01:51:49 +03:00
Ivan Savenko	a4000f2fc8	Removed isActive(int) method since its usages were redundant or wrong	2023-05-20 01:51:49 +03:00
Ivan Savenko	c77f8482e3	Replaced event handling break system with key capturing	2023-05-20 01:51:49 +03:00
Ivan Savenko	f4d67fe675	Restore SDL_main in CMT.cpp	2023-05-20 01:51:49 +03:00
Ivan Savenko	e23dfec6c5	Fix SDL_Hints location	2023-05-20 01:51:49 +03:00
Ivan Savenko	bb36336aed	Changed event queue to vector	2023-05-20 01:51:49 +03:00
Ivan Savenko	0e70f2998f	SDL event handling is now done exclusively in input handler	2023-05-20 01:51:49 +03:00
Ivan Savenko	5e86b00dda	Moved input handling from GuiHandler to set of classes in eventsSDL dir	2023-05-20 01:51:49 +03:00
Ivan Savenko	5bd044521a	Added method descriptions	2023-05-20 01:51:49 +03:00
Ivan Savenko	6012e0cb45	Minor code reorganization	2023-05-20 01:51:49 +03:00
Ivan Savenko	ff1c94541f	Fix button interaction with hotkey & mouse	2023-05-20 01:51:49 +03:00
Ivan Savenko	d5d0ca96a8	Minor fixes and cleanup	2023-05-20 01:51:49 +03:00
Ivan Savenko	1f513fd280	Extracted event management from GuiHandler and CIntObject	2023-05-20 01:51:49 +03:00
Ivan Savenko	008a1ebec4	split massive handleCurrentEvent method into per-event parts	2023-05-20 01:51:49 +03:00
Ivan Savenko	06b6f59107	Resolution selector will now correctly update in borderless window mode	2023-05-19 23:54:43 +03:00
Ivan Savenko	20ec747440	Do not show desktop-only options on mobile systems	2023-05-19 23:19:43 +03:00
Ivan Savenko	d18b240d6d	Added separate borderless & exclusive fullscreen options	2023-05-19 22:43:52 +03:00
Ivan Savenko	f2dfd6de42	Updated settings window to use new layouts & library	2023-05-19 22:43:52 +03:00
Ivan Savenko	7cbfd8117e	Implemented simple layout to simplify widget json definitions	2023-05-19 22:43:52 +03:00
Ivan Savenko	7cd898a87a	Implemented "customTypes" in UI json to reduce duplicated definitions	2023-05-19 22:43:52 +03:00
Ivan Savenko	1c82a10fdd	Fix graphical artifacts on map scaling	2023-05-19 17:09:46 +03:00
Ivan Savenko	be2e101c8c	Fix map freeze on enemy turn	2023-05-19 13:22:18 +03:00
SoundSSGood	1175990724	fixup	2023-05-19 01:55:11 +03:00
Ivan Savenko	9817aaa466	Merge pull request #2145 from IvanSavenko/fix_hota_support ... Minor fixed for compatibility with hota data files	2023-05-18 22:50:10 +03:00
SoundSSGood	021f94a579	artifact utils	2023-05-17 17:00:31 +03:00
Ivan Savenko	872b68c59a	Implemented zoom reset shortcut (backspace)	2023-05-17 14:54:19 +03:00
Ivan Savenko	7504ceb256	Fixed map view centering during scaling change	2023-05-17 14:36:12 +03:00
Ivan Savenko	9e3bc87a6b	Allow zooming with mouse wheel	2023-05-17 00:49:24 +03:00
Ivan Savenko	3e9da333cf	Basic version of zoomable adventure map	2023-05-16 23:42:51 +03:00
Ivan Savenko	ad3e54e6c0	Reduced usage of topWindow() method	2023-05-16 21:57:45 +03:00
Ivan Savenko	e2ef136003	Renamed "Int" -> "Window" in WindowHandler API	2023-05-16 19:10:22 +03:00
Ivan Savenko	051a4a3c17	Encapsulation of WindowHandler state	2023-05-16 19:10:22 +03:00
Ivan Savenko	7838190ef4	Moved window stack management from GuiHandler to new class	2023-05-16 19:10:21 +03:00
Ivan Savenko	9eac3eaafa	Merged "music" resource type into "sound", enables ogg's use as sounds	2023-05-15 22:22:54 +03:00
Ivan Savenko	d6d679a38c	Fix missing broken shadows on hota map objects	2023-05-15 22:22:54 +03:00
Ivan Savenko	f84c2c3bb5	Removed getFrameDeltaMilliseconds from gui handler	2023-05-14 22:30:59 +03:00
Ivan Savenko	8a31aeb94b	Battle animations use tick() for updates	2023-05-14 22:23:00 +03:00
Ivan Savenko	fa496628f2	Separated timer updates from rendering in adventure map and town screen	2023-05-14 22:22:37 +03:00
Ivan Savenko	3ecdff2a21	FramerateManager now uses chrono instead of SDL_Ticks	2023-05-14 22:22:37 +03:00
Ivan Savenko	03df274450	Framerate manager is now in a separate file and private member of GH	2023-05-14 22:22:37 +03:00
Ivan Savenko	64cc246358	Fix positioning of console log overlay	2023-05-13 18:00:14 +03:00
Ivan Savenko	5e90d40e8b	Fix typo	2023-05-13 17:59:59 +03:00
Ivan Savenko	062311d24a	Fix callbacks of toggle buttons. Fixes game options window	2023-05-12 22:58:21 +03:00
Ivan Savenko	7927470d46	Merge pull request #2076 from IvanSavenko/configurable_adventure_map ... Implement scalable adventure map window	2023-05-12 17:39:45 +03:00
SoundSSGood	f3ae47b10e	art transfer fix	2023-05-10 03:01:13 +03:00
Ivan Savenko	c5a48a01ce	Remove no longer used code	2023-05-09 13:10:33 +03:00
Ivan Savenko	edd5d11734	Fix issues discovered by self-review	2023-05-09 13:10:33 +03:00
Ivan Savenko	8504b891a8	Added more checks for SDL return status	2023-05-09 13:10:33 +03:00
Ivan Savenko	b2233b8ced	Attempt to improve coloring of resource bar texture-fill	2023-05-09 13:10:33 +03:00
Ivan Savenko	c01b74434c	Fix cancelling spellcast with escape	2023-05-09 13:10:33 +03:00
Ivan Savenko	243773b6ef	Renamed some adventure map files & classes	2023-05-09 13:10:33 +03:00
Ivan Savenko	e26b18c139	Rename & cleanup of WindowHandler -> ScreenHandler	2023-05-09 13:10:33 +03:00
Ivan Savenko	29b10f0436	Try to enable window resize	2023-05-09 13:10:33 +03:00
Ivan Savenko	b1bd49ecd8	Fix main menu resize on resolution change	2023-05-09 13:10:33 +03:00
Ivan Savenko	bffec0068b	Fix screen updates after window resize	2023-05-09 13:10:33 +03:00
Ivan Savenko	dbc4330fc5	Fixed positioning of resource bar and town list in other windows	2023-05-09 13:10:33 +03:00
Ivan Savenko	f403766fbb	Attempt to fix DPI scaling on Windows	2023-05-09 13:10:33 +03:00
Ivan Savenko	ca15bf5698	Added autoselection of in-game console log width	2023-05-09 13:10:33 +03:00
Ivan Savenko	ecff5f3d12	Do not trigger multiple hotkeys when battle window wait for any key	2023-05-09 13:10:33 +03:00
Ivan Savenko	61181d63bd	Fixed missing hotkeys for game saving	2023-05-09 13:10:33 +03:00
Ivan Savenko	97d266ea2d	Remove duplicated resolutions, e.g. different frequency	2023-05-09 13:10:33 +03:00
Ivan Savenko	8b27780c11	Fixed scrolling blocking with Ctrl	2023-05-09 13:10:33 +03:00
Ivan Savenko	a6fda031ed	Fixed widget disabling during enemy turn & spellcasting	2023-05-09 13:10:33 +03:00
Ivan Savenko	7228b08d1d	Implemeted runtime generation of player-colored background texture	2023-05-09 13:10:33 +03:00
Ivan Savenko	342ea138f9	Fix remaining graphical artifacts on switching from world view	2023-05-09 13:10:33 +03:00
Ivan Savenko	c24ccf663b	Fixed auto-enabling of status bar on windows activations	2023-05-09 13:10:33 +03:00
Ivan Savenko	8e320d8454	Fixed world view mode	2023-05-09 13:10:33 +03:00
Ivan Savenko	5ae507505a	Fixed toggleable buttons (sleep/wake & subterra/surface)	2023-05-09 13:10:33 +03:00
Ivan Savenko	77beca50e2	Hide resolution selector on mobile devices	2023-05-09 13:10:33 +03:00
Ivan Savenko	a0f1bf3928	Implemented user-selectable UI scaling mode	2023-05-09 13:10:33 +03:00
Ivan Savenko	fd3933e589	Support for changing resolution without game restart	2023-05-09 13:10:33 +03:00
Ivan Savenko	97426a3f7c	Implemented disabling of buttons based on condition	2023-05-09 13:10:33 +03:00
Ivan Savenko	d4098059b8	Proper support for player-colored buttons in UI	2023-05-09 13:10:33 +03:00
Ivan Savenko	7aacba6e55	Fix adventure map left-clicking	2023-05-09 13:10:33 +03:00
Ivan Savenko	019d7b6811	Integrated shortcuts into adventure window configuration	2023-05-09 13:10:33 +03:00
Ivan Savenko	0000541291	Fixed map rendering	2023-05-09 13:10:33 +03:00
Ivan Savenko	a4b102e46f	Implemented UI scaling (non-selectable option for now)	2023-05-09 13:10:33 +03:00
Ivan Savenko	8d28f96619	Resolutions selector now shows all available resolutions	2023-05-09 13:10:33 +03:00
Ivan Savenko	b4e7093c01	Added IWindowHandler interface for OS screen/window utilities	2023-05-09 13:10:33 +03:00
Ivan Savenko	28f41bb472	Moved remaining render-related code from CMT	2023-05-09 13:10:33 +03:00
Ivan Savenko	c688411bab	Extracted window management from CMT to new class	2023-05-09 13:10:33 +03:00
Ivan Savenko	18a66a4376	Rename method to better name	2023-05-09 13:10:33 +03:00
Ivan Savenko	d96edd9f56	Added larger town list for higher resolutions	2023-05-09 13:10:33 +03:00
Ivan Savenko	4958190e82	Fixed visibility of corner gems	2023-05-09 13:10:33 +03:00
Ivan Savenko	a015bf6507	Initial part of dynamically-sized adventure map: ... - removed no longer used CConfigHandler - remove no longer use resolutions.json - moved widget management from adventure map to a separate class - adventure map layout is now loaded from config	2023-05-09 13:10:33 +03:00
Ivan Savenko	cb8201876b	Merge pull request #1822 from rilian-la-te/spell-mechanics-v3 ... Bonus refactoring, part3 (save-incompatible)	2023-05-09 13:10:04 +03:00
SoundSSGood	fe3e635332	assertions fix	2023-05-07 22:29:03 +03:00
Konstantin P	057a33c508	SpellSchool: use identifier instead of int ... Needs redifinition of MAGIC_SCHOOL_SKILL in all mods	2023-05-07 20:37:32 +03:00
Konstantin P	0cbc2e458c	CBonusSystemNode: remove description ... It was almost unused, but this change is save-breaking	2023-05-05 18:57:11 +03:00
Konstantin	05eccbc2bb	vcmi: split bonus to enumerator and HeroBonus.h	2023-05-03 18:01:06 +03:00
Konstantin	fbc05c70ac	vcmi: camelCase methods of new classes ... Also use EGameSettings for clamping morale and luck	2023-05-02 12:09:13 +03:00
Konstantin	a6de9097be	vcmi: rename HeroBonus.h to Bonus.h	2023-05-02 11:20:58 +03:00
Konstantin	4866c2fe5c	vcmi: split IBonusBearer	2023-05-02 00:54:53 +03:00
Konstantin	b6eb2dc060	vcmi: rename IFactionMember and ICreature	2023-05-02 00:54:53 +03:00
Konstantin	1d34c73c2d	vcmi: split CBonusSystemNode, BonusParams and prop ... More splitting of HeroBonus.h	2023-05-02 00:54:53 +03:00
Konstantin	713e3004df	vcmi: rename updater and limiter files	2023-05-02 00:53:51 +03:00
Konstantin	a2d4c72016	vcmi: morale and luck now also IFactionMember ... Not all bonus bearers have morale and luck, only faction members	2023-05-02 00:53:51 +03:00
Konstantin	e37f798a68	vcmi: split bonus updaters	2023-05-02 00:53:50 +03:00
Konstantin	416faf521e	vcmi: move limiters outside of HeroBonus.cpp ... This will help for recompilation.	2023-05-02 00:53:50 +03:00
Konstantin	6fa1b2b19f	vcmi: move bonuses to its own folder	2023-05-02 00:53:50 +03:00
Konstantin P	4b2a09dae7	FactionMember: move code around	2023-05-02 00:53:50 +03:00
Ivan Savenko	916b41d9a7	Merge pull request #2078 from IvanSavenko/shortcuts ... Basic shortcuts system	2023-05-01 21:45:52 +03:00
nordsoft	fdac1d66d8	Fix warnings	2023-05-01 21:49:37 +04:00
nordsoft	32277a007d	Fix compilation after merge	2023-05-01 21:49:37 +04:00
nordsoft	07b2052679	Bit refactoring	2023-05-01 21:49:37 +04:00
nordsoft	68fa7aaf35	Remove limitations for amount of skills	2023-05-01 21:49:37 +04:00
nordsoft	a4fd6c1c92	Move trading window title to config	2023-05-01 21:49:37 +04:00
nordsoft	11840b9f6d	Get rid of hardcoded logic for markets	2023-05-01 21:49:37 +04:00
nordsoft	07f7c318dc	Adjust client part for markets	2023-05-01 21:49:37 +04:00
nordsoft	4b1b58b617	Change Callback to abstract	2023-05-01 21:49:37 +04:00
nordsoft	59bc9326e9	Remove excess pointer from market interface	2023-05-01 21:49:37 +04:00
Ivan Savenko	e9e5355af0	Added commented-out wog campaigns set	2023-05-01 18:00:35 +03:00
Ivan Savenko	0662ad49dd	Fix build	2023-05-01 17:59:21 +03:00
Ivan Savenko	6c637dd8e6	Integrated hotkeys with InterfaceObjectConfigurable	2023-05-01 17:59:21 +03:00
Ivan Savenko	dea10e6091	Use more descriptive names for hotkeys	2023-05-01 17:59:20 +03:00
Ivan Savenko	a654cc2391	Removed vstd::advance. Added vstd::next to handle similar cases.	2023-05-01 17:58:18 +03:00
Ivan Savenko	832e56e005	Implementation of (very basic) shortcuts system ... - Added EShortcut enumeration that contains all in-game shortcuts - CIntObject::keyPressed now receive values from hotkey enumeration - On keypress, SDL key code will be translated to shortcut ID - Removed access to SDL key codes from most of engine	2023-05-01 17:58:17 +03:00
Ivan Savenko	4aa232a60a	Merge pull request #2055 from SoundSSGood/cartifactholder-rework ... Artifact related code refactoring part2 (client CArtifactHolder)	2023-05-01 02:33:08 +03:00
SoundSSGood	8b531ca6c4	CArtifactHolder divided into files	2023-05-01 00:34:45 +03:00
Konstantin	86f5d6de69	vcmi: modernize headers	2023-04-30 13:35:54 +03:00
Ivan Savenko	d985ac90d3	Merge master -> develop	2023-04-28 22:57:25 +03:00
Ivan Savenko	76d5b459f1	Fixed music playback on switching between towns	2023-04-28 16:53:45 +03:00
Konstantin P	b472c89276	vcmi: make some CStack properties private ... There is a getters for this properties already available	2023-04-27 20:58:49 +03:00
Ivan Savenko	fb739e7186	Merge beta -> develop	2023-04-26 22:48:08 +03:00
krs	e348193f7e	Tactics movement is limited to movement range	2023-04-26 21:56:20 +04:00
Ivan Savenko	48abf46824	Merge pull request #2005 from IvanSavenko/advmap_refactor ... Refactoring of adventure map interface	2023-04-24 17:19:22 +03:00
Ivan Savenko	3ac713d6a8	Fix crash on dereferencing nullptr	2023-04-24 17:17:12 +03:00
Ivan Savenko	d3c1c92a03	Do not update minimap using puzzle map data	2023-04-24 17:16:55 +03:00
Ivan Savenko	fa156568c4	Fixes according to review	2023-04-24 16:58:15 +03:00
Nordsoft91	f39f208e05	Merge pull request #1915 from Nordsoft91/vcmi-campaign ... VCMI campaigns format	2023-04-23 19:09:59 +04:00
SoundSSGood	dcac8252f3	fixed windows positions	2023-04-23 14:57:45 +03:00
SoundSSGood	a8220c551f	fixed init CArtifactsOfHero	2023-04-23 14:33:47 +03:00
SoundSSGood	177523d972	askToAssemble, askToDisassemble	2023-04-23 14:17:27 +03:00
SoundSSGood	1046964eef	CArtifactHolder	2023-04-23 14:14:24 +03:00
Nordsoft91	a553a4aa66	Merge pull request #2030 from Nordsoft91/boats	2023-04-22 03:27:00 +04:00
Ivan Savenko	80b37a3019	Fixed remaining regressions	2023-04-20 22:19:10 +03:00
Ivan Savenko	bb08a0afc8	Moved selection logic to player state	2023-04-20 22:04:24 +03:00
Ivan Savenko	e8718a46cc	Fix regressions	2023-04-20 22:04:24 +03:00
Ivan Savenko	dd227d24c3	Formatting and cleanup	2023-04-20 22:04:24 +03:00
Ivan Savenko	365f552fa1	Added API for owned towns access	2023-04-20 22:04:24 +03:00
Ivan Savenko	5cbd0f8fc8	API for wandering heroes access	2023-04-20 22:04:24 +03:00
Ivan Savenko	3eac6f323e	added API for sleeping heroes access	2023-04-20 22:04:24 +03:00
Ivan Savenko	6a46138617	Moved current selection to local state class	2023-04-20 22:04:24 +03:00
Ivan Savenko	f6d480cbb2	Moved player-specific heroes & towns information to new class	2023-04-20 22:04:24 +03:00
Ivan Savenko	4a169972f0	Further refactoring to cleanup code of advmap and locplint	2023-04-20 22:04:24 +03:00
Ivan Savenko	20de44d4a5	Reodered methods in file to group similar code	2023-04-20 22:04:24 +03:00
Ivan Savenko	7db67a3101	int3 now has proper hasher function	2023-04-20 22:04:24 +03:00
Ivan Savenko	4ec32e4dcd	Renamed CAdvMapInt to its proper full name	2023-04-20 22:04:24 +03:00
Ivan Savenko	f1902ab247	Initial refactoring to encapsulate adventure map	2023-04-20 22:03:28 +03:00
nordsoft	de159df481	Rename boats	2023-04-20 21:20:51 +04:00