11150 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
nordsoft	3df0ce229e	get rid of building id	2023-05-01 00:14:53 +04:00
nordsoft	cc4277748d	Fix movement bonus subtype	2023-05-01 00:14:53 +04:00
nordsoft	839c6464aa	Adjust config for markets	2023-05-01 00:14:53 +04:00
nordsoft	4e55279a6a	Adjust client part for markets	2023-05-01 00:14:53 +04:00
nordsoft	67e6920e23	Implement markets	2023-05-01 00:14:53 +04:00
nordsoft	333e7d683c	Change Callback to abstract	2023-05-01 00:14:53 +04:00
nordsoft	dfb078a4d9	Fix json value reader	2023-05-01 00:14:53 +04:00
nordsoft	30967b2813	Remove excess pointer from market interface	2023-05-01 00:14:53 +04:00
nordsoft	5bdd6c5cf5	Fix compiling	2023-04-30 22:36:25 +04:00
nordsoft	b964cf6ec3	Revert "Auxiliary commit to revert individual files from 1b4d1177905ea3382ed90c07aee3e18aa3ccc65e" ... This reverts commit 2ff64410f7ff5d08d21ee4aea95959c8b6b383f2.	2023-04-30 17:25:37 +04:00
nordsoft	1b4d117790	deeper decoupling	2023-04-30 17:13:07 +04:00
nordsoft	ac8f390cf8	Dividing rewarbadle objects into separate files	2023-04-30 04:39:31 +04:00
nordsoft	67bfacfcf7	Create of rewardable interface	2023-04-30 03:15:59 +04:00
nordsoft	c39a9cac63	Minor changes	2023-04-30 01:43:02 +04:00
nordsoft	e47bb3f1f9	Separate configuration and object	2023-04-30 00:59:02 +04:00
Ivan Savenko	bd1105e2b7	Merge pull request #2098 from tytannial/Chinese_locale_update ... Launcher zhCN translation	2023-04-29 15:57:57 +03:00
Tytannial	72fae323af	Launcher zhCN translation	2023-04-29 19:50:05 +08:00
Ivan Savenko	57399b5b32	Merge pull request #2094 from tytannial/Chinese_locale_update ... Chinese locale update	2023-04-29 12:50:24 +03: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