15400 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Ivan Savenko	8aaa9e63dd	Fix build	2024-04-09 18:56:28 +03:00
Tomasz Zieliński	8d9489c368	Fix conflicts with templates loaded from mods	2024-04-09 17:29:33 +02:00
Ivan Savenko	f14aec5876	Trim cheats so 'vcmiartifacts ' will be recognized as single-word cheat	2024-04-09 17:08:24 +03:00
Ivan Savenko	50e8d1fd82	Add save compatibility check	2024-04-09 16:42:20 +03:00
Ivan Savenko	42616cf4e8	Fix text formatting, fix todo's	2024-04-09 16:13:30 +03:00
Ivan Savenko	18ece6dcf6	Remove some usages of server-side translations	2024-04-09 16:13:30 +03:00
Ivan Savenko	7a42e21e4d	Fix formatting of luck/morale bonuses	2024-04-09 16:13:30 +03:00
Ivan Savenko	9e49587749	Replace bonus string description with metastring that can properly ... handle translations	2024-04-09 16:13:30 +03:00
Ivan Savenko	b0334b381e	Merge pull request #3724 from IvanSavenko/fix_server_shutdown ... Simplified and fixed server restart procedure	2024-04-09 16:13:19 +03:00
Ivan Savenko	738fe0b04e	Merge pull request #3733 from altiereslima/develop ... VCMI Portuguese Brazilian	2024-04-09 14:58:40 +03:00
Ivan Savenko	ede69ca58b	Merge pull request #3726 from IvanSavenko/fix_summon ... Block spellcasting if 0 creatures will be raised	2024-04-09 13:44:51 +03:00
Ivan Savenko	eddd854951	Merge pull request #3715 from Alexander-Wilms/deprecated-boost-header ... Disable warnings about boost including deprecated headers internally	2024-04-09 12:48:47 +03:00
Ivan Savenko	576939f105	Merge pull request #3713 from Laserlicht/scalingMode ... scalingMode to config	2024-04-09 12:48:35 +03:00
Ivan Savenko	f73243eb1c	Merge pull request #3669 from SoundSSGood/market-window-unified ... Market window and widgets	2024-04-09 12:48:25 +03:00
altiereslima	2c29c15d18	Update portuguese.json	2024-04-08 21:46:47 -03:00
Tomasz Zieliński	bf2c9237b2	Register templates for new objects from mods	2024-04-08 16:39:41 +02:00
Tomasz Zieliński	c7149103ce	Compile fix	2024-04-08 15:24:52 +02:00
Tomasz Zieliński	d9a598ad9c	Merge remote-tracking branch 'origin/develop' into biome_system	2024-04-08 15:01:17 +02:00
Tomasz Zieliński	c9f8742334	Remove some unused templates, hand-tweak existing ones	2024-04-08 14:56:48 +02:00
Tomasz Zieliński	224e971c4b	Unused variable	2024-04-08 14:56:21 +02:00
SoundSSGood	39a0e56169	suggested changes	2024-04-08 14:57:58 +03:00
Ivan Savenko	719b61bb9f	Updated docs	2024-04-08 14:05:49 +03:00
Tomasz Zieliński	3e3959d360	Move all OH3 objects and obstacle sets to a mod	2024-04-08 12:50:41 +02:00
Ivan Savenko	050157db9d	Register vcmi-only strings as part of 'vcmi' mod instead of 'core'	2024-04-08 13:16:54 +03:00
Ivan Savenko	4947baebee	Fix crash on loading vmap's	2024-04-08 13:16:34 +03:00
Ivan Savenko	8582bd7d66	Replaced 'convert txt' command with more convenient 'translate' and ... 'translate maps' commands.	2024-04-08 13:16:23 +03:00
altiereslima	85f7d64e01	Update portuguese.json	2024-04-07 15:44:16 -03:00
altiereslima	0321867e94	Create portuguese.ts	2024-04-07 15:44:10 -03:00
Ivan Savenko	e89e5d2127	Rename for clarity	2024-04-07 21:22:33 +03:00
Ivan Savenko	0a296add0c	apply SonarCloud suggestions	2024-04-07 21:21:48 +03:00
altiereslima	2d4be97b6a	Update portuguese.json	2024-04-07 14:55:31 -03:00
altiereslima	d29b2f098f	Update portuguese.ts	2024-04-07 14:55:25 -03:00
altiereslima	a4bbdb2b4d	Update portuguese.ts	2024-04-07 14:36:24 -03:00
altiereslima	b960a992fd	Update mod.json	2024-04-07 14:17:30 -03:00
altiereslima	b5f86caefc	Create portuguese.json	2024-04-07 14:17:24 -03:00
altiereslima	437ff290e2	Update CMakeLists.txt	2024-04-07 14:17:19 -03:00
altiereslima	5b012c009b	Update CMakeLists.txt	2024-04-07 14:17:14 -03:00
Ivan Savenko	5dcef193a3	Block spellcasting if 0 creatures will be raised	2024-04-07 18:50:37 +03:00
altiereslima	5f3bd2963e	VCMI Portuguese Brazilian	2024-04-07 11:55:56 -03:00
Ivan Savenko	80acd7e77c	Simplified and fixed server restart procedure: ... - Replaced several assertions with runtime_error's to detect them in release builds - Removed multiple dispatchMainThread calls in server shutdown code to simplify debugging and code flow - Moved handling of gameplay shutdown and score calculation from PlayerInterface to ServerHandler (not perfect, but better than before)	2024-04-07 14:19:57 +03:00
Ivan Savenko	0a80c6c27b	Merge pull request #3722 from IvanSavenko/stabilization ... Fixes for recently reported crashes	2024-04-07 14:07:56 +03:00
Ivan Savenko	4bef4d9277	Merge pull request #3718 from IvanSavenko/lobby_tweaks_3 ... Few more tweaks for new lobby	2024-04-07 14:07:49 +03:00
Ivan Savenko	8a98de8275	Merge pull request #3723 from thiscris/develop ... Small wiki update	2024-04-07 10:46:45 +03:00
Tomasz Zieliński	86cffb3a77	Removed unused variable	2024-04-06 18:12:44 +02:00
Alexander Wilms	ef417a0db0	Disable warnings about boost 1.7.4 including deprecated headers internally	2024-04-06 14:59:24 +00:00
thiscris	9bbcb4cf5c	Merge branch 'develop' of https://github.com/vcmi/vcmi into develop	2024-04-06 15:44:47 +02:00
thiscris	94dd38539b	updated minimal mod.json example	2024-04-06 15:44:31 +02:00
Tomasz Zieliński	73ec53a9e0	Fix build	2024-04-06 15:29:15 +02:00
Tomasz Zieliński	b0cff23c37	Cleanup	2024-04-06 15:06:08 +02:00
Ivan Savenko	03786fb63b	VCAI will now check whether it actually has enough gold to buy a hero	2024-04-06 15:59:08 +03:00