17057 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Ivan Savenko	475a20124f	Fix crash on right-clicking spell component in some dialogs	2024-08-21 18:19:31 +00:00
Simeon Manolov	d05adfc5d5	Merge branch 'develop' into split-client+develop	2024-08-21 17:40:37 +03:00
Simeon Manolov	5a7dc7b552	Merge branch 'develop' into split-client+develop	2024-08-21 17:39:44 +03:00
Simeon Manolov	f500139f8d	re-enable github jobs	2024-08-21 17:38:19 +03:00
Simeon Manolov	da6bd38a1c	fix typo	2024-08-21 17:21:36 +03:00
Simeon Manolov	81c3151c2c	TEMP remove unneeded git runs	2024-08-21 16:19:45 +03:00
Simeon Manolov	530c1f2bc1	[SPLIT-CLIENT+DEVELOP] android fix attempt	2024-08-21 16:07:30 +03:00
Ivan Savenko	ff33fbd3a0	Merge pull request #4480 from IvanSavenko/update_prebuilts ... Update ffmpeg	2024-08-21 15:57:50 +03:00
Ivan Savenko	2a84627fd2	Merge pull request #4444 from Laserlicht/extended_statistic ... Statistics	2024-08-21 15:18:17 +03:00
Ivan Savenko	4ac1b1169a	Update developers documentation to point to new prebuilts location	2024-08-21 12:14:08 +00:00
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