9805 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Dydzio	aac515f64e	Merge 'develop' branch	2023-01-11 16:24:53 +01:00
Ivan Savenko	192e856797	merge with vcmi/develop	2023-01-11 16:47:53 +02:00
Ivan Savenko	e48bd39b9c	Moved road & river handlers into a separate file	2023-01-11 15:17:24 +02:00
Ivan Savenko	5e72ef76cf	Fix quest texts accessing	2023-01-11 15:10:44 +02:00
Ivan Savenko	76540bd960	Fix tactics buttons positioning	2023-01-11 15:10:30 +02:00
Ivan Savenko	8b6f6f9b93	Fix msvc compile	2023-01-11 13:59:43 +02:00
Ivan Savenko	c6f089c6b1	Removed outdated comment	2023-01-11 13:59:33 +02:00
SoundSSGood	a0568823a9	swap contitutient	2023-01-11 13:17:33 +02:00
Ivan Savenko	9b77215b23	Attempt to fix slowdown in daily buid - revert MXE	2023-01-10 21:19:32 +02:00
Ivan Savenko	1e37e66e6c	Replaced Terrain::BORDER and WRONG with NONE	2023-01-10 20:09:09 +02:00
Ivan Savenko	1b25043dab	Terrain identifiers will also have mod:name format	2023-01-10 20:08:37 +02:00
Ivan Savenko	1caec0a8cb	Removed default native terrains - breaks neutral faction	2023-01-10 20:08:07 +02:00
Ivan Savenko	8c2b1d74be	Removed unused code	2023-01-10 20:07:22 +02:00
Ivan Savenko	3fd9a14651	Fix #1401 - Restored accessing creature names via GeneralTextHandler	2023-01-10 12:26:20 +02:00
Ivan Savenko	c455986a55	Fix regressions in RMG & map editor	2023-01-10 01:05:28 +02:00
Ivan Savenko	668aee71ff	Added schemas for rivers & roads, updated terrain schema	2023-01-10 00:01:35 +02:00
Ivan Savenko	c6d62c6297	Added translatable strings for roads & rivers, for use in editor	2023-01-10 00:01:35 +02:00
Ivan Savenko	4f3ea0d1d9	Renamed Terrain.h/cpp -> TerrainHandler.h/cpp	2023-01-10 00:01:35 +02:00
Ivan Savenko	f51b3bca57	use JsonKey or NameTranslated instead of ambiguos Name	2023-01-10 00:01:35 +02:00
Ivan Savenko	009705e794	Names for terrains now pass through translator	2023-01-10 00:01:35 +02:00
Ivan Savenko	7c7ae26e67	Map/Road/River identifiers are now private members	2023-01-10 00:01:35 +02:00
Ivan Savenko	f3985d205b	Added horseSoundPenalty for terrains (for movement outside of roads)	2023-01-10 00:01:35 +02:00
Ivan Savenko	64885bdf6b	Better names for terrain parameters. Support for new movement sounds.	2023-01-10 00:01:35 +02:00
Ivan Savenko	4e4dae854f	Final stabilization changes	2023-01-10 00:01:35 +02:00
Ivan Savenko	99745b5c3c	Fix rivers & roads loading	2023-01-10 00:01:35 +02:00
Ivan Savenko	2de3178158	Fixed game startup	2023-01-10 00:01:35 +02:00
Ivan Savenko	e1799379dd	Terrain/Road/River handler are now in compileable state	2023-01-10 00:01:35 +02:00
Ivan Savenko	1468f6aded	Converted terrainTypeHandler into proper handler class	2023-01-10 00:01:35 +02:00
Ivan Savenko	01811317f9	Remove assert which may not always be true	2023-01-09 23:22:59 +02:00
Ivan Savenko	4b3782b5cf	Post-merge fix	2023-01-09 23:22:59 +02:00
Ivan Savenko	1fece0ce18	Merge pull request #1229 from IvanSavenko/battle_improvements ... Battle: Fixing bugs & Implementation of missing features	2023-01-09 22:07:13 +02:00
Ivan Savenko	d9aab0a847	Merge pull request #1318 from IvanSavenko/translate_mapeditor ... Translate mapeditor	2023-01-09 21:25:09 +02:00
Ivan Savenko	bde988ca43	Merge pull request #1329 from IvanSavenko/translate_game ... Translations support - base functionality for main game texts	2023-01-09 20:33:56 +02:00
Ivan Savenko	3e0bb3a7cc	Fixed copy-paste error	2023-01-09 19:14:21 +02:00
Ivan Savenko	6379c5f6fa	Install additional dll on Windows to get better style for Qt	2023-01-09 18:35:14 +02:00
Ivan Savenko	8f42c86962	Formatting: space -> tabs	2023-01-09 18:34:37 +02:00
Ivan Savenko	84aefc3362	Changed log file format: print timestamp instead of thread ID	2023-01-09 18:34:37 +02:00
Ivan Savenko	2f5ee44cbe	Fixes patrol position initialization on H3M load	2023-01-09 18:34:13 +02:00
Ivan Savenko	f155a35378	Fix positioning of UI elements in BattleWindow	2023-01-09 17:25:49 +02:00
Ivan Savenko	c63e79fb28	Fix multi-line texts in combat log	2023-01-09 17:25:18 +02:00
Ivan Savenko	9308319ac7	Added workaround for ~200 ms lag occuring after hero move	2023-01-09 13:05:28 +02:00
Ivan Savenko	8526eba6fa	Added checks to music player to detect potential freezes	2023-01-09 13:05:15 +02:00
Ivan Savenko	7e8516f927	Changed Sirens behavior to match H3 logic	2023-01-09 13:04:56 +02:00
SoundSSGood	4005b48360	Regressions fixed	2023-01-08 23:31:12 +02:00
SoundSSGood	c706b4d419	CArtifactsOfHero::artifactMoved updated	2023-01-08 23:31:06 +02:00
SoundSSGood	6b7ce798d0	artifactTransitionPos created	2023-01-08 23:24:13 +02:00
Dydzio	58fe0e6bd9	Apply command review suggestions + minor cleanup	2023-01-08 20:30:57 +01:00
Ivan Savenko	205beb96ed	Fix petrification effect	2023-01-08 16:25:47 +02:00
Andrey Filipenkov	48c01157e6	fix typo	2023-01-08 01:33:26 +02:00
Andrey Filipenkov	db98575d10	fix unaligned memory access (UB) on Clang/GCC/MSVC ... sample UBSAN report: client/gui/CAnimation.cpp:329:24: runtime error: load of misaligned address 0x62d0004b094f for type 'const ui32' (aka 'const unsigned int'), which requires 4 byte alignment	2023-01-08 01:33:26 +02:00