5168 Commits

Author	SHA1	Message	Date
nordsoft	ece8a2a41f	Merge branch 'battle-dialog' into battle-dialog2 ... # Conflicts: # AI/BattleAI/BattleAI.h # AI/StupidAI/StupidAI.h # client/CPlayerInterface.cpp # client/CPlayerInterface.h # client/Client.cpp # client/NetPacksClient.cpp # client/battle/CBattleInterface.cpp # client/battle/CBattleInterface.h # client/battle/CBattleInterfaceClasses.cpp # client/battle/CBattleInterfaceClasses.h # config/schemas/settings.json # lib/CGameInterface.h # lib/IGameEventsReceiver.h # lib/NetPacks.h # lib/NetPacksLib.cpp # lib/battle/BattleInfo.cpp # server/CGameHandler.cpp # server/CQuery.h	2023-04-06 19:53:52 +04:00
nordsoft	ce3028bd73	Intermediate commit	2023-04-06 19:34:07 +04:00
Konstantin	a04d8b34f3	vcmi: fix rmg header levels ... It was printed as char, not as int.	2023-04-06 12:48:53 +03:00
Konstantin	11b237a23c	vcmi: massive refactoring v1	2023-04-05 22:33:12 +03:00
Andrey Filipenkov	1da06e04cc	fix "development mode" condition when building in single process mode	2023-04-05 20:22:29 +03:00
Konstantin	ee489f18d2	vcmi: PlayerState is now an Entity ... This will reduce code duplication a little bit.	2023-04-05 01:22:04 +03:00
Konstantin	8968f0ef0e	vcmi: change EAlignment to enum class	2023-04-05 01:22:04 +03:00
Konstantin	0c7dbea990	HeroBonus: remove unused function	2023-04-04 23:02:55 +03:00
Konstantin	b7d6270272	vcmi: add getNativeTerrain method to factions	2023-04-04 23:02:55 +03:00
Konstantin	e0715a76c8	vcmi: reduce CStack usage a little bit	2023-04-04 23:02:54 +03:00
Konstantin	22dd97ad18	vcmi: use entilites when possible part 1	2023-04-04 23:02:54 +03:00
Ivan Savenko	c5225aab70	Fix serialization	2023-04-04 22:22:58 +03:00
Ivan Savenko	fc750d0917	Fix identifiers resolving for stack experience bonuses	2023-04-04 17:12:40 +03:00
Ivan Savenko	307065a633	Merge beta into develop	2023-04-04 16:06:20 +03:00
Ivan Savenko	6b2b8bb5c0	Merge pull request #1863 from IvanSavenko/fix_mod_identifiers ... Fix mod identifiers	2023-04-04 11:22:30 +03:00
DjWarmonger	53df84459f	Merge pull request #1781 from vcmi/object_distribution ... Improved object distribution	2023-04-04 06:52:10 +02:00
Tomasz Zieliński	1e18887c9c	Merge remote-tracking branch 'origin/beta' into object_distribution	2023-04-04 05:52:57 +02:00
Ivan Savenko	255bb145b9	Added fallback for 1.2 compatibility	2023-04-03 16:26:43 +03:00
Ivan Savenko	766fb066c6	Fix debug build	2023-04-03 15:15:51 +03:00
Ivan Savenko	c5acb8bb7d	Fixed empty scope on resolving map overrides	2023-04-03 15:15:29 +03:00
Ivan Savenko	191959ae05	Fixed moat identifiers requests - will now always request spells	2023-04-03 15:15:12 +03:00
Ivan Savenko	2d0344f905	VCMI will now correctly resolve identifiers in unexpected form	2023-04-03 15:14:34 +03:00
Ivan Savenko	6683c866ee	Disabled check for unused lines in translations due to false positives	2023-04-03 01:12:48 +03:00
Ivan Savenko	10e852fcb9	Fix scope of identifiers resolving for commanders abilities	2023-04-03 01:12:04 +03:00
Konstantin	f41b2475fe	vcmi: fix stack smash	2023-04-02 23:27:15 +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	6dac15c5b2	Merge pull request #1706 from rilian-la-te/moats-landmines ... Proper moats: mechanincs	2023-04-02 20:12:33 +03:00
Ivan Savenko	c5ca17a324	Merge pull request #1853 from Nordsoft91/fix-scope-guard ... Fix ScopeGuard move behavior	2023-04-02 20:10:26 +03:00
Ivan Savenko	1cb0c6b270	Merge pull request #1848 from Nordsoft91/editor-fix ... Fix map editor crash with cutting random town	2023-04-02 20:09:24 +03:00
Ivan Savenko	a3074e2741	Merge pull request #1835 from rilian-la-te/fix-native-type ... CCreatureHandler: fix native terrain for any	2023-04-02 20:08:18 +03:00
nordsoft	91ef7cbb4f	Fix ScopeGuard move behavior	2023-04-02 15:46:56 +04:00
nordsoft	d63e32841d	Fix divide by zero crash	2023-04-02 15:28:41 +04:00
nordsoft	1e5362cb07	Fix crash with cutting random town	2023-04-02 14:06:16 +04:00
Konstantin	cabe228ebc	CCreatureHandler: fix native terrain for any	2023-04-02 02:32:40 +03:00
Konstantin	ff3e761f3b	CTownHandler: remove hardcoded Cove grail ... We have now exactly same definition in Json	2023-04-02 00:27:29 +03:00
Ivan Savenko	4d6b88f10d	Merge pull request #1821 from rilian-la-te/remove-cove-hardcode ... CTownHandler: remove hardcoded Cove grail	2023-04-02 00:20:49 +03:00
Ivan Savenko	042e46580b	Fix uninitialized variable	2023-04-01 23:59:31 +03:00
Tomasz Zieliński	aca227b5e4	Manually adjust the position of town - noticeable on S maps.	2023-04-01 17:07:43 +02:00
Konstantin	3df5964847	CTownHandler: remove hardcoded Cove grail ... We have now exactly same definition in Json	2023-04-01 03:14:35 +03:00
Ivan Savenko	a64f35c933	Merge pull request #1765 from vcmi/fix_horde_buildings_load ... Fix loading horde buildings predefined in editor	2023-03-31 17:59:26 +03:00
Tomasz Zieliński	308b42549b	Merge remote-tracking branch 'origin/beta' into object_distribution	2023-03-31 15:44:14 +02:00
Konstantin	6d17b9342d	ResourceSet: resolve .at troubles	2023-03-31 14:12:38 +03: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
Konstantin	d8a237ba46	vcmi: add getTrigger method to obstacles ... Fixes advanced remove obstacle spell	2023-03-31 01:01:26 +03:00
Konstantin	25956e3f37	vcmi: bump serializer version	2023-03-31 01:01:25 +03:00
Konstantin	ecae600563	effects: Moat now includes battlefield bonus ... This is an implementation which works exactly like in H3	2023-03-31 01:01:25 +03:00
Konstantin	f704a17e1a	vcmi: add a last hex setting ... I consider this behaviour as H3 bug, but this is H3. So, added a setting to disable this behaviour.	2023-03-31 01:01:25 +03:00
Konstantin	179cee3e88	vcmi: add obstacle animation helper functions	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