4323 Commits

Author	SHA1	Message	Date
nordsoft	6f6f75793b	Merge remote-tracking branch 'upstream/develop' into enet	2023-01-19 00:49:59 +04:00
nordsoft	e9ddaaa6ea	Add thread into headers	2023-01-18 20:40:26 +04:00
nordsoft	15951319c4	Attempt to compile code	2023-01-18 20:23:04 +04:00
nordsoft	091cf9cd2f	Some code changes	2023-01-18 20:09:19 +04:00
Ivan Savenko	e53e515aa7	Fix msvc compile	2023-01-18 01:04:50 +02:00
Ivan Savenko	17fc9d8d8f	Merge with vcmi/develop	2023-01-18 01:04:34 +02:00
nordsoft	f6ae0c74ce	Merge remote-tracking branch 'upstream/develop' into enet ... # Conflicts: # CI/mac/before_install.sh	2023-01-18 02:16:15 +04:00
Ivan Savenko	c400416058	Merge pull request #1409 from IvanSavenko/translate_terrain ... Refactoring of terrain handlers	2023-01-18 00:12:31 +02:00
Dydzio	0e72ee9217	No longer relevant TODO removed	2023-01-18 02:05:30 +04:00
Dydzio	72eb794397	Fix space to tab, update description	2023-01-18 02:05:30 +04:00
Dydzio	f64d6bc1bc	Add support for overwriting default range via additional info	2023-01-18 02:05:30 +04:00
Dydzio	01ce01d8f9	Add proper handling for 2-hex units + extract range calculation method	2023-01-18 02:05:30 +04:00
Dydzio	cf1674d0ca	Introduce new bonus for limiting range	2023-01-18 02:05:30 +04:00
Dydzio	c22ab5ec9e	Initial version of limiting shooters range feature	2023-01-18 02:05:30 +04:00
Nordsoft91	672bcb488b	Merge pull request #1381 from dydzio0614/client-commands-improvements ... Client commands code improvements + ingame support	2023-01-18 02:04:38 +04:00
nordsoft	d1f4b176eb	Fix build system	2023-01-18 02:02:32 +04:00
nordsoft	ccef596cc0	Refactor enet-related code	2023-01-18 02:02:17 +04:00
Ivan Savenko	05ac217b0f	Merge with vcmi/develop	2023-01-17 23:02:25 +02:00
Ivan Savenko	e436b4425f	Serialization version bump	2023-01-17 22:59:32 +02:00
Ivan Savenko	633b9ef3be	Native terrain is now required for faction, opt-out with value "none"	2023-01-17 22:59:14 +02:00
Ivan Savenko	707de75ac0	Cleared up formatting	2023-01-17 22:58:22 +02:00
Dydzio	e593b61201	Merge branch 'develop' into client-commands-improvements	2023-01-16 01:13:06 +01:00
Dydzio	da39eb789f	Fix indent	2023-01-16 00:37:18 +01:00
Ivan Savenko	96141f010b	Merge remote-tracking branch 'vcmi/develop' into translate_launcher	2023-01-15 23:55:49 +02:00
Ivan Savenko	0a858d9a7c	Upgrade msvc to include enet and qt translator (#1436) ... - Updated MSVC prebuilt package - Fixed build warnings	2023-01-15 23:55:24 +02:00
Ivan Savenko	246281e62a	Merged vcmi/beta with vcmi/develop	2023-01-15 17:46:42 +02:00
Ivan Savenko	bec894c348	Implemented automatic detection of H3 files language/encoding	2023-01-15 17:32:39 +02:00
Ivan Savenko	6ea7add4bb	Merge pull request #1394 from SoundSSGood/art-move-fix ... Artifact movement refactoring	2023-01-15 17:29:36 +02:00
Andrey Filipenkov	2f14914120	fix Boost deprecation warnings ... warnings introduced in v1.81 # Conflicts: # mapeditor/resourceExtractor/ResourceConverter.cpp	2023-01-15 17:28:09 +02:00
Andrii Danylchenko	9f0eb055f9	Merge pull request #1426 from vcmi/android-upgrade-sdl ... Update android JNI bindings	2023-01-15 10:36:32 +02:00
Dydzio	b5a1b178d9	Explicitly call reset on shared_ptr for potential readability boost	2023-01-15 01:18:35 +01:00
nordsoft	2b4ae8cdd6	Try to compile	2023-01-15 02:08:50 +04:00
nordsoft	b1252becc2	Fix compilation error	2023-01-15 01:32:22 +04:00
nordsoft	2acad02476	Fix compilation	2023-01-15 01:02:41 +04:00
Ivan Savenko	a46ab835ce	Applied review suggestions	2023-01-14 23:01:33 +02:00
nordsoft	f765112798	Merge remote-tracking branch 'upstream/develop' into enet	2023-01-14 23:53:43 +04:00
Ivan Savenko	ccc6ebee0d	Cleared up gate blocking, Force Field can now block gates	2023-01-13 15:44:42 +02:00
Ivan Savenko	526de47ca4	Removed 0.98 compatibility	2023-01-13 13:00:07 +02:00
Ivan Savenko	3be3c871fb	Destroyed walls will now remove wall penalty	2023-01-13 01:59:09 +02:00
Ivan Savenko	1d7f004658	Implemented reinforced walls in towns with Castle	2023-01-13 01:09:24 +02:00
Ivan Savenko	500cf7f15d	EWallPart & EWallState are now enum class	2023-01-13 00:35:58 +02:00
Ivan Savenko	dd3adb7e16	Arrow towers damage algorithm should now match H3	2023-01-12 23:52:03 +02:00
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	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	1e37e66e6c	Replaced Terrain::BORDER and WRONG with NONE	2023-01-10 20:09:09 +02:00