11289 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Tomasz Zieliński	67c5381ae8	Add some non-zero value treasures to fix empty zones.	2023-04-29 11:48:47 +02:00
Tytannial	4e4698b4fb	Fix show grid option	2023-04-29 13:15:20 +08:00
Tytannial	e2312a733a	Update general and creature ability text	2023-04-29 13:02:11 +08:00
Tytannial	6b2a8b56e2	Update Chinese general text translation	2023-04-29 10:20:59 +08:00
nordsoft	17c9dc3115	fix tests	2023-04-29 06:15:14 +04:00
Ivan Savenko	318ac4f23b	Merge pull request #2091 from vcmi/DjWarmonger-patch-2 ... Add download counter for 1.2.1	2023-04-29 00:29:48 +03:00
Ivan Savenko	d985ac90d3	Merge master -> develop	2023-04-28 22:57:25 +03:00
Ivan Savenko	f26ff594b8	Merge pull request #2090 from IvanSavenko/android_fix ... Fix Android build?	2023-04-28 22:51:59 +03:00
DjWarmonger	21a603a293	Add download counter for 1.2.1	2023-04-28 21:33:19 +02:00
Ivan Savenko	346b8a4619	Merge pull request #2079 from rilian-la-te/cstack-some-private ... vcmi: make some CStack properties private	2023-04-28 22:18:20 +03:00
Ivan Savenko	3dde827a9d	Merge pull request #2070 from rilian-la-te/make-tests-compile-pass-h3 ... vcmi: fix test compiling and passing	2023-04-28 22:18:00 +03:00
Ivan Savenko	d4ff2cbf12	attempt to fix Android build	2023-04-28 22:02:19 +03:00
Ivan Savenko	25d5a1555c	Merge pull request #2088 from vcmi/beta ... Release 1.2.1	2023-04-28 19:47:07 +03:00
Ivan Savenko	e4864bf25a	Merge pull request #2087 from IvanSavenko/beta_fixes ... Last fixes for 1.2.1	2023-04-28 19:02:08 +03:00
Ivan Savenko	2da5b7efb8	Updated changelog	2023-04-28 17:08:50 +03:00
Ivan Savenko	3ae4819fcb	Merge pull request #2085 from Nordsoft91/mapeditor-fix ... [1.2.1] Fix portrait serialization	2023-04-28 17:06:29 +03:00
Ivan Savenko	c55f52e84f	Fixed disabled special weeks	2023-04-28 16:54:00 +03:00
Ivan Savenko	76d5b459f1	Fixed music playback on switching between towns	2023-04-28 16:53:45 +03:00
Ivan Savenko	93362eb692	Merge pull request #2083 from IvanSavenko/artifact_fix ... Fix list of treasures getting overwritten	2023-04-28 15:41:38 +03:00
nordsoft	f6d91cab35	Fix portrait serialization ... # Conflicts: # lib/mapObjects/CGHeroInstance.cpp	2023-04-28 05:34:59 +04:00
nordsoft	421bbab1cc	Split CGTownInstance file	2023-04-28 05:30:49 +04:00
Ivan Savenko	881c434833	Fix list of treasures getting overwriteen leading to weird bugs ... ... such as having Grail in crypts or getting relics as starting artifact	2023-04-27 23:40:56 +03:00
Konstantin	88f8694825	tests: fix modhandler assert	2023-04-27 20:59:55 +03:00
Konstantin	15d933d354	tests: disable settings.init() ... This will remove debug assertion than will prevent any test from running in debug mode	2023-04-27 20:59:55 +03:00
Konstantin	2a8f9629ae	tests: attempt to fix build without lua	2023-04-27 20:59:55 +03:00
Konstantin P	f03819fba2	vcmi: disable lua for GCC	2023-04-27 20:59:55 +03:00
Konstantin P	00487e3257	vcmi: disable -Wvirtual-move-assign from tests	2023-04-27 20:59:55 +03:00
Konstantin P	0d8e59a172	tests: add test directories to core loader ... Fixes all tests loading	2023-04-27 20:59:55 +03:00
Konstantin P	d14c951005	CBattleInfoCallbackTest: fix catch-value	2023-04-27 20:59:55 +03:00
Konstantin P	54e4db3819	vcmi: fix abandoned mine resource loading ... It was overshadowed by local variable	2023-04-27 20:59:55 +03:00
Konstantin P	608c30c3d3	vcmi: add formation inside test map	2023-04-27 20:59:55 +03:00
Konstantin P	a5d85e70c0	vcmi: do not run tests on CI yet	2023-04-27 20:59:55 +03:00
Konstantin P	c6fbb8b30d	tests: fix faction test	2023-04-27 20:59:55 +03:00
Konstantin P	705d7164ae	vcmi: fix heal and teleport tests	2023-04-27 20:59:55 +03:00
Konstantin P	e5f78a8997	vcmi: fix tests with latest develop	2023-04-27 20:59:55 +03:00
Konstantin	c400e83874	vcmi: fixup cast in Heal effect	2023-04-27 20:59:55 +03:00
Konstantin	7c56fbd16b	vcmi: fix test building for 1.2	2023-04-27 20:59:55 +03:00
Konstantin	924b456b0f	vcmi: fix unit tests for latest develop	2023-04-27 20:59:55 +03:00
Konstantin	65eed5339f	vcmi: actually enable unit tests	2023-04-27 20:59:55 +03:00
Konstantin	74656b9f96	vcmi: disable MapComparer team check for now	2023-04-27 20:59:55 +03:00
Konstantin	91c7c93d07	vcmi: fix MapComparer appearance check	2023-04-27 20:59:55 +03:00
Konstantin	bcf8ca1268	vcmi: fix map format for teams number	2023-04-27 20:59:55 +03:00
Konstantin	d31a3362af	vcmi: map objects test passed ... It is weird, because some objects should have mod scope now, and some not We need to fix this, and rework test if necessary - its data is too huge now.	2023-04-27 20:59:55 +03:00
Konstantin	bd7faddb55	vcmi: more verbose JSON compare	2023-04-27 20:59:55 +03:00
Konstantin	015f55cd82	vcmi: fix building tests without scripts	2023-04-27 20:59:55 +03:00
Konstantin	276bd5eebf	vcmi: fix healing effect tests	2023-04-27 20:59:55 +03:00
Konstantin	42984396ff	all: fix ImmunityNegationConditionTest	2023-04-27 20:59:55 +03:00
Konstantin	56601a0c2a	vcmi: entity tests passed	2023-04-27 20:59:55 +03:00
Konstantin	2680046dd0	vcmi: make tests builds at least	2023-04-27 20:59:55 +03:00
Konstantin	cf2304d8c7	vcmi: new commits in submodules	2023-04-27 20:59:55 +03:00