4148 Commits

Author	SHA1	Message	Date
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