5275 Commits

Author	SHA1	Message	Date
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
Ivan Savenko	24c6587072	Fixed crash on leaving to main menu from battle in hotseat mode	2023-04-20 19:56:35 +03:00
Ivan Savenko	f245080cba	Fix missing error message on casting spell in hotseat	2023-04-20 19:24:13 +03:00
nordsoft	753b72f96d	Revert "Hidden maps" ... This reverts commit e669d31d33.	2023-04-20 19:50:00 +04:00
Ivan Savenko	6df85be4b3	Fixed death animation of Efreeti killed by petrification attack	2023-04-20 18:13:01 +03:00
Ivan Savenko	5c9ae8aafc	Implemented spell range overlay for Dimension Door and Scuttle Boat	2023-04-20 14:15:08 +03:00
Ivan Savenko	b3207f3465	RMG tab will now show all templates but will block invalid map sizes	2023-04-19 23:14:23 +03:00
Ivan Savenko	b517adfb25	Fixed crash on empty save game list after filtering	2023-04-19 23:12:30 +03:00
Ivan Savenko	3d30e04184	Fixed centering of scenario information window	2023-04-19 23:11:44 +03:00
Ivan Savenko	4bb4d7e7a5	Merge pull request #1989 from SoundSSGood/refactoring-arts-p1 ... Artifact related code refactoring part1 (initial)	2023-04-19 15:31:11 +03:00
nordsoft	f464ca3560	Merge remote-tracking branch 'upstream/develop' into vcmi-campaign ... # Conflicts: # lib/mapping/CCampaignHandler.cpp	2023-04-19 02:45:49 +04:00
nordsoft	0a28262c15	Merge remote-tracking branch 'upstream/develop' into boats ... # Conflicts: # AI/VCAI/Pathfinding/AINodeStorage.cpp	2023-04-19 02:22:19 +04:00
nordsoft	d1dacd45e2	Animations from config	2023-04-19 00:14:15 +04:00
Ivan Savenko	e8788cf4c4	Merge pull request #1999 from Laserlicht/patch-2 ... Big/Vector Icons	2023-04-18 16:23:00 +03:00
Ivan Savenko	56de0c9f56	Merge pull request #2015 from rilian-la-te/optional-variant-any ... vcmi: migrate to C++17	2023-04-18 15:44:52 +03:00
nordsoft	ed798b06da	Prepare transport enum	2023-04-18 13:04:49 +04:00
nordsoft	2babb5add5	Fix boat extra animations	2023-04-17 23:39:34 +04:00
nordsoft	80220fda5b	Merge remote-tracking branch 'upstream/develop' into vcmi-campaign ... # Conflicts: # lib/mapping/CMap.h	2023-04-17 04:54:57 +04:00
nordsoft	91b4782a2f	Refactor more fields from campaign header	2023-04-17 04:47:54 +04:00
nordsoft	70f4cc5e0f	Refactor campaign regions	2023-04-17 04:26:35 +04:00
krs	91c96b1b68	Fix for merge.	2023-04-17 00:53:25 +03:00
Konstantin	54eb550eb9	vcmi: remove unused functions now	2023-04-17 00:43:13 +03:00
Konstantin	7a5775a9f9	vcmi: use std::optional	2023-04-17 00:43:13 +03:00
Konstantin	0d35606a44	vcmi: use std::variant	2023-04-17 00:43:13 +03:00
krs	14cbdf7ab0	Split Process console commands code into individual functions ... Extracted functions for each if branch, added one line doc for each function, rearranged the commands to be groupped more logically.	2023-04-16 23:45:37 +03:00
Ivan Savenko	e3ed728193	Merge pull request #1932 from rilian-la-te/proper-teleport ... VCMI: teleport redesign	2023-04-16 22:52:01 +03:00
nordsoft	954a2abb71	Verifying mods before starting map	2023-04-16 15:38:13 +04:00
Michael	d64106b700	Update generate_icns.py	2023-04-16 12:33:35 +02:00
Ivan Savenko	1704fab3a2	Fix assertion failure on fighting against AI with tactics	2023-04-15 17:20:38 +03:00
Ivan Savenko	cc8c1c769a	Fix duplicated maps in scenario selection screen	2023-04-15 17:20:38 +03:00
Ivan Savenko	de855085f0	Added information on banks, seer hut and monster properties	2023-04-15 17:20:38 +03:00
Ivan Savenko	3738171b21	Refactoring of H3M loader to make HotA format support easier ... - extracted low-level reader from MapFormatH3M class - added separate structure to define version-specific values - cleared up some H3M format edge cases - replaced witch hut skill vector with set - converted several fields to enum type	2023-04-15 17:20:38 +03:00
Laserlicht	c6458762ce	fix	2023-04-15 13:15:51 +02:00
Laserlicht	62ccb2d1da	Add different sizes	2023-04-15 13:13:44 +02:00
Laserlicht	6e22663121	new icons	2023-04-15 12:52:11 +02:00
Laserlicht	0c1c7bc24b	ico	2023-04-15 12:38:35 +02:00
Michael	37fb77521b	Update generate_icns.py	2023-04-15 12:33:24 +02:00
Nordsoft91	6b12ee044f	Merge pull request #1969 from Nordsoft91/spectator ... Single player spectator	2023-04-15 03:33:18 +04:00
SoundSSGood	9a838598a6	arts refactoring part1	2023-04-15 00:10:39 +03:00
Ivan Savenko	b354f99cc3	Merge pull request #1936 from IvanSavenko/cpp_17_upgrade ... Upgrade c++ standard to c++17	2023-04-14 19:21:17 +03:00
Ivan Savenko	128764b1c9	Merge pull request #1968 from rilian-la-te/fix-caster-tactics ... Fix caster tactics	2023-04-14 18:59:03 +03:00
Ivan Savenko	44b83b2e11	Merge master -> develop	2023-04-14 16:51:35 +03:00
nordsoft	289259f64a	Unblock spectator interface during AI turns	2023-04-14 00:22:47 +04:00
nordsoft	35fa06008b	Revert "Auxiliary commit to revert individual files from fb4db41891e157f4f7d72ee759141754d2df680c" ... This reverts commit 129b15a49c911315789721b7e62b93757819519a.	2023-04-14 00:20:51 +04:00
nordsoft	413870d39a	Revert "Single player spectator" ... This reverts commit b9e5e42647.	2023-04-14 00:18:29 +04:00
Ivan Savenko	1978e6f8e8	Do not show unit information on dead creatures	2023-04-13 21:16:55 +03:00
nordsoft	b9e5e42647	Single player spectator	2023-04-13 13:12:00 +04:00
nordsoft	e28dd128e0	Revert "Auxiliary commit to revert individual files from fb4db41891e157f4f7d72ee759141754d2df680c" ... This reverts commit 46d35541b453b6c026c457bf0c788f79311968b3.	2023-04-13 12:45:10 +04:00
Konstantin P	384ee99834	vcmi: configurable teleport v2 ... 1. Redesign wall and teleport penalty using shortest path This will avoid OH3 exploits with teleport inside walls 2. Teleport is now configurable	2023-04-13 11:24:19 +03:00
Konstantin	bc1aad3b26	vcmi: remove deprecated CStack::getCreature() ... Function battle::Unit::unitType() does the same.	2023-04-13 11:24:19 +03:00
Konstantin	8397bd91fb	BattleActionsController: do not pass unused caster ... This is unused, so, remove this parameter to prepare for teleport action	2023-04-13 11:24:19 +03:00
Konstantin	15031d2e16	vcmi: do not block interface on setup spells	2023-04-13 01:06:36 +03:00
nordsoft	fb4db41891	Single player spectator	2023-04-13 02:01:13 +04:00
nordsoft	f005dbbc14	Spectator mode	2023-04-13 00:59:44 +04:00
nordsoft	e669d31d33	Hidden maps	2023-04-12 02:44:17 +04:00
Ivan Savenko	644f0f4b32	Removed ARRAY_COUNT in favor of std::size	2023-04-12 01:04:26 +03:00
Ivan Savenko	506c3d29bc	Replaced vstd clamp with std version	2023-04-12 01:03:14 +03:00
Ivan Savenko	5f74aca341	Fix missing attribute	2023-04-12 01:03:14 +03:00
Ivan Savenko	63b197b78a	Converted attributes to use c++17 functionality	2023-04-12 01:03:14 +03:00
nordsoft	30281d5991	Merge remote-tracking branch 'upstream/develop' into vcmi-campaign	2023-04-11 21:44:31 +04:00
Nordsoft91	3951bbb395	Merge pull request #1108 from Nordsoft91/battle-dialog ... [HDMod features] Quick combat	2023-04-11 21:18:04 +04:00
Ivan Savenko	dfa2e2a349	Merge beta into develop	2023-04-11 19:37:35 +03:00
nordsoft	39f4bc0072	Reset battle bonuses on client side	2023-04-11 17:25:19 +04:00
nordsoft	8e77b833d9	Merge remote-tracking branch 'upstream/develop' into battle-dialog	2023-04-11 15:54:08 +04:00
Ivan Savenko	e25cd7f90f	Merge pull request #1934 from IvanSavenko/beta_fixes ... Fixed bugs for 1.2 release	2023-04-11 11:08:40 +03:00
Ivan Savenko	ff66592fad	Merge pull request #1882 from rilian-la-te/native-terrain-refactor ... Native terrain refactor	2023-04-11 02:14:37 +03:00
nordsoft	bfc75ccd39	Merge remote-tracking branch 'upstream/develop' into battle-dialog	2023-04-11 02:22:42 +04:00
Nordsoft91	ebd17c9e4a	Merge pull request #1928 from Nordsoft91/cast-reward ... Spell cast reward	2023-04-10 22:49:36 +04:00
Konstantin	fedf7d377c	vcmi: remove TFaction ... This is a huge change and will break save compatibility	2023-04-10 19:28:16 +03:00
Ivan Savenko	42b2be4bbb	Merge pull request #1908 from SoundSSGood/art-client-server-fixes ... Artifact related fixes	2023-04-10 18:26:49 +03:00
Konstantin	40bea35a26	CHeroWindow: fix picked art mana limit display	2023-04-10 15:35:21 +03:00
Ivan Savenko	07230f3b47	Attempt to fix stack splitting on macos	2023-04-10 14:34:17 +03:00
Ivan Savenko	02c9a3f3d8	Correctly reset UI on aborting Clone/Sacrifice	2023-04-10 14:33:24 +03:00
nordsoft	c0b90432cb	Change callback interface	2023-04-10 05:40:03 +04:00
nordsoft	e440343921	Bypass initial version of spell callback	2023-04-10 04:34:24 +04:00
Ivan Savenko	e2d0cd37e4	Merge pull request #1910 from IvanSavenko/beta_fixes ... Fixes for 1.2 branch	2023-04-09 20:09:03 +03:00
Ivan Savenko	6e90c0fd09	Merge pull request #1913 from IvanSavenko/fix_shooting_yourself_in_the_foot ... Fix initialization of spell effects registry	2023-04-09 20:07:29 +03:00
nordsoft	08809f1cdc	String building id	2023-04-09 04:53:06 +04:00
nordsoft	307fb071a2	VCMI campaign format support prototype	2023-04-09 03:24:40 +04:00
nordsoft	9e5e1aebbc	Remove hardcoded campaign screens	2023-04-09 00:16:11 +04:00
Adriankhl	1d6192ca62	Shut down the thread for tactic phase properly	2023-04-08 22:52:46 +04:00
Ivan Savenko	84af64ce6b	Removed magical initialization of registry via static variables	2023-04-08 21:29:04 +03:00
krs	7eda4b6c1e	replaced SDLK_LSHIFT check with GH.isKeyboardShiftDown()	2023-04-08 20:42:37 +03:00
krs	3194999809	Add SHIFT + hover shortcut to show movement highlight while pressed.	2023-04-08 20:42:37 +03:00
krs	aba5840a6f	Removed Max Movement Highlight stubs	2023-04-08 20:40:30 +03:00
krs	1644cab938	Added combat option Highlight Movement on Hover	2023-04-08 20:40:30 +03:00
krs	9012a25276	Stub For Max Movement Range highlight ... When a creature is hovered., besides movement, for max possible movement, a hex in center of map is now highlighted.	2023-04-08 20:39:59 +03:00
krs	51ad49532b	Fix for wrong merge :(	2023-04-08 20:39:59 +03:00
krs	dab07bdef9	Now unit range is shown in Tactics phase as well ... A new parameter: isActiveStack was needed in battleGetAvailableHexes, so that we show the propper Tactics range.	2023-04-08 20:39:59 +03:00
krs	e1c388465a	HD mod highlighting of movement for hovered stack. ... Does not work as intended in tactics mode.	2023-04-08 20:39:59 +03:00
nordsoft	50115c3113	Rename variables	2023-04-08 20:56:05 +04:00
Ivan Savenko	454168897e	Fix handling of invalid hotkeys in configurable UI	2023-04-08 19:53:13 +03:00
Ivan Savenko	71ddaeea6e	Fix crash on missing music file	2023-04-08 19:47:16 +03:00
Ivan Savenko	4d37686eb3	Merge pull request #1901 from rilian-la-te/disable-info-bar-scroll ... InfoBar: disable scrollbar	2023-04-08 19:12:48 +03:00
Ivan Savenko	d00fa5bf86	Merge pull request #1887 from Adriankhl/fix_dropbox_left_click ... Fix: close dropbox with left mouse click outside of the dropbox	2023-04-08 19:11:50 +03:00
Ivan Savenko	0abc00f82e	Fix assertion failure in in-game console	2023-04-08 18:53:47 +03:00
Ivan Savenko	3dedc963f7	Fix double-playing of battle effects	2023-04-08 18:53:28 +03:00
SoundSSGood	e58be8e7f7	vcmiartifacts fixed	2023-04-08 12:28:53 +03:00
Ivan Savenko	e35a1ba471	Merge pull request #1876 from rilian-la-te/refactoring-v1 ... VCMI Refactoring	2023-04-08 11:14:05 +03:00
Konstantin	50c9a57133	InfoBar: fix tiny selection with data	2023-04-08 01:44:08 +03:00
nordsoft	52b53ab307	Feature and setting implemented	2023-04-08 01:49:59 +04:00
SoundSSGood	ea7dd14d8b	client is able to erase artifact	2023-04-08 00:41:55 +03:00
Konstantin	f8c15f3a4b	InfoBar: disable scrollbar	2023-04-07 20:50:47 +03:00
Ivan Savenko	c675e6878a	Merge pull request #1878 from IvanSavenko/fix_battle_ui ... Fix visual glitches in battle UI	2023-04-07 12:41:29 +03:00
nordsoft	b1d06b6141	Complete quick combat feature	2023-04-06 22:49:38 +04:00
nordsoft	e85593dbb3	Save & restore mana	2023-04-06 21:19:46 +04:00
Adriankhl	57409a0d94	fix: close dropbox with left mouse click outside of the dropbox	2023-04-06 18:32:21 +02:00
nordsoft	3e28b58c80	Fixes	2023-04-06 19:59:22 +04:00
nordsoft	ce3028bd73	Intermediate commit	2023-04-06 19:34:07 +04:00
Konstantin	11b237a23c	vcmi: massive refactoring v1	2023-04-05 22:33:12 +03:00
Ivan Savenko	a3c5f75600	Fix visibility of alternative actions button in tactics stage	2023-04-05 18:36:10 +03:00
Ivan Savenko	cf966015bb	Correctly update battle queue state after changing its state	2023-04-05 18:35:45 +03:00
Konstantin	e0715a76c8	vcmi: reduce CStack usage a little bit	2023-04-04 23:02:54 +03:00
Ivan Savenko	0770a1a153	TTF fonts can now be used as fallback for H3 fonts	2023-04-04 22:23:32 +03:00
Ivan Savenko	307065a633	Merge beta into develop	2023-04-04 16:06:20 +03:00
Ivan Savenko	5b480124b8	Merge pull request #1862 from IvanSavenko/fix_garrison_move_shortcut ... Space and left-clicking on second hero in town now have share code	2023-04-04 11:23:19 +03:00
Ivan Savenko	d6cb513374	Merge pull request #1858 from IvanSavenko/sliders_fix ... Allow defining active areas for sliders.	2023-04-04 11:21:45 +03:00
Ivan Savenko	93b77d0c99	Space and left-clicking on second hero in town now have share code	2023-04-03 00:43:18 +03:00
Ivan Savenko	507d8bf7fd	Allow defining active areas for sliders. Fixes settings window.	2023-04-02 22:24:07 +03:00
Ivan Savenko	c661419897	Merge pull request #1700 from rilian-la-te/resource-array ... Modernize resourceSet.	2023-04-02 20:12:45 +03:00
Ivan Savenko	efbc5cf581	Merge pull request #1815 from IvanSavenko/beta_fixes ... Beta fixes	2023-04-02 20:02:41 +03:00
Ivan Savenko	519513e512	Merge pull request #1830 from SoundSSGood/beta ... Graphical glitches fixed	2023-04-01 23:14:13 +03:00
SoundSSGood	348684f93e	Graphical glitches fixed	2023-04-01 16:15:10 +03:00
krs	a8f13bb927	Add RALT key check for movement info	2023-04-01 00:20:51 +03:00
Ivan Savenko	e9aed2761c	Fix target selection for teleport	2023-03-31 23:18:45 +03:00
Ivan Savenko	4c6dbb5037	Fix town UI update on building new structures	2023-03-31 23:18:45 +03:00
Ivan Savenko	839172cd30	Do not attempt to play animations when map is inactive	2023-03-31 23:18:45 +03:00
Adriankhl	8c5c943da9	Show movement cost immediately after pressing left alt key	2023-03-31 17:48:31 +02:00
Konstantin	c1fd7309ad	ResourceSet: composition	2023-03-31 14:00:49 +03:00
Ivan Savenko	ea1d177c9b	Fixed false error messages on game startup	2023-03-31 01:28:56 +03:00
Ivan Savenko	6e28b6ed90	Do not crash on invalid callback name	2023-03-31 01:28:33 +03:00
Konstantin	d83e58f948	vcmi: use new animation functions in client	2023-03-31 01:01:25 +03:00
Konstantin	eff41f66ed	vcmi: now obstacles can have disappearing anim ... It is a reverse version of appearingAnimation.	2023-03-31 01:01:25 +03:00
Konstantin	7543fdf787	vcmi: add reverse effect animation type ... To be used later with obstacle removal	2023-03-31 01:01:25 +03:00
Konstantin	c4d5a7a2d6	vcmi:towns now can choose if moat render is needed ... Using invalid points. Also removed unused variable.	2023-03-31 01:01:25 +03:00
Ivan Savenko	46ccd65080	Removed largely unused signal handling, fixes build with musl c library	2023-03-30 14:56:13 +03:00
Konstantin	5716925b47	NetPacks: change GiveBonus enum to enum class.	2023-03-30 12:41:17 +03:00
Ivan Savenko	1084da00df	Fix initial value of sound/music labels in settings	2023-03-30 12:23:47 +03:00
Ivan Savenko	484f0a175a	Blocked movement of war machines in tactics phase	2023-03-30 12:20:13 +03:00
Ivan Savenko	974be97e6d	Merge pull request #1792 from IvanSavenko/happy_dydzio ... Fixes for beta - graphical artifacts	2023-03-30 00:11:19 +03:00
Ivan Savenko	a42dc923e4	Remove hardcoded constant	2023-03-29 14:33:44 +03:00
Ivan Savenko	1fcaeba8e0	Fix stack amount boxes flickering between actions	2023-03-29 13:21:43 +03:00
Ivan Savenko	3af829e6af	Fix stack label position updates	2023-03-29 13:03:40 +03:00
Ivan Savenko	0c023347dd	Fix potential nullptr dereference	2023-03-28 23:50:57 +03:00
Ivan Savenko	06f9759aee	Fix crash on using Teleport/Sacrifice spells	2023-03-28 23:50:42 +03:00
Ivan Savenko	0ce06e0f30	Improved rendering of stack amount boxes	2023-03-28 23:50:22 +03:00
Ivan Savenko	2cca15c2db	Fix graphical artifact in hero movement animation	2023-03-28 22:37:53 +03:00
Ivan Savenko	9062d67f80	Fixed volume of ambient sounds	2023-03-28 18:56:44 +03:00
Ivan Savenko	238de8a5d7	Properly disable combat panel during spell targeting	2023-03-28 18:14:09 +03:00
Ivan Savenko	47e774897d	Show simple message on left-clicking empty buildings	2023-03-28 17:36:46 +03:00
Ivan Savenko	fd3f80e860	Fix game hang on invalid shooter animation config	2023-03-28 17:04:18 +03:00
Ivan Savenko	b2f5042942	Merge pull request #1783 from vcmi/beta ... Merge beta -> develop	2023-03-27 21:21:25 +03:00
Ivan Savenko	b875da108b	Merge pull request #1717 from SoundSSGood/backpack-limit-size ... Introducing backpack size limit functionality	2023-03-27 17:17:49 +03:00
Konstantin	1b893fa525	client: do not show obstacles placed by another player	2023-03-26 21:23:54 +03:00
Ivan Savenko	da3a05bc8b	Fix special colors in battle	2023-03-26 00:46:21 +02:00
Ivan Savenko	4c311da21b	Clamp potential kills tooltip to target unit size	2023-03-26 00:07:21 +02:00
Ivan Savenko	5857ad0169	Fix corrupted UI redraw in artifact merchant	2023-03-25 23:54:51 +02:00
Ivan Savenko	c246cadaa7	Fix potential crash on exit	2023-03-25 23:54:51 +02:00
Ivan Savenko	46461e5c33	Improve performance of window redraws	2023-03-25 23:54:51 +02:00
Ivan Savenko	4eed0b2c9e	Added workaround for Dungeon towers	2023-03-25 23:54:51 +02:00
Ivan Savenko	49fa628e9b	Turret creature cutoff position should match H3	2023-03-25 23:54:51 +02:00
Ivan Savenko	dcff463d36	Fixed handling of special palette colors in palette transformations ... Fixes black color turning semi-transparent in some creatures from mods	2023-03-25 23:54:51 +02:00
Ivan Savenko	2167cb2a68	Fix battle startup with "no intro sound" mod	2023-03-25 23:54:51 +02:00
Ivan Savenko	339bbce7b7	Added more checks to avoid potential nullptr dereference crash	2023-03-25 23:54:51 +02:00
Ivan Savenko	5288e3761e	Merge pull request #1764 from IvanSavenko/selectable_spellcaster ... Implemented support for multi-spell casters	2023-03-25 20:08:47 +02:00
Ivan Savenko	786035085a	Merge pull request #1770 from Adriankhl/fix_label_update_on_hit ... Process attack/attacked animation before dealing damage to units	2023-03-25 20:06:23 +02:00
Ivan Savenko	6f631a0aa7	Merge pull request #1759 from IvanSavenko/kills_in_tooltip ... Show potential kill amount in attack tooltip	2023-03-25 20:03:27 +02:00
Ivan Savenko	382fbf423d	Merge pull request #1762 from IvanSavenko/reactivation_fix ... Do not activate new items when parent widget is inactive	2023-03-25 20:02:46 +02:00
Adriankhl	792ea2f06f	Process attack/attacked animation before dealing damage to units	2023-03-25 15:00:25 +01:00
Ivan Savenko	9a19feaf4a	Fix spellcasters with massive spells	2023-03-25 01:23:49 +02:00
Ivan Savenko	dc099b2a35	Implemented support for multi-spell casters	2023-03-25 00:48:14 +02:00
Adriankhl	76a71226a2	Deactivate activeStack during spellCast	2023-03-24 22:43:41 +01:00
Ivan Savenko	b0a3f95d20	Do not activate new items when parent widget is inactive	2023-03-24 18:56:38 +02:00
Ivan Savenko	970981cfc9	Show information on potential kills in attack tooltip	2023-03-24 17:18:47 +02:00
Adriankhl	49662f6f36	Deactivate activeStack when auto combat starts	2023-03-23 22:37:39 +01:00
Ivan Savenko	31147ac83b	refactoring: TDmgRange pair -> DamageRange struct	2023-03-23 17:49:33 +02:00
Ivan Savenko	a8fe8c0f3b	Converted timer event into tick event that is called every frame	2023-03-22 23:10:50 +02:00
Ivan Savenko	8af76947cb	Do not cache hovered tile and always update state	2023-03-22 19:49:57 +02:00
Ivan Savenko	fa9abf6adc	Lock UI while adventure map has animations	2023-03-22 19:49:24 +02:00
Ivan Savenko	54e8abb3eb	Fix map animation playback speed	2023-03-22 15:51:25 +02:00
Ivan Savenko	ef07935fbc	Update town visual when new structure is built	2023-03-22 14:41:36 +02:00
Ivan Savenko	c81d57ab8c	Remove excessive totalRedraw's	2023-03-22 00:57:08 +02:00
Ivan Savenko	a78f7de9cd	Fix crash on defeating hero in boat	2023-03-22 00:38:55 +02:00
SoundSSGood	19096f39f0	Backpack limit. Amount of fixes.	2023-03-21 22:11:42 +02:00
Ivan Savenko	bb03abdce6	Fix crash on switching players in hotseat	2023-03-21 19:06:38 +02:00
Ivan Savenko	bfe7bb11ab	Fix crash on winning scenario	2023-03-21 18:40:48 +02:00
Ivan Savenko	9dceed4f56	Merge pull request #1729 from IvanSavenko/battle_animation_fixes ... Fixes for battle UI regressions	2023-03-21 14:32:45 +02:00
Ivan Savenko	4968ac58b4	Do not abort battle opening sound, only allow actions	2023-03-21 13:49:19 +02:00
SoundSSGood	f0f9eecf97	Backpack limit part5. End of battle. Other stuff	2023-03-21 12:14:33 +02:00
SoundSSGood	9f8aa25297	Backpack limit part4 (Using cheats, buying)	2023-03-21 12:14:33 +02:00
SoundSSGood	e23766280f	Backpack limit part2 (Pick up, Dig up, Object rewards)	2023-03-21 12:14:33 +02:00
SoundSSGood	96e8a1f21c	Backpack limit part1 (move, disassemble)	2023-03-21 12:14:33 +02:00
SoundSSGood	72122fb433	CArtifact, CArtifactInstance, CCombinedArtifactInstance reorganization	2023-03-21 12:14:33 +02:00
Ivan Savenko	4919550a19	Show a message that battle intro can be skipped	2023-03-20 21:58:32 +02:00
Ivan Savenko	2864a04bda	Minor refactoring	2023-03-20 20:19:05 +02:00
Ivan Savenko	31b718898a	Fix playback of shooter animations at max speed	2023-03-20 20:19:05 +02:00
Ivan Savenko	688b8db3eb	Removed delays due to thread waits from battle animations	2023-03-20 20:19:05 +02:00
Konstantin	5462a92930	Fix #1688 again	2023-03-18 01:19:41 +03:00
Ivan Savenko	dfd6998a9e	Merge pull request #1702 from IvanSavenko/disable_client_state_load ... Disable loading of client save game	2023-03-17 22:15:18 +02:00
Adriankhl	4718396f5f	Prevent crashing when pressing auto-combat button on enemy turn	2023-03-17 15:40:14 +01:00
Ivan Savenko	a3059033f2	Fixes broken client state, e.g. movement. Effectively reverts #1663	2023-03-17 16:00:47 +02:00