17197 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Laserlicht	e19194c3b8	fix for 8th creature	2024-08-21 00:17:25 +02:00
SoundSSGood	2e3e6b1553	market->getObjInstanceID()	2024-08-21 01:01:23 +03:00
Laserlicht	d8869a33da	remove resource	2024-08-20 22:45:11 +02:00
Ivan Savenko	e70ab86995	Use .txz archive for dependencies	2024-08-20 20:42:11 +00:00
Ivan Savenko	f4547a9434	Add documentation regarding supported by vcmi formats	2024-08-20 19:23:55 +00:00
Ivan Savenko	efcf1e1ba9	Add .ogv (HD Edition) as recognized extension for video	2024-08-20 19:23:55 +00:00
Ivan Savenko	1ac63056dc	Unify code for conan dependencies installation	2024-08-20 19:23:55 +00:00
Ivan Savenko	50a4e3213d	Fix ffmpeg deprecation	2024-08-20 19:23:55 +00:00
Ivan Savenko	720d6076a0	Use new dependencies packages	2024-08-20 19:23:55 +00:00
Ivan Savenko	373f8526f2	Changed options of ffmpeg in conan: ... - updated options to include new options added in upstream - enabled swresample to allow audio resampling via ffmpeg instead of custom methods - disabled all components other than those that are needed for vcmi - changed required version to allow newer ffmpeg versions - added lzma as explicit dependency (used by innoextract)	2024-08-20 19:23:50 +00:00
Laserlicht	c56d667981	fix	2024-08-20 21:22:40 +02:00
Laserlicht	0901286f9d	fix	2024-08-20 20:38:38 +02:00
Laserlicht	01e55beef1	Merge branch 'develop' into resource_generation	2024-08-20 20:26:52 +02:00
Laserlicht	01c14ae9ce	Merge branch 'develop' into extended_statistic	2024-08-20 20:25:16 +02:00
SoundSSGood	58bb2b58e3	IMarket suggestions ... Co-authored-by: Ivan Savenko <saven.ivan@gmail.com>	2024-08-20 18:49:48 +03:00
SoundSSGood	cd7ebea9e3	cleanup unused code	2024-08-20 18:49:47 +03:00
SoundSSGood	39bb6d5f39	IMarket now able to store artifacts	2024-08-20 18:49:47 +03:00
SoundSSGood	fd45b5144d	IMarket serializeable	2024-08-20 18:49:47 +03:00
Ivan Savenko	85f6030c7c	Merge pull request #4318 from IvanSavenko/upscaled_render ... Support for xBRZ upscaling filter	2024-08-20 14:23:30 +03:00
Laserlicht	6c1776e0b1	AssetGenerator: make it perfect	2024-08-20 03:13:21 +02:00
Laserlicht	f6d5cee24f	fix	2024-08-20 01:58:02 +02:00
Laserlicht	82480e3552	add clean adventure options	2024-08-20 01:46:07 +02:00
Laserlicht	c2b181dc0c	Merge branch 'develop' into resource_generation	2024-08-19 23:43:24 +02:00
Laserlicht	17cb45f692	fix	2024-08-19 23:33:23 +02:00
Laserlicht	fff0159ef6	resource generation	2024-08-19 23:18:14 +02:00
Ivan Savenko	6a6c13471c	Try more robust approach for waiting dialogs in battles in MP	2024-08-19 18:20:11 +00:00
Ivan Savenko	28789bc691	Merge pull request #4462 from IvanSavenko/building_refactor ... Town buildings refactoring	2024-08-19 19:45:21 +03:00
Laserlicht	fec3d070b5	gui fixes for globallobby	2024-08-19 15:23:47 +00:00
Ivan Savenko	b94a61c255	Try to fix battle startup if player has waiting dialogs	2024-08-19 15:21:45 +00:00
Ivan Savenko	16adf8415f	Add missing property to schema	2024-08-19 11:54:59 +00:00
Ivan Savenko	cf1c2d66cc	More examples in docs	2024-08-19 11:47:13 +00:00
Ivan Savenko	cc5564a7b1	Remove no longer used localization strings	2024-08-19 11:47:13 +00:00
Ivan Savenko	42902b8eb5	Update documentation, add examples	2024-08-19 11:47:13 +00:00
Ivan Savenko	6fa2bb7e91	Deprecate previously hardcoded buildings	2024-08-19 11:47:13 +00:00
Ivan Savenko	22a126cf2d	Restored replacement of town building bonuses via building upgrade	2024-08-19 11:47:13 +00:00
Ivan Savenko	2f3f3c21df	Rename town building types to more clear names	2024-08-19 11:47:13 +00:00
Ivan Savenko	abfb467f68	Cleanup old code, add compatibility for 1.5 mods	2024-08-19 11:47:13 +00:00
Ivan Savenko	01a9509ccb	Remove unused code, reduce includes	2024-08-19 11:47:13 +00:00
Ivan Savenko	f1e63792f0	Greatly simplify town buildings logic	2024-08-19 11:47:13 +00:00
Ivan Savenko	57430c101f	Extracted common properties of buildings into a shared file	2024-08-19 11:47:13 +00:00
Simeon Manolov	90931cc3e3	android deploy fix attempt	2024-08-19 13:17:38 +03:00
kdmcser	a0023e8cdd	update Chinese translation	2024-08-19 12:56:45 +08:00
Ivan Savenko	2a54de7569	Merge pull request #4476 from IvanSavenko/mod_repo_160 ... Use 1.6 repository for mods	2024-08-19 00:06:08 +03:00
Ivan Savenko	4ba2b95983	Fix build	2024-08-18 20:59:32 +00:00
Ivan Savenko	49412579b4	Use 1.6 repository	2024-08-18 20:48:16 +00:00
Ivan Savenko	5b49c7525a	Merge pull request #4475 from MichalZr6/CSpellHandler_allow_lowercase_x ... Allow lowercase 'X' in spellRangeInHexes JSON property	2024-08-18 21:51:36 +03:00
Ivan Savenko	9ddb3fd3fe	Merge pull request #4456 from ToRRent1812/patch-1 ... Update polish.json	2024-08-18 20:58:24 +03:00
Ivan Savenko	4e23bb4c8c	Merge pull request #4399 from kdmcser/enchanter_armageddon ... make armageddon can effect to allied creatures in ENCHANTER bonus	2024-08-18 20:57:48 +03:00
Ivan Savenko	41bc21adb5	Merge pull request #4460 from Warzyw647/black-market-restock-fix ... Fix config setting blackMarketRestockPeriod.	2024-08-18 20:52:59 +03:00
MichalZr6	e7b94014e1	allow lowercase 'X' in spellRangeInHexes	2024-08-18 18:46:54 +02:00