6357 Commits

Author	SHA1	Message	Date
Ivan Savenko	f4feaea177	Merge pull request #3141 from IvanSavenko/better_tooltips ... Better tooltips	2023-11-07 22:46:02 +02:00
Tomasz Zieliński	01f70475ad	Missing change	2023-11-07 20:58:22 +01:00
Tomasz Zieliński	c909bd766e	Merge remote-tracking branch 'origin/develop' into fix_rmg_teams ... # Conflicts: # lib/rmg/CMapGenOptions.cpp # lib/rmg/CMapGenOptions.h	2023-11-07 20:54:04 +01:00
nordsoft	870aeddad5	Serialize owner for abandoned mine	2023-11-07 20:11:24 +02:00
Ivan Savenko	414c25ea49	Use minstd_rand instead of mt19937 to avoid save game bloat	2023-11-06 23:35:28 +02:00
Ivan Savenko	2f3d14da5c	Show quest description only after visit	2023-11-06 20:37:17 +02:00
Ivan Savenko	d7d8177390	Show artifact description and icon on right click if UI tweaks are on	2023-11-06 20:37:17 +02:00
Ivan Savenko	c1c2119f3d	Show Seer Hut quest icon on right click. Fix broken tooltip.	2023-11-06 20:37:07 +02:00
Ivan Savenko	1ebb151b41	Show available creatures in owned dwellings on right-click	2023-11-06 20:37:07 +02:00
Ivan Savenko	f039b20653	Improvement for wandering monster tooltip/hover text: ... - show Visions information only on right-click (H3 logic) - show threat level only on right-click and only if UI tweaks are on	2023-11-06 20:37:07 +02:00
Ivan Savenko	2bf599bbee	Merge pull request #3119 from Nordsoft91/rmg-fix ... Fix crash caused by duplicated delete	2023-11-05 17:09:52 +02:00
Andrii Danylchenko	0927d3e3e8	Merge pull request #3145 from vcmi/fix-3142 ... #3142 - fi custom campaign selection screen	2023-11-05 11:12:58 +02:00
Ivan Savenko	5487f07d3b	added toEntity overload that accepts generic Services class	2023-11-04 17:04:53 +02:00
Andrii Danylchenko	d50ebd7d58	#3142 - fi custom campaign selection screen	2023-11-04 14:34:18 +02:00
Ivan Savenko	04aeea9b68	use toEnum instead of getNum for switch'es	2023-11-03 19:20:25 +02:00
Ivan Savenko	f1032063bc	Restore implicit conversion	2023-11-03 16:03:29 +02:00
Ivan Savenko	cac37df334	Remove unused constructor	2023-11-03 16:03:29 +02:00
Ivan Savenko	184f5a72cc	Use toEntity/toXXX methods in Identifier instead VLC objects access	2023-11-03 16:03:29 +02:00
Ivan Savenko	8d5fa41a19	Minor fixes	2023-11-03 16:03:29 +02:00
Ivan Savenko	3634fb2158	Remove int <=> Identifier comparisons	2023-11-03 16:03:29 +02:00
Ivan Savenko	885dce0c27	Replace static_cast's of Identifiers with getNum call	2023-11-03 16:03:29 +02:00
Ivan Savenko	8f25f1fd4b	Serialize identifiers without implicit conversion to int	2023-11-03 16:03:29 +02:00
Ivan Savenko	2b9c362d5b	Explicitly convert identifier to underlying enumeration	2023-11-03 16:03:29 +02:00
Ivan Savenko	87f6c7354b	Merge pull request #3139 from IvanSavenko/component_variant_identifier ... Refactoring of Component class	2023-11-03 15:52:07 +02:00
Ivan Savenko	eea4cbf242	Merge pull request #3136 from IvanSavenko/fix_teleport ... Fix crash on teleport cast	2023-11-03 15:49:55 +02:00
Ivan Savenko	02b4947db9	Fix build	2023-11-02 20:01:20 +02:00
Ivan Savenko	056ef00f74	Bugfixing	2023-11-02 13:52:58 +02:00
Ivan Savenko	f201e3019a	Fix crash on right-clicking rewardable objects with no hero selected	2023-11-02 12:00:05 +02:00
Ivan Savenko	10e50548e7	Converted Component class to use VariantIdentifier instead of int	2023-11-02 12:00:04 +02:00
Ivan Savenko	b42f073f0c	Stabilization	2023-11-01 18:26:57 +02:00
Ivan Savenko	e57276b7c5	Correctly initialize battleID for teleport action	2023-11-01 17:24:41 +02:00
Ivan Savenko	8346d71c98	Remove more subID access	2023-11-01 14:44:05 +02:00
Ivan Savenko	5cdbf408c7	Slightly simplified heroes initialization	2023-11-01 14:43:20 +02:00
Ivan Savenko	461c481ef3	Fix game startup	2023-11-01 14:43:20 +02:00
Ivan Savenko	cc30bdda04	Remove few more subID usages	2023-11-01 14:43:20 +02:00
Ivan Savenko	7a09646009	Cleaned up dwelling randomization	2023-11-01 14:43:20 +02:00
Ivan Savenko	dcb8f4fc7b	Moved object type randomization to object class	2023-11-01 14:43:20 +02:00
Ivan Savenko	03e1169781	Reduced number of accesses to CGObjectInstance::subID	2023-11-01 14:43:20 +02:00
Ivan Savenko	7107b3202f	Merge pull request #3069 from SoundSSGood/artifact-location-id ... ArtifactLocation now use ID for artHolder identification	2023-11-01 14:41:36 +02:00
Andrii Danylchenko	caffc8f3cd	Merge pull request #3122 from vcmi/fix-2993 ... #2993 - destruct battle info first when destructing CGameState	2023-10-31 21:43:55 +02:00
Andrii Danylchenko	25b64dd08b	Update lib/gameState/CGameState.cpp ... Co-authored-by: Ivan Savenko <saven.ivan@gmail.com>	2023-10-31 21:43:06 +02:00
Tomasz Zieliński	29f023eaa5	More tolerance for Subterranean Gates placement	2023-10-31 16:04:21 +01:00
Tomasz Zieliński	6625831cf6	Use the object templates with least terrains allowed.	2023-10-31 09:07:53 +01:00
Tomasz Zieliński	6e7b68d0e6	Unused variable, unused code	2023-10-30 21:33:49 +01:00
Tomasz Zieliński	80198f21d8	Revert "Fix unused variable" ... This reverts commit c753a1fdf7.	2023-10-30 21:07:50 +01:00
Tomasz Zieliński	3b7b21bcc8	Fix unused variable	2023-10-30 21:07:14 +01:00
Tomasz Zieliński	c753a1fdf7	Fix unused variable	2023-10-30 20:59:13 +01:00
Tomasz Zieliński	e105b23a37	Merge remote-tracking branch 'origin/develop' into fix_rmg_teams ... # Conflicts: # Mods/vcmi/config/vcmi/rmg/heroes3/newcomers.JSON # Mods/vcmi/config/vcmi/rmg/heroes3/southOfHell.JSON # Mods/vcmi/config/vcmi/rmg/symmetric/2sm0k.JSON # Mods/vcmi/config/vcmi/rmg/symmetric/2sm2i(2).JSON # Mods/vcmi/config/vcmi/rmg/symmetric/3sb0b.JSON # Mods/vcmi/config/vcmi/rmg/symmetric/3sb0c.JSON # Mods/vcmi/config/vcmi/rmg/symmetric/5sb0a.JSON # Mods/vcmi/config/vcmi/rmg/symmetric/5sb0b.JSON # Mods/vcmi/config/vcmi/rmg/symmetric/7sb0b.JSON # Mods/vcmi/config/vcmi/rmg/symmetric/7sb0c.JSON # client/lobby/RandomMapTab.cpp	2023-10-30 20:08:13 +01:00
Tomasz Zieliński	5962e5c0e0	Fix infinite loop	2023-10-30 19:47:59 +01:00
Tomasz Zieliński	ec0bf05163	Rename "cpu" parameter to correct "humans"	2023-10-30 17:21:03 +01:00
Ivan Savenko	29a78c14a2	Merge pull request #3113 from Alexander-Wilms/develop ... Fix small issues	2023-10-30 11:02:28 +02:00
Tomasz Zieliński	f39edf9413	Update ally and enemy flags when selecting new template	2023-10-30 07:48:51 +01:00
Tomasz Zieliński	4f2cde018c	Fixed most of reported issues, removed unused code.	2023-10-29 21:25:39 +01:00
Andrii Danylchenko	1418e6884e	Merge pull request #2847 from vcmi/trap-1912 ... #1912 trap, exception on adding duplicating hero	2023-10-29 19:24:47 +02:00
SoundSSGood	7e6ab5e87b	fix test & fix build & suggested changes	2023-10-29 17:46:14 +02:00
SoundSSGood	c2f658d638	Bulk move artifacts. id	2023-10-29 17:46:13 +02:00
SoundSSGood	3c5527a222	ArtifactLocation now use ID for artHolder identification part3	2023-10-29 17:46:13 +02:00
SoundSSGood	ab2f6abb87	ArtifactLocation now use ID for artHolder identification part2	2023-10-29 17:46:13 +02:00
SoundSSGood	61fc236d79	ArtifactLocation now use ID for artHolder identification part1	2023-10-29 17:46:13 +02:00
Ivan Savenko	207968ced3	Merge pull request #3116 from IvanSavenko/bonus_fixes ... Bonuses fixes	2023-10-29 16:32:48 +02:00
Alexander Wilms	5cbc75d3b7	Merge remote-tracking branch 'upstream/develop' into develop	2023-10-29 13:35:37 +00:00
Ivan Savenko	e2cffd4c7b	Merge pull request #3118 from rilian-la-te/glamor-slight-bonus-fixes ... Small bonus fixes	2023-10-29 15:23:07 +02:00
Ivan Savenko	3016014543	Merge pull request #3110 from IvanSavenko/mod_compat_fix ... Mod compatibility fixes	2023-10-29 14:30:04 +02:00
Ivan Savenko	be5505690d	Apply suggestions from code review ... Co-authored-by: Nordsoft91 <nordsoft@yahoo.com>	2023-10-29 13:47:56 +02:00
Ivan Savenko	cc5bc40103	Merge pull request #3105 from IvanSavenko/fix_conflicts ... Fix handling of conflicting mods by game client	2023-10-29 13:47:04 +02:00
Ivan Savenko	0169c65937	Merge pull request #3100 from IvanSavenko/split_net_packs ... Split netpacks.h into multiple files	2023-10-29 13:46:40 +02:00
Tomasz Zieliński	368a185008	Cleaning up the code	2023-10-29 10:05:24 +01:00
Andrii Danylchenko	b579ca8a33	#1912 trap, exception on adding duplicating hero	2023-10-29 11:03:37 +02:00
Andrii Danylchenko	4d6d64837f	#2993 - destruct battle info first when destruction CGameState	2023-10-29 09:41:22 +02:00
nordsoft	35e7fbb366	Fix crash cause by duplicated delete	2023-10-28 22:22:30 +02:00
Tomasz Zieliński	07dac8b6d4	Works more or less	2023-10-28 20:30:38 +02:00
Konstantin	df07b27129	parseSelector: fix anyOf and noneOf	2023-10-28 18:35:59 +03:00
Ivan Savenko	36eacf99d5	Cleanup	2023-10-28 17:58:08 +03:00
Ivan Savenko	4ba8014573	Added subtype for SPELL_DURATION	2023-10-28 17:57:56 +03:00
Ivan Savenko	1e0ea5f1f0	documented NEGATIVE_EFFECTS_IMMUNITY, fixed subtype loading	2023-10-28 17:56:11 +03:00
Ivan Savenko	1459006916	Added separate bonus for native terrain check	2023-10-28 17:54:58 +03:00
Alexander Wilms	3d8dd35d43	lib/NetPacksLib.cpp: Directly assign to the "std::optional", without dereferencing it. ... Assigning to an optional should directly target the optional	2023-10-28 10:15:50 +00:00
Alexander Wilms	703ab677ba	lib/mapObjects/IMarket.cpp: Show error message about failed dynamic_cast() even if cast object is nullptr	2023-10-27 23:43:39 +00:00
Alexander Wilms	03835236fb	lib/mapObjects/CGPandoraBox.cpp: Identical sub-expressions on both sides of operator "||". ... Identical expressions should not be used on both sides of a binary operator	2023-10-27 23:40:55 +00:00
Alexander Wilms	860f6150aa	lib/mapObjects/IMarket.cpp: Forming reference to null pointer ... Null pointers should not be dereferenced	2023-10-27 23:34:11 +00:00
Alexander Wilms	f01ec55d21	Use the "nullptr" literal. ... "nullptr" should be used to denote the null pointer	2023-10-27 18:18:59 +00:00
Alexander Wilms	70acf987b4	lib/BasicTypes.cpp: Remove the unary minus operator or change the expression's underlying type. ... Unary minus should not be applied to an unsigned expression	2023-10-27 14:47:09 +00:00
Alexander Wilms	2b21001743	lib/rmg/RoadPlacer.cpp: Remove "e" from this "throw" statement to rethrow the original exception. ... The original exception object should be rethrown	2023-10-27 14:35:03 +00:00
Ivan Savenko	feae8b6ae4	Do not allow loading new objects into another mod namespace	2023-10-26 15:32:46 +03:00
Ivan Savenko	6337b0d3b9	Fix potential crash on loading mod with invalid handler name	2023-10-26 15:32:13 +03:00
Tomasz Zieliński	36911d1e0a	Merge remote-tracking branch 'origin/develop' into fix_rmg_teams ... # Conflicts: # client/lobby/RandomMapTab.cpp	2023-10-26 10:31:41 +02:00
nordsoft	b6b75beb29	Fixes for map editor ... 1) fix owner serialization for hero placeholder 2) fix roads/rivers layout 3) fix lasso	2023-10-24 23:58:26 +02:00
Ivan Savenko	c202f58a15	Account for conflicts (and reverse-conflicts) when loading mods	2023-10-24 14:01:20 +03:00
Ivan Savenko	5cbf5031ea	move SetStackEffect to a separate file	2023-10-24 01:27:52 +03:00
Ivan Savenko	77780e0de5	Fix crash on accessing "any" spellschool via bonus system	2023-10-23 22:28:36 +03:00
Ivan Savenko	5523f05284	Moved ArtifactLocation to a separate file	2023-10-23 19:02:28 +03:00
Ivan Savenko	b88a8da4e8	Split off some netpack structures into separate files	2023-10-23 13:59:15 +03:00
Ivan Savenko	d1d4db26e0	Moved existing files to new directory	2023-10-22 22:20:36 +03:00
Ivan Savenko	3880ea58b9	Merge branch 'josch/dos2unix' into develop	2023-10-22 18:39:03 +03:00
Ivan Savenko	3867e512f7	Merge pull request #3064 from IvanSavenko/bonus_metaidentifier ... Type-safe bonus system	2023-10-22 18:34:12 +03:00
Ivan Savenko	b0a67a66e4	Merge pull request #3092 from IvanSavenko/compatibility_mods ... Better support for compatibility mods	2023-10-22 18:02:45 +03:00
Ivan Savenko	8df39c43a0	Fix game loading	2023-10-22 17:04:14 +03:00
Ivan Savenko	a5f0429691	Merge pull request #3083 from Nordsoft91/editor-improvements-1.4 ... Redesign map editor rendering	2023-10-22 16:56:39 +03:00
Ivan Savenko	4f47555977	Split OBJECT bonus source into OBJECT_TYPE and OBJECT_INSTANCE	2023-10-22 16:55:19 +03:00
Ivan Savenko	ac925bb786	Renamed new types for consistency with code style	2023-10-22 16:55:19 +03:00
Ivan Savenko	31cf3442af	Update docs	2023-10-22 16:55:19 +03:00
Ivan Savenko	36a1d6c415	Removed remaining integer bonus subtypes from configs	2023-10-22 16:55:19 +03:00
Ivan Savenko	e54ba7b977	Implement loading of bonus source type	2023-10-22 16:55:19 +03:00
Ivan Savenko	3b010d9596	Renamed MetaIdentifier to VariantIdentifier	2023-10-22 16:55:19 +03:00
Ivan Savenko	80e6485965	MetaIdentifier now uses std::variant internally	2023-10-22 16:55:19 +03:00
Ivan Savenko	b394158dc9	Bonus Source ID now uses metaidentifier	2023-10-22 16:55:18 +03:00
Ivan Savenko	77facf9387	Implement missing functions, fixes linking errors	2023-10-22 16:54:56 +03:00
Ivan Savenko	910ad50417	Fix client & server compilation	2023-10-22 16:54:48 +03:00
Ivan Savenko	0a10fc30b8	(lib) Bonus subtype is now stored as metaidentifier that can store any ... other identifier inside it	2023-10-22 16:54:43 +03:00
Ivan Savenko	7e034814c1	Partially revert "Translation" type changes to avoid breaking mods	2023-10-22 16:51:08 +03:00
Ivan Savenko	454ba44ac5	Merge pull request #2988 from IvanSavenko/configurable_extensions ... Extension of configurable object functionality	2023-10-22 16:24:47 +03:00
Ivan Savenko	8752551786	Merge pull request #3086 from Laserlicht/show_random ... show random maps	2023-10-22 12:29:31 +03:00
Ivan Savenko	adf58fa834	Hide not installed translation mods to languages other than selected one	2023-10-22 00:07:21 +03:00
Ivan Savenko	b50ebba1ba	Added mod type "Compatibility" that is hidden in launcher	2023-10-21 23:55:20 +03:00
Ivan Savenko	b2c336de0d	JsonNode now uses std::variant internally. Fixes crash on deserialize	2023-10-21 20:41:58 +03:00
Laserlicht	0eba0ee686	show random maps	2023-10-21 02:12:34 +02:00
Ivan Savenko	1c4a142849	Fix remaining TODO's	2023-10-21 00:44:57 +03:00
nordsoft	b9a660f6c3	Redesign map editor rendering	2023-10-20 01:25:06 +02:00
Nordsoft91	d03b75696a	Merge pull request #3067 from Nordsoft91/editor-improvements-1.4 ... Add hero placeholder properties	2023-10-19 22:23:58 +02:00
Johannes Schauer Marin Rodrigues	a1a5bc28c2	convert line endings from CRLF (Windows) to LF (Linux/Unix) ... Mixed line endings cause problems when exporting patches with git-format-patch and then trying to "git am" a patch with mixed and non-matching line endings. In such a situation git will fail to apply the patch. This commit runs the dos2unix tools on the remaining files with CRLF (\r\n) line endings to convert them to line-feeds (\n) only. Files that are Windows specific like *.vcxproj and *.props files were not converted. Closes: #3073	2023-10-19 16:23:21 +02:00
Ivan Savenko	4c0eabf20c	Show guards preview for visited banks on right click	2023-10-19 15:41:59 +03:00
Ivan Savenko	01920bb74e	Fix treasure chests	2023-10-19 15:41:41 +03:00
Ivan Savenko	8f4791914e	Show content preview only for Witch Huts / Shrines / Tree	2023-10-19 15:17:58 +03:00
Ivan Savenko	e0f6b582f5	Display object description only on right-click	2023-10-19 14:36:11 +03:00
Ivan Savenko	530c70c282	Added object descriptions present in H3	2023-10-19 13:34:15 +03:00
Ivan Savenko	901fd77699	Fix Cover of Darkness	2023-10-18 18:04:01 +03:00
Ivan Savenko	8f33fdcd83	Allow learning banned spell from Scholars (H3 logic)	2023-10-18 17:38:40 +03:00
Ivan Savenko	ce480c8c84	Fixed Scholar handling	2023-10-18 17:14:22 +03:00
Ivan Savenko	f7718628dc	Merge pull request #3074 from Nordsoft91/quests ... Fix warnings about empty kill target	2023-10-18 12:34:44 +03:00
nordsoft	966ffe4377	Fix warnings about empty kill target	2023-10-18 00:13:32 +02:00
Alexandre Detiste	15e45f966c	typos found by lintian	2023-10-17 22:06:08 +02:00
Ivan Savenko	48eba6c362	Fix Witch Hut messages to match H3	2023-10-17 16:52:57 +03:00
Ivan Savenko	eedaa63f5f	Hnadling of Shrine messages now matches H3	2023-10-17 16:35:34 +03:00
Ivan Savenko	927ce4e60e	Improvements to rewardable objects popups	2023-10-16 23:55:37 +03:00
Nordsoft91	1ffc246c8b	Merge pull request #3051 from Laserlicht/name_change ... possibility to change name in lobby	2023-10-16 22:28:31 +02:00
nordsoft	f6d7755c6a	Add hero placeholder properties	2023-10-16 22:24:12 +02:00
Ivan Savenko	850d0ff8eb	Show (mostly) correct messages in Shrines	2023-10-16 18:16:15 +03:00
Nordsoft91	02c1425939	Merge pull request #3046 from Nordsoft91/editor-improvements-1.4 ... Add map editor zoom and objects lock functionality	2023-10-16 01:22:18 +02:00
Ivan Savenko	0ea44520fd	Fix build	2023-10-16 00:12:39 +03:00
Ivan Savenko	e10de0594e	Scholar is now configurable object (partial)	2023-10-16 00:12:39 +03:00
Ivan Savenko	bb05c2dea5	Implemented configurable shrine	2023-10-16 00:12:39 +03:00
Ivan Savenko	dd841bdaa7	Use enum instead of mix of bool's and int's for tile reveal	2023-10-16 00:12:38 +03:00
Ivan Savenko	98fd939ed6	Cartographer/Observatory is now configurable object	2023-10-16 00:12:38 +03:00
Ivan Savenko	f3ed589e35	Use same fow radius calculation as in H3	2023-10-16 00:12:38 +03:00
Ivan Savenko	a3b2354481	Implemented visit mode "limiter". Fixed h3m variable loading	2023-10-16 00:12:38 +03:00
Ivan Savenko	fd01a25352	Implemented basic version of configurable Witch Hut	2023-10-16 00:12:38 +03:00
Ivan Savenko	79b7518b0e	Unified Json randomization logic for all entity types	2023-10-16 00:12:38 +03:00
Ivan Savenko	aa0b064154	Fixed randomization of artifacts on some custom maps	2023-10-16 00:12:38 +03:00
nordsoft	4651893b48	Fix hota quests	2023-10-14 00:15:15 +02:00
nordsoft	5f52e6b35e	Revert "Auxiliary commit to revert individual files from 2bf8cdc9f525099348439c700af0466955f01b30" ... This reverts commit d9952495391f7ac77dd32dcf33f487e146b3655b.	2023-10-13 23:35:37 +02:00
Laserlicht	0c6b1ca3c8	possibility to change name	2023-10-13 23:04:35 +02:00
nordsoft	55900ceb66	Add portraits delegate	2023-10-13 20:15:29 +02:00
nordsoft	2bf8cdc9f5	Hota-related bugs were fixed	2023-10-13 12:52:45 +02:00
nordsoft	fbf5492fd9	Remove unnecessary virtuals	2023-10-12 13:30:01 +02:00
nordsoft	74a90cde5d	Fix hero level limiter	2023-10-12 12:52:01 +02:00
nordsoft	14b030d2eb	Support hota quest gates	2023-10-11 23:15:24 +02:00
nordsoft	7ccd4cdcb2	Refactor quests progress	2023-10-11 21:10:42 +02:00
nordsoft	22c9eecd7d	Fix mistake	2023-10-11 08:54:54 +02:00
nordsoft	2b88e6941c	Fix mana limiter	2023-10-11 01:43:24 +02:00
nordsoft	6093f042dd	Text container fix	2023-10-11 01:26:07 +02:00
nordsoft	8335fffaea	Fix rumors	2023-10-11 00:58:32 +02:00
nordsoft	5b10b457cf	Fix code review suggestions	2023-10-11 00:47:19 +02:00
nordsoft	62c4e8a98d	Fix compiling	2023-10-10 23:44:29 +02:00
nordsoft	31d71ddd25	Minor fixes in text	2023-10-10 23:44:29 +02:00
nordsoft	5eeda3cd25	Quests mostly work	2023-10-10 23:44:29 +02:00
nordsoft	d2d64dbddd	Bugfixes	2023-10-10 23:44:29 +02:00
nordsoft	bb238f9b72	New quests work	2023-10-10 23:44:29 +02:00
nordsoft	63bdfb8ff6	New quests implemented	2023-10-10 23:44:29 +02:00
nordsoft	1460541ee5	New limiter based quests	2023-10-10 23:44:29 +02:00
nordsoft	b7568a160c	Fixes	2023-10-10 23:44:29 +02:00
nordsoft	6a7b23c007	Additional properties for limiter	2023-10-10 23:44:28 +02:00
nordsoft	937a8d63c7	Check for artifacts copies in limiter	2023-10-10 23:44:28 +02:00
nordsoft	0cf3205e15	Fix quest regressions	2023-10-10 23:44:28 +02:00
nordsoft	d7d435dcb7	Add game pause	2023-10-08 16:03:57 +02:00
Nordsoft91	1c4bbf1078	Merge pull request #3012 from Nordsoft91/fixes	2023-10-08 12:11:32 +02:00
nordsoft	043f54698b	Fix translations in map editor / fix crash on game end	2023-10-05 23:34:29 +02:00
SoundSSGood	bcce4c68e5	Artifacts placement fixed	2023-10-05 15:17:02 +03:00
Ivan Savenko	b75a67ef7c	Merge pull request #2973 from IvanSavenko/identifier_explicit_constructor ... Improvements to type safety of Identifier class	2023-10-05 00:33:07 +03:00
Ivan Savenko	037efdf5fc	Improvements to type safety of Identifier class ... - Constructor of Identifier from integer is now explicit - Lobby hero/town selection now uses Identifiers instead of int's - Removed serialization workaround for hero portraits - Added dummy objects for custom heroes portraits for ID resolver to use - HeroInstance now stores portrait ID only in case of custom portrait - Fixed loading of campaign heroes portraits on RoE maps	2023-10-04 18:05:23 +03:00
Ivan Savenko	39a92cdde3	Add query for dwellings dialog	2023-10-04 17:47:12 +03:00
Ivan Savenko	898733eed7	Added Query to track visit duration for Taverns and Markets	2023-10-04 17:47:12 +03:00
Andrii Danylchenko	20a944c551	Merge pull request #2884 from vcmi/nkai-air-water-walking ... NKAI: water and air walking	2023-10-03 21:46:35 +03:00
Laserlicht	ec8580b99e	Merge branch 'develop' into patch-4map_overview_rework	2023-10-02 21:03:16 +02:00
Nordsoft91	80be1e9f4c	Merge pull request #2981 from Nordsoft91/rmg-template ... Select random object template instead of first	2023-10-02 20:42:39 +02:00
Nordsoft91	c57d5545c2	Merge pull request #2971 from Nordsoft91/translations ... Multi-language support for network game and for VMAPs	2023-10-02 20:41:42 +02:00
nordsoft	10eb19758a	Code review fixes	2023-10-01 18:00:36 +02:00
Ivan Savenko	b21a361b99	Merge pull request #2814 from SoundSSGood/arts-counter-impovements ... Artifacts counter impovements	2023-10-01 17:53:51 +03:00
nordsoft	3ea7988883	Treasure placement uses random templates now	2023-09-30 23:06:38 +02:00
Laserlicht	8b835c9253	load game support	2023-09-30 20:03:33 +02:00
Andrii Danylchenko	2dd0d76412	NKAI: water and air walking	2023-09-30 10:37:32 +03:00
nordsoft	1502ea2250	Fix pandora mana problem	2023-09-30 01:33:12 +02:00
nordsoft	ce62ab3e66	Select random object template instead of first	2023-09-30 01:19:18 +02:00
nordsoft	70796d232b	Full support of maps translations	2023-09-29 00:24:45 +02:00
nordsoft	ae073ee35d	Remove unused identifiers	2023-09-28 23:15:36 +02:00
nordsoft	98fde9ab1d	Add string IDs in map editor	2023-09-28 14:38:31 +02:00
nordsoft	60df49236f	Inspector widgets set string ID	2023-09-28 14:03:58 +02:00
nordsoft	56eefab255	Fix headers	2023-09-28 13:28:24 +02:00
nordsoft	1dbecc2e18	Revert "Add header" ... This reverts commit d661600858.	2023-09-28 13:28:04 +02:00
nordsoft	d661600858	Add header	2023-09-28 13:14:23 +02:00
nordsoft	a710c88b07	Proper map translations loading	2023-09-28 13:09:01 +02:00
nordsoft	67e1200448	Remove forward declaration	2023-09-28 12:46:28 +02:00
nordsoft	ba1dbbbb1d	New version for map format	2023-09-28 04:23:14 +02:00
nordsoft	65f696b018	Cosmetic changes for json map reader	2023-09-28 03:02:46 +02:00
nordsoft	9098126684	Separate map text identifiers from global	2023-09-28 02:52:49 +02:00
nordsoft	40af83a55c	Fix quest	2023-09-28 02:51:58 +02:00
nordsoft	3c2549d905	Fix town name	2023-09-28 02:51:44 +02:00
nordsoft	6da605ff83	Campaign meta strings	2023-09-28 00:10:28 +02:00
nordsoft	5b97c323d3	Rename hero strings to text id	2023-09-28 00:04:05 +02:00
nordsoft	486091a915	Heroes switched to text id	2023-09-28 00:00:32 +02:00
nordsoft	0c94a4d891	Town name switched to id	2023-09-27 23:57:05 +02:00
nordsoft	41da252e67	Seerhut meta strings	2023-09-27 23:49:27 +02:00
nordsoft	00c8c2eb82	Event message meta string	2023-09-27 23:28:17 +02:00
nordsoft	f9f79255c5	Creature message meta string	2023-09-27 23:25:19 +02:00
nordsoft	0ac893b80f	Rumors meta string	2023-09-27 23:22:45 +02:00
nordsoft	ab373f08ab	Use meta string for messages	2023-09-27 23:11:11 +02:00
nordsoft	03c099d4fd	First steps	2023-09-27 22:53:13 +02:00
Ivan Savenko	9b482a2b1e	Fix boat creation for heroes recruited on water	2023-09-27 21:25:27 +03:00
Ivan Savenko	f4c33f49ee	Removed excessive warning	2023-09-27 21:24:37 +03:00
Ivan Savenko	92fdaa20b1	Fix crash on loading Seer Hut with kill monster mission	2023-09-27 21:24:25 +03:00
Ivan Savenko	97097c20ad	Merge pull request #2874 from SoundSSGood/exchange-window-update ... Exchange window update	2023-09-27 15:50:52 +03:00
Ivan Savenko	71a1ed816a	Merge pull request #2892 from Laserlicht/highscore_menu ... Highscore Menu & end video	2023-09-27 15:48:47 +03:00
Ivan Savenko	94dbde05a0	Merge pull request #2868 from IvanSavenko/simultaneous_turns ... Simultaneous turns	2023-09-27 15:45:02 +03:00
Ivan Savenko	4d43562bca	Merge pull request #2924 from Laserlicht/datetime_android ... Datetime android	2023-09-27 15:43:46 +03:00
Ivan Savenko	d0046d29f2	Merge pull request #2957 from ProjectMutilation/fix-pvs-issues ... Fixed some issues found by pvs	2023-09-27 15:40:37 +03:00
Maxim Korotkov	ade7a035f5	artifactUtils: reduced cyclomatic complexity in check ... Signed-off-by: Maxim Korotkov <korotkov.maxim.s@gmail.com>	2023-09-27 09:05:58 +03:00
Nordsoft91	c803b57c33	Merge pull request #2889 from Nordsoft91/mod-compatibility-check ... Proper mod compatibility check logic	2023-09-26 19:29:46 +02:00
Ivan Savenko	0ab766479d	One more documentation update iteration	2023-09-26 15:55:27 +03:00
Ivan Savenko	8210a2cafd	Added list of all identifiers from base game	2023-09-26 15:55:27 +03:00
Ivan Savenko	43246477d4	Update bonuses docs	2023-09-26 15:55:27 +03:00
Ivan Savenko	403acc0cf1	Update spell docs	2023-09-26 15:55:27 +03:00
Ivan Savenko	f4ee9424e4	Removed unused properties	2023-09-26 15:55:27 +03:00
Ivan Savenko	9710a6b7b3	Updated terrain/river/road schema, added docs	2023-09-26 15:55:27 +03:00
Ivan Savenko	dfc72134f2	Removed unused property	2023-09-26 15:55:27 +03:00
Ivan Savenko	27b75dbbea	Fixed silent errors on invalid Json references in schemas	2023-09-26 15:55:27 +03:00
Ivan Savenko	524c476264	Removed no longer used bonuses	2023-09-26 15:55:27 +03:00
Ivan Savenko	a7ebbf8680	Updated bonus documentation up to SPELL_AFTER_ATTACK	2023-09-26 15:55:27 +03:00
Ivan Savenko	54adeef29f	Added temporary UI for simturns testing	2023-09-26 13:42:20 +03:00
Ivan Savenko	5b21a5ffbc	Simturn duration is now part of StartInfo	2023-09-26 13:42:20 +03:00
Ivan Savenko	3ea807fb8d	Fixed movement through teleporters by AI	2023-09-26 13:42:20 +03:00
Ivan Savenko	d257fb37f0	Use optional instead of Json for queries	2023-09-26 13:42:20 +03:00
Ivan Savenko	c8a96647c3	Add turn limit option to pathfinder	2023-09-26 13:42:20 +03:00
nordsoft	2a3e371caf	Remove any modification of enabled mods during game loading	2023-09-24 23:34:46 +02:00
Laserlicht	e93a04409e	Revert "another approach" ... This reverts commit 2f64457a9a.	2023-09-24 15:02:59 +02:00
Laserlicht	2f64457a9a	another approach	2023-09-24 12:54:35 +02:00
Laserlicht	fccecf023b	no invalid json	2023-09-24 01:30:03 +02:00
Laserlicht	f3e1943aaf	Merge branch 'develop' into highscore_menu	2023-09-23 21:38:17 +02:00
Laserlicht	6f8b62d77d	codereview	2023-09-23 20:41:30 +02:00
Laserlicht	a4769782c5	correct format	2023-09-23 19:01:18 +02:00
Nordsoft91	1f2ca138dd	Merge pull request #2919 from Nordsoft91/fix-2893	2023-09-23 18:02:33 +02:00
Laserlicht	455ead7b4a	fix datetime format (android)	2023-09-23 17:27:00 +02:00
Nordsoft91	a36450e2d1	Merge pull request #2882 from Nordsoft91/ai-cheating ... Add basic system to give more advantages for ai player	2023-09-23 03:21:19 +02:00
nordsoft	a5492b30c3	Add pre-battle message	2023-09-23 02:35:21 +02:00
nordsoft	61141a0406	Fix gcc compiling	2023-09-23 01:10:45 +02:00
nordsoft	dce1ac1538	Redesign mod incompatibility message	2023-09-23 00:32:48 +02:00
Laserlicht	b0e5a11e62	fix win build	2023-09-22 22:09:01 +02:00
Ivan Savenko	455c13164e	Merge pull request #2886 from IvanSavenko/h3m_parser_fixes ... H3m parser fixes	2023-09-22 18:53:51 +03:00
nordsoft	5b24fe289b	Assembling difficulty json instead of overriding	2023-09-22 14:46:43 +02:00
nordsoft	2a2f0a657e	Fix battle bonuses serialization	2023-09-22 13:34:00 +02:00
Laserlicht	92b0e2b400	initial highscore support	2023-09-22 01:39:35 +02:00
nordsoft	16b147d588	Fix negative spell cost	2023-09-22 01:12:10 +02:00
Nordsoft91	ec582328b4	Merge pull request #2887 from Laserlicht/campaign_improvement ... campaign improvements	2023-09-22 01:01:59 +02:00
nordsoft	099109b7d2	Minor fixes	2023-09-22 00:52:19 +02:00
Laserlicht	9e78f9c69c	CodeReview	2023-09-21 23:41:00 +02:00
nordsoft	60eef59bc9	Show root mods for maps	2023-09-21 22:38:01 +02:00
nordsoft	4691907f9c	Show root mods only	2023-09-21 22:28:29 +02:00
Laserlicht	5fd2eee3e8	code review	2023-09-21 21:27:06 +02:00
nordsoft	a05f8339ae	Proper mod compatibility check system	2023-09-21 04:31:08 +02:00
Laserlicht	dfb5ccbeaf	add persistent storage & completed campaign support	2023-09-20 22:18:53 +02:00
Ivan Savenko	42d9ba6c82	Merge pull request #2877 from IvanSavenko/simturn_fixes ... Changes for simturns support	2023-09-20 22:09:25 +03:00
Ivan Savenko	3f35ed000c	Fixed parsing of some user-made H3M maps	2023-09-20 22:00:03 +03:00
Ivan Savenko	02dfecd38b	Fixed hota maps templates loading	2023-09-20 21:59:16 +03:00
Ivan Savenko	921569e02e	Fixed "Long Live the King", 1st scenario victory condition	2023-09-20 21:58:47 +03:00
nordsoft	cb3bbc6680	Restructured difficulty config	2023-09-20 16:12:26 +02:00
nordsoft	0de912e67b	Add basic system to add more advantages for ai player	2023-09-20 03:50:35 +02:00
Laserlicht	34182069f5	campaignset	2023-09-20 03:13:54 +02:00
Nordsoft91	648e8c7acb	Merge pull request #2856 from Laserlicht/hero_overview ... Hero overview	2023-09-19 19:36:19 +02:00
Ivan Savenko	8c0d78f1d9	Added initiator-player to packs that add/remove/move objects	2023-09-19 19:24:34 +03:00
Nordsoft91	807f308c91	Merge pull request #2844 from Nordsoft91/rewardable-quests ... New rewardable interface for SeerHuts and pandoras	2023-09-19 17:59:24 +02:00
nordsoft	326791886d	Rename and events modal mode always	2023-09-19 17:11:03 +02:00
SoundSSGood	48ec2d7e2a	Merge branch 'vcmi:develop' into exchange-window-update	2023-09-19 16:22:00 +03:00
SoundSSGood	6280e778dc	fix build	2023-09-19 16:04:37 +03:00
SoundSSGood	f47def3588	refactoring	2023-09-19 13:31:57 +03:00
SoundSSGood	a83f290e13	bulk move artifacts only equipped, only backpack	2023-09-19 13:31:42 +03:00
Ivan Savenko	219f81d28b	Added explicit "PlayerEndsTurn" netpack ... - PlayerEndsTurn pack is now sent when player ends turn - YourTurn pack has been renamed to PlayerStartsTurn for consistency - PlayerStartsTurn will no longer replace list of acting players - PlayerEndsGame and PlayerEndsTurn will remove player from acting list	2023-09-18 20:55:01 +03:00
nordsoft	2960895041	Issues fixed	2023-09-17 22:19:45 +02:00
Laserlicht	21f37cfafb	simplified	2023-09-17 21:41:55 +02:00
Laserlicht	05fad115b5	Added new Widgets an functions for simplification	2023-09-17 20:34:31 +02:00
nordsoft	a517e6ad8e	Message split for pandora box	2023-09-17 18:02:24 +02:00
nordsoft	e3538f24ab	Fix components problem	2023-09-17 16:04:34 +02:00
nordsoft	44d72dce51	Use enum in h3m map parser	2023-09-17 15:06:49 +02:00
nordsoft	7b22aefb12	Some minor fixes	2023-09-17 13:03:42 +02:00
Ivan Savenko	c8e6a7cd27	Fixed most common cases of movement actions	2023-09-16 20:07:26 +03:00
Ivan Savenko	80b80a0ae6	Minor cleanup of hero movemen code	2023-09-16 20:07:26 +03:00
Andrii Danylchenko	903be33bf3	#2689 - fix approaching guards when closest tile is double-guarded	2023-09-16 17:47:34 +03:00
nordsoft	a3b60bf829	Fix warning	2023-09-16 14:30:25 +02:00
nordsoft	4f76eb3fce	Add limiter serialization	2023-09-15 23:00:33 +02:00
nordsoft	4af2d917c0	Fix messages for pandoras	2023-09-15 21:13:07 +02:00
nordsoft	b5b5d881c4	Merge remote-tracking branch 'upstream/develop' into rewardable-quests	2023-09-15 21:08:22 +02:00
nordsoft	68c61797f8	Implement select all option for rewardable objects	2023-09-15 21:08:14 +02:00
nordsoft	c1c13cfafb	Pandora and events work as rewardable object	2023-09-15 15:29:41 +02:00
Laserlicht	1c68937d95	new approach	2023-09-15 15:26:14 +02:00
Ivan Savenko	f8541d0ae4	Merge branch 'vcmi/master' into 'vcmi/develop'	2023-09-15 13:59:02 +03:00
nordsoft	06f01c3b82	Seerhut works as rewardable object	2023-09-15 10:06:06 +02:00
Dydzio	56c969be4f	Fix commanders requirements for special skills to match WoG	2023-09-13 23:08:22 +02:00
Ivan Savenko	248afa523d	Merge pull request #2823 from dydzio0614/pathfinder-tile-cost ... Fix pathfinder tile cost	2023-09-13 22:50:04 +03:00
Ivan Savenko	4d9cca36c6	Merge pull request #2811 from IvanSavenko/update_modding_docs ... Update modding documentation	2023-09-13 22:07:29 +03:00
Ivan Savenko	c6588e0bd1	Updated schemas & docs for several game entities	2023-09-13 21:55:36 +03:00
Dydzio	9399bcc15d	Fix pathfinder tile cost	2023-09-13 18:54:08 +02:00
Konstantin P	1522ed85e2	vcmi: make "noneOf" selector more restrictive ... It should do "or-not" instead of "and-not".	2023-09-13 17:09:59 +03:00
nordsoft	574047c55c	Start making new serialization for rewardables	2023-09-13 09:18:46 +02:00
nordsoft	96d6a48f01	Backward compatible json serialization	2023-09-13 02:14:35 +02:00
nordsoft	ef3f0174dd	Rewardable seer hut and quest gate	2023-09-13 01:40:07 +02:00
Ivan Savenko	935a18f077	Use error messages from H3	2023-09-12 21:34:58 +03:00
Ivan Savenko	e4aa981925	Add more logging to mod downloading process	2023-09-12 21:15:14 +03:00
SoundSSGood	82eb2f8a2b	Artifact assembling changes	2023-09-12 19:17:35 +03:00
Ivan Savenko	9ae7f53d66	Merge pull request #2791 from Nordsoft91/fix-2790 ... Fix for random dwellings	2023-09-12 12:38:55 +03:00
nordsoft	a89a8019ab	Added skills customization	2023-09-11 20:37:25 +02:00
Nordsoft91	96433436dd	Merge pull request #2782 from Nordsoft91/editor-improvements-1.4 ... Map editor: events, rumors	2023-09-11 20:36:13 +02:00
Nordsoft91	a18aa2cf7e	Merge pull request #2802 from Laserlicht/voice_camp ... Voice for campaigns	2023-09-11 18:15:23 +02:00
Ivan Savenko	f13f213d8c	Merge pull request #2780 from IvanSavenko/fix_siege_regression ... Fix crash on obstacle creation (e.g. moat)	2023-09-11 15:56:33 +03:00
Laserlicht	994da3fcf2	code review	2023-09-11 14:44:07 +02:00
Laserlicht	00f07f93d1	wait while audio playing; no audio on custom campaigns	2023-09-11 14:04:44 +02:00
Laserlicht	fc1ce85a72	basic voice support	2023-09-11 12:57:10 +02:00
Ivan Savenko	fd3217c875	Fix few more missing BattleID's	2023-09-11 13:20:16 +03:00
nordsoft	6e3817f18c	Events serialization	2023-09-10 01:54:55 +02:00
nordsoft	cc3864a0fa	Fix for random dwellings	2023-09-09 21:17:21 +02:00
nordsoft	01bf146640	Change string id	2023-09-09 14:31:44 +02:00
nordsoft	f6e3c6a487	Fix	2023-09-09 14:27:51 +02:00
Ivan Savenko	e8453916cf	Merge remote-tracking branch 'vcmi/beta' into develop	2023-09-08 18:49:06 +03:00
Ivan Savenko	fccd564d8d	Merge pull request #2769 from IvanSavenko/touch_tolerance ... (1.3.2) Implemented tolerance for touch events	2023-09-08 16:45:04 +03:00
Ivan Savenko	c4e2417326	Fix crash on obstacle creation (e.g. moat)	2023-09-08 16:35:43 +03:00
Ivan Savenko	5d67481aaf	Merge pull request #2774 from IvanSavenko/beta_bugfixing ... (1.3.2) Beta bugfixing	2023-09-08 13:15:52 +03:00
Ivan Savenko	ef0eb8e930	Merge pull request #2772 from wb180/tavernPoolHeroesFix ... Remove(reduce durations) of bonuses for tavern heroes	2023-09-07 10:54:44 +03:00
Ivan Savenko	f39fbe5151	Merge pull request #2757 from IvanSavenko/filesystem_refactor ... Filesystem refactor - part 1	2023-09-07 10:51:02 +03:00
Ivan Savenko	1f1f978328	Fixed battle replay	2023-09-06 16:03:47 +03:00
Ivan Savenko	ef94e7a78a	Fix build	2023-09-06 16:03:47 +03:00
Ivan Savenko	9fa7a93fb0	Properly pass battleID in all battle netpack's	2023-09-06 16:03:47 +03:00
Ivan Savenko	747e28947a	Fix build	2023-09-06 16:03:47 +03:00
Ivan Savenko	41210c1dbf	Client-side support for multiple battles	2023-09-06 16:03:47 +03:00
Ivan Savenko	036df2e0ad	Support multiple battles in AI	2023-09-06 16:03:46 +03:00
Ivan Savenko	3a88180494	Separated game and battle callback (server & client only)	2023-09-06 16:03:39 +03:00
Ivan Savenko	fc4dfda00f	Added support for concurrent battles to gamestate and server	2023-09-06 16:03:02 +03:00
Ivan Savenko	f92af94f19	Fix crash on removing object during visit	2023-09-06 12:32:26 +03:00
Evgeniy Meshcheryakov	47f5dd14fa	Remove(reduce durations) of bonuses for tavern heroes	2023-09-06 09:12:23 +03:00
Ivan Savenko	3973624278	Implemented tolerance for touch events	2023-09-06 01:06:01 +03:00
Ivan Savenko	1a82280cb2	Fix build	2023-09-05 13:16:08 +03:00
Ivan Savenko	f30355839f	Fix build	2023-09-05 00:55:54 +03:00
Ivan Savenko	609f25f344	Add sanity check	2023-09-04 22:43:16 +03:00
Ivan Savenko	b6a1a8f0da	Json Serializer should now use identifers storage properly	2023-09-04 22:23:20 +03:00
Ivan Savenko	9735fa6d06	Fix regresssion - crash	2023-09-04 22:22:45 +03:00
Ivan Savenko	12c4f8d18c	Fixed serialization of PlayerColor in json	2023-09-04 22:22:24 +03:00
Ivan Savenko	86a7f5f5cd	Removed getStr(bool), replaced with similar toString()	2023-09-04 22:21:02 +03:00
Ivan Savenko	7e27ac7073	IdentifierStorage is now separate handler in VLC	2023-09-04 18:56:16 +03:00
Ivan Savenko	c8a6cd74cc	Additional checks for invalid access to IdentifierStorage	2023-09-04 18:56:16 +03:00
Ivan Savenko	82989e6302	Use pointers in containers to guaranteed fixed address	2023-09-04 18:56:16 +03:00
Ivan Savenko	a30e7ba321	Remove bitmasks of PlayerColor's. Add encode/decode methods	2023-09-04 18:56:16 +03:00
Ivan Savenko	3f921fa771	Serialization version bump	2023-09-04 18:22:34 +03:00
Ivan Savenko	6a260a60cf	Fix resource creation	2023-09-04 18:22:34 +03:00
Ivan Savenko	9cfcf5ea19	Fix regressions	2023-09-04 18:22:34 +03:00
Ivan Savenko	0f88b8969b	Removed some usages of std string as resource path	2023-09-04 18:22:34 +03:00
Ivan Savenko	8dfdfffd87	Use ResourcePath for audio files	2023-09-04 18:22:34 +03:00
Ivan Savenko	97b7d44c88	Use ResourcePath for video accessing	2023-09-04 18:22:34 +03:00
Ivan Savenko	6f0108e462	Use ResourcePath for referencing texts and json's	2023-09-04 18:22:34 +03:00
Ivan Savenko	823ffa7a07	Always use ResourcePath for referencing images and animations	2023-09-04 18:22:34 +03:00
nordsoft	d113168db4	Fix neutral objects serializing	2023-09-04 01:42:51 +04:00
nordsoft	385202a02a	Fix abandoned map crash	2023-09-04 01:42:51 +04:00
nordsoft	8040cafb3d	Code review tweaks	2023-09-01 15:17:46 +04:00
nordsoft	15037b782f	Fix assert	2023-09-01 04:39:32 +04:00
nordsoft	e9ba1d73d1	Support partial versions	2023-09-01 04:36:53 +04:00
nordsoft	ea7ab9d5ed	Migrate launcher to vcmi versions	2023-09-01 04:12:41 +04:00
Nordsoft91	c45ab07d0b	Merge pull request #2698 from Nordsoft91/turn-timer ... Turn timer fixes	2023-09-01 00:31:52 +04:00
Konstantin P	08967efd91	Teleport: check immunities in applicable() ... Attempt to fix #2677	2023-08-31 19:58:46 +03:00
Ivan Savenko	7255dda624	Merge pull request #2629 from dydzio0614/neutral-creature-popup ... Improve neutral creature adventure map popup	2023-08-31 15:44:19 +03:00
Ivan Savenko	adb633be30	Merge pull request #2715 from IvanSavenko/regression_fix ... Fix several recently discovered regressions	2023-08-31 15:41:04 +03:00
Nordsoft91	49614f5851	Merge pull request #2695 from Nordsoft91/mod-compatibility	2023-08-31 12:14:54 +04:00
Ivan Savenko	3e169ef2f5	Fix visiting of markets	2023-08-31 01:07:59 +03:00
nordsoft	cc3ca9a41e	Timers fixes	2023-08-30 03:33:59 +04:00
nordsoft	9a42abe2a7	Extended timer info to exhange between client and server	2023-08-30 03:11:46 +04:00
Ivan Savenko	695a51d8c8	Merge remote-tracking branch 'vcmi/beta' into develop	2023-08-28 21:19:53 +03:00
nordsoft	4ee47b01ae	Make possible to play with different timers independently	2023-08-28 19:45:15 +04:00
nordsoft	98f7ed9dfd	Implement player start turn query	2023-08-28 18:56:36 +04:00
nordsoft	93f14c984d	Fix compatibility check with patch version	2023-08-28 17:49:13 +04:00
nordsoft	925bde68ff	Fix compatibility check with game version	2023-08-28 17:43:33 +04:00
nordsoft	0a6ea63b09	Revert "Add compatibility with minor version" ... This reverts commit 6e7b13fcbe.	2023-08-28 17:41:00 +04:00
nordsoft	3962b71262	Remove unused variable	2023-08-28 17:10:52 +04:00
Nordsoft91	1586c6c6a0	Merge pull request #2668 from IvanSavenko/remove_current_player ... Remove "currentPlayer" from gamestate	2023-08-28 17:10:28 +04:00
Nordsoft91	ffc4b989f0	Merge pull request #2679 from Laserlicht/smooth_scroll ... Smooth scroll	2023-08-28 17:08:57 +04:00
nordsoft	6e7b13fcbe	Add compatibility with minor version	2023-08-28 16:21:46 +04:00
Ivan Savenko	ce20d913e0	Fix checking PlayerColor's for validness	2023-08-27 01:35:38 +03:00
Michael	2286e0c7b1	implement speed and move	2023-08-26 21:13:33 +02:00
Michael	fe6d96f4a0	angle calc	2023-08-26 20:19:25 +02:00
Ivan Savenko	edd029c79c	Replace "currentPlayer" from gamestate with "activePlayers" ... - Allows multiple active players at once, e.g. simturns - Cleared up validation of netpacks by server, e.g. always check for pack sender	2023-08-25 18:56:15 +03:00
Ivan Savenko	b61c9a9e35	Fix build	2023-08-25 13:46:42 +03:00
Ivan Savenko	e2718db791	Converted several enumerations into constants	2023-08-25 13:38:02 +03:00
Ivan Savenko	c2d5f7f22f	Formatting & cleanup	2023-08-25 13:38:02 +03:00
Ivan Savenko	e54287ea5d	Converted remaining identifier to new system	2023-08-25 13:38:02 +03:00
Ivan Savenko	0240ee886d	Converted (almost) all namespace enum's to enum classes	2023-08-25 13:38:02 +03:00
Ivan Savenko	62cd8b12d4	Converted several namespace enums to enum class	2023-08-25 13:38:02 +03:00
Ivan Savenko	17d3d663ee	Converted creature ID and spell ID to new form	2023-08-25 13:38:02 +03:00
Ivan Savenko	ec8d31bbfc	First step at unifying game identifiers code	2023-08-25 13:38:01 +03:00
Ivan Savenko	b0eec85aca	Merge pull request #2632 from rilian-la-te/resist-rework-pt1 ... Spell resistance rework: part 1	2023-08-25 01:13:57 +03:00
Ivan Savenko	940bdcee3e	Fixes according to review	2023-08-24 23:34:33 +03:00
Ivan Savenko	f9410145d6	Fix handling of "7 days without town" loss condition	2023-08-24 23:34:33 +03:00
Ivan Savenko	ee8adbe85f	Update tavern on end of 7th turn of player in question ... Allows removal of "retreat after 7th day" workaround and as result - more straightforward code	2023-08-24 23:34:33 +03:00
Ivan Savenko	d83aa828f6	Fix turn ending	2023-08-24 23:34:33 +03:00
Ivan Savenko	c4bc6840ea	Moved management of turn order into a new class	2023-08-24 23:34:33 +03:00
Nordsoft91	979cf129bc	Merge pull request #2637 from Laserlicht/autosave	2023-08-25 00:09:49 +04:00
Michael	e317c23a59	fix	2023-08-24 20:31:06 +02:00
Michael	37e2292720	count unicode chars to extra function	2023-08-24 18:34:00 +02:00
Michael	485af4b4b5	avoid forbidden chars in path	2023-08-23 22:23:05 +02:00
Ivan Savenko	26bddbac44	Fix possible uncaught exception	2023-08-23 22:46:28 +03:00
Michael	b22a9ff2d0	Merge branch 'develop' into autosave	2023-08-23 21:39:04 +02:00
Michael	4784ae94b5	revert uuid	2023-08-23 20:03:40 +02:00
Ivan Savenko	4ab2e617d5	Fix infinite loop on Fear trigger	2023-08-23 19:34:33 +03:00
Ivan Savenko	81242d3500	Fixed ending of battles due to retreat/surrender	2023-08-23 18:46:56 +03:00
Konstantin	e6710a4eb0	vcmi: bump serialization version	2023-08-23 17:53:09 +03:00
Konstantin	d746a96d55	vcmi: use SpellSchool identifier instead of enum ... Use identifier instead of enum inside callbacks. It is better and more expandable solution.	2023-08-23 17:53:09 +03:00
Konstantin	75c39c6562	vcmi: handle icons for SPELL_DAMAGE_REDUCTION ... For all schools and for ANY subtype	2023-08-23 17:53:09 +03:00
Konstantin	d20711bcd6	immunities: polishing	2023-08-23 17:53:09 +03:00
Konstantin	344593e891	vcmi: made some CSpell properties private ... There are getters for it.	2023-08-23 17:53:08 +03:00
Konstantin	4d67a7e3d1	BonusParams: add XXX_IMMUNITY to deprecated ... This bonuses does not exist now.	2023-08-23 17:52:16 +03:00
Konstantin	8724181a0f	vcmi: spell resistance rework ... Now instead of XXX_IMMUNITY bonuses we have 2 bonuses with spellSchool subtype: SPELL_SCHOOL_IMMUNITY and NEGATIVE_EFFECT_IMMUNITY. All previous bonuses of subtype 0 is covered by SPELL_SCHOOL_IMMUNITY, and all previous bonuses of subtype 1 is covered by NEGATIVE_EFFECT_IMMUNITY. Unit tests are updated accordingly.	2023-08-23 17:52:16 +03:00
Konstantin	c9bc3fd4e1	CSpellHandler: use getBonusBearer ... Use getBonusBearer method and cachingStr method for optimization	2023-08-23 17:52:16 +03:00
Ivan Savenko	a44c08a847	Slightly better thread names	2023-08-23 16:32:29 +03:00
Ivan Savenko	44d16b32fe	Use API identical to std classes where possible	2023-08-23 16:32:29 +03:00
Nordsoft91	1bad0e96ef	Merge pull request #2635 from Nordsoft91/loading-bar ... Loading progress bar	2023-08-23 17:28:19 +04:00
Michael	d2bbe0f35a	starttime in foldername	2023-08-23 01:47:55 +02:00
Michael	538acfe3c0	Update StartInfo.h ... fix	2023-08-23 01:08:57 +02:00
Michael	a0450d1363	format...	2023-08-23 00:39:09 +02:00
Michael	fed9ae5157	Merge branch 'develop' into autosave	2023-08-23 00:37:15 +02:00
Michael	51ba22a631	code review	2023-08-23 00:35:44 +02:00
Michael	68a1b883eb	autosave folders	2023-08-22 20:43:44 +02:00
nordsoft	dfaf778d16	Redesign loading solution	2023-08-22 20:10:20 +04:00
nordsoft	d50edc28ab	Merge remote-tracking branch 'upstream/develop' into turn-timer ... # Conflicts: # server/CGameHandler.cpp # server/CGameHandler.h	2023-08-22 00:54:38 +04:00
nordsoft	dbc3a93013	Merge remote-tracking branch 'upstream/develop' into loading-bar ... # Conflicts: # server/CGameHandler.h	2023-08-22 00:46:54 +04:00
Dydzio	764608f100	Merge remote-tracking branch 'dydzio/configurable-autobattle-spells' into configurable-autobattle-spells	2023-08-21 20:10:04 +02:00
Dydzio	e81cd4e0e6	Delete empty file	2023-08-21 20:09:50 +02:00
nordsoft	45f13c7964	Progress update on client side	2023-08-21 19:21:27 +04:00
nordsoft	584dd20943	Progress on server side for rmg	2023-08-21 19:21:22 +04:00
Ivan Savenko	5f7f0ec2ea	Declare enum classes as int8_t	2023-08-21 17:55:49 +03:00
Ivan Savenko	67eaef3520	Fixed few more discovered regressions	2023-08-21 17:55:49 +03:00
Ivan Savenko	013417fb7e	Code cleanup	2023-08-21 17:55:49 +03:00
Ivan Savenko	c516b5a64e	Fixes for several discovered edge cases	2023-08-21 17:55:49 +03:00
Ivan Savenko	6297140bf5	Start of stabilization - battles now start correctly	2023-08-21 17:55:49 +03:00
Ivan Savenko	44832f3797	Split BattleProcessor into few more parts	2023-08-21 17:55:49 +03:00
Dydzio	ed12f20609	Improve neutral creature adventure map popup	2023-08-21 14:42:41 +02:00
Dydzio	78f56df44f	Comment out unused OH3 options so they do not clutter code suggestions ... Co-authored-by: Ivan Savenko <saven.ivan@gmail.com>	2023-08-20 19:11:36 +02:00
Nordsoft91	ef4fddd0c4	Merge pull request #2570 from Laserlicht/town_selection_window ... Town selection window	2023-08-20 17:37:45 +04:00
Dydzio	6bfbe80cc9	Allow toggling quick combat spells usage	2023-08-19 17:23:55 +02:00
Nordsoft91	4a6deedd5e	Merge pull request #2530 from Nordsoft91/tutorial ... Support tutorial	2023-08-19 18:06:15 +04:00
Ivan Savenko	70ddc1f3e5	Merge pull request #2577 from wb180/secondarySkillSerialization ... Preserve order of secondary skills during hero json serialization/deserialization	2023-08-18 15:24:02 +03:00
Ivan Savenko	d0b3319f6a	Merge remote-tracking branch 'vcmi/beta' into develop	2023-08-18 15:08:23 +03:00
Ivan Savenko	83b00bb7c3	Merge pull request #2610 from vcmi/master ... Merge master -> beta	2023-08-18 12:56:05 +03:00
DjWarmonger	f9564dc8e4	Merge pull request #2563 from vcmi/fix_resources_near_mines ... Fix resources placed behind mines	2023-08-18 09:12:56 +02:00
Michael	e1e16018d1	code review first batch	2023-08-17 17:29:31 +02:00
Ivan Savenko	daa8a494fc	Merge branch 'release_131' into master	2023-08-17 16:19:20 +03:00
Nordsoft91	96e820ddac	Merge pull request #2517 from Laserlicht/folders	2023-08-17 10:09:37 +04:00
Ivan Savenko	ef0cd0ba6e	Fixed mod dependencies check on save loading to prevent crashes: ... - mods that don't affect game objects can be ignored when loading save - gameplay-affecting mods that were present in save must be active - gameplay-affecting mods that were not in save must not be active	2023-08-14 23:55:04 +03:00
nordsoft	d26fdaefe4	Battle timer	2023-08-14 23:31:44 +04:00
Tomasz Zieliński	c59014ce18	Merge remote-tracking branch 'origin/beta' into fix_rmg_teams	2023-08-14 18:59:45 +02:00
nordsoft	2ce50915e1	Fix ios compilation	2023-08-14 05:03:50 +04:00
nordsoft	3c9c302fd2	TurnTimerInfo	2023-08-14 02:16:25 +04:00
Michael	1d76f456ad	change servercode to make it more robust	2023-08-14 00:08:48 +02:00
Evgeniy Meshcheryakov	2a83f06905	Preserve order of secondary skills during hero serialization/deserialization	2023-08-14 00:06:22 +03:00
nordsoft	4b1224ec8c	Implement turn timer feature	2023-08-13 14:07:48 +04:00
Andrii Danylchenko	a7859dae39	Battle AI: archangels cast again	2023-08-13 09:08:30 +03: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
Tomasz Zieliński	abacb5f0ea	Fix resources placed behind mines	2023-08-12 10:53:25 +02:00
Ivan Savenko	ccf31d19f8	Merge pull request #2558 from IvanSavenko/localization_fix ... Do not ignore translations for maps & campaigns	2023-08-12 11:24:19 +03:00
DjWarmonger	654489d5d3	Merge pull request #2525 from vcmi/battle-fast-targets ... Battle fast targets	2023-08-12 09:22:25 +02:00
DjWarmonger	917f846a3a	Merge pull request #2562 from vcmi/fix_artifact_replacement ... Fix regression with replacing quest artifact	2023-08-12 09:14:21 +02:00
Michael	52f00ec308	extra function: getFormattedDateTime	2023-08-12 01:13:03 +02:00
Michael	4d507f3d8a	format fix	2023-08-12 00:00:35 +02:00
Michael	f0b60cf166	suggestions; use internally uppercase; fix; fullname	2023-08-11 23:56:20 +02:00
Tomasz Zieliński	4741bd546f	Fix regression	2023-08-11 20:13:25 +02:00
Tomasz Zieliński	8f450cf253	Fix for monsters spawning at left side of the map	2023-08-11 18:43:22 +02:00
Ivan Savenko	942f8bbf05	Fix possible access to non-existing building	2023-08-11 18:50:39 +03:00
Ivan Savenko	474045194a	Do not ignore translations for maps & campaigns	2023-08-11 16:12:02 +03:00
Tomasz Zieliński	83d97626fe	Merge remote-tracking branch 'origin/beta' into fix_rmg_object_pos	2023-08-11 10:58:26 +02:00
Ivan Savenko	b2de5d32d1	Merge pull request #2546 from vcmi/fix_crash_after_battle ... Fix crash at battle end	2023-08-11 11:37:30 +03:00
Ivan Savenko	88b23cdce1	Merge pull request #2511 from IvanSavenko/fix_starting_army ... Fix starting army	2023-08-11 11:36:30 +03:00
Tomasz Zieliński	0252d0f986	Fix hota offset + 2 possible crashes	2023-08-11 07:45:24 +02:00
DjWarmonger	f5926c4023	Merge pull request #2498 from vcmi/fix_roads_in_rock ... Fix placing road inside underground rock	2023-08-11 07:22:36 +02:00
Michael	2b093b8850	case handling	2023-08-11 01:46:22 +02:00
Tomasz Zieliński	84436f7f18	Throw runtime error explicitely	2023-08-10 18:29:49 +02:00
Tomasz Zieliński	f483f7bb53	Fix crash at battle end	2023-08-10 11:52:31 +02:00
Ivan Savenko	1f9ee6aa38	Merge pull request #2524 from Nordsoft91/reward_canrefuse ... [1.3.1] Reward can refuse fix	2023-08-09 20:06:26 +03:00
nordsoft	1def98a862	Tutorial implemented	2023-08-09 03:54:09 +04:00
Andrii Danylchenko	ba9998ac66	BattleAI: fast targets optimization	2023-08-08 20:10:29 +03:00
nordsoft	be6f6da397	Fix for canRefuse flag in rewardable building	2023-08-08 19:27:00 +04:00
Ivan Savenko	2e7e8bb52b	Better error message on missing object constructor	2023-08-08 12:50:39 +03:00
Ivan Savenko	e57f8742cd	Rename ambiguos 'clear' to 'clearSlots' ... A lot of map objects inherit from CCreatureSet and as result - get clean() method that resets object army	2023-08-07 19:13:02 +03:00
Ivan Savenko	f0ede46186	Clear spell list, not hero army	2023-08-07 19:12:04 +03:00
Michael	a9e895c08f	basic subdirectory support	2023-08-06 21:39:39 +02:00
Tomasz Zieliński	c089e55893	Fix placing road inside underground rock	2023-08-06 21:14:16 +02:00
Ivan Savenko	c524caee5c	Fixed possible uncaught exception on starting map	2023-08-06 17:46:49 +03:00
Ivan Savenko	8b0f9c86f8	Fixed possible crash on invalid town building name	2023-08-06 13:30:20 +03:00
Ivan Savenko	041236837b	Possible fix for crash from Android crash reporting	2023-08-05 12:49:38 +03:00
Ivan Savenko	dd17896082	Fix crash on bonus parsing failure (outdated mods?)	2023-08-05 12:49:02 +03:00