9559 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
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
nordsoft	576fd23531	Revert "[!] Disable mac arm platform" ... This reverts commit 6d7689fb978fb506ec6ce439af1dfcc9e56d4871.	2023-01-18 20:06:44 +04:00
nordsoft	a5f52bed13	Applying patch for conan	2023-01-18 20:06:38 +04:00
nordsoft	6d7689fb97	[!] Disable mac arm platform	2023-01-18 02:22:26 +04: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
nordsoft	957ff21fdc	Remove excessive enet command for mac	2023-01-18 02:15:23 +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
nordsoft	9d4d30c61a	Add enet into conan	2023-01-18 02:10:05 +04: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	99c7792f07	[!] Disable mxe	2023-01-18 02:03:24 +04:00
nordsoft	eb436d9aad	Revert "[!] Disable platforms" ... This reverts commit feffb3ecdd59fbdcc372eb7dfa30f78018d67f14.	2023-01-18 02:03:14 +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	6321106b04	Reverted MXE to stable version	2023-01-17 23:15:06 +02:00
Ivan Savenko	bafe0c42ce	Merge pull request #1293 from IvanSavenko/translate_launcher ... Translations support - Launcher	2023-01-17 23:05:14 +02: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
Ivan Savenko	7a92aa0a06	Fixes for compilation with Qt6	2023-01-17 12:49:33 +02:00
Ivan Savenko	b9712b0899	Fix translation search paths on ios	2023-01-16 22:37:19 +02:00
Ivan Savenko	e78d6f9d70	Fix MXE detection check	2023-01-16 21:28:32 +02:00
Andrii Danylchenko	33f92bc4b1	Merge pull request #1438 from dydzio0614/build-speed-adjust ... Adjust newly built building appearance and outline blinking speed	2023-01-16 20:27:56 +02:00
Dydzio	c3b254a815	Enum value can be used here as well	2023-01-16 18:26:31 +01:00
Nordsoft91	fba76489e2	Merge pull request #1328 from Nordsoft91/editor-lasso ... [MapEditor] Implement lasso brush	2023-01-16 21:05:00 +04:00
Nordsoft91	ea33fed15c	Merge branch 'develop' into editor-lasso	2023-01-16 21:04:44 +04:00
nordsoft	c0c1be2645	Fix invalid host connection	2023-01-16 20:58:19 +04:00
nordsoft	a2581fb942	Fix crash at start	2023-01-16 20:58:19 +04:00
nordsoft	d0b5a023ee	Fix bug	2023-01-16 20:58:19 +04:00
nordsoft	1ef9610e30	Remove irrelevant comment	2023-01-16 20:58:19 +04:00
nordsoft	da085b0058	Code review tweaks	2023-01-16 20:58:19 +04:00
nordsoft	2cce15efbe	Automatic mod conflict resolution	2023-01-16 20:58:19 +04:00
nordsoft	a2e358876c	Health check fix	2023-01-16 20:58:19 +04:00
nordsoft	14fc1c3f26	Cosmetic changes	2023-01-16 20:58:19 +04:00
nordsoft	8e1d8f835a	Implemented support of protocol 4	2023-01-16 20:58:19 +04:00
nordsoft	39ad8c7da1	Reduce udp polling time	2023-01-16 20:46:38 +04:00
Ivan Savenko	c252837b6a	Fix installation of compiled QM files	2023-01-16 18:02:11 +02:00
Andrii Danylchenko	b3f6250f4e	Merge pull request #1439 from dydzio0614/castle-shipyard-animation-fix ... Fix wrong rendering of castle shipyard	2023-01-16 14:23:37 +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
Dydzio	54e499f5e7	Minor refactoring from code review	2023-01-16 00:33:53 +01:00
nordsoft	f9050fa5fa	Revert "[!] Disable windows" ... This reverts commit d904ff01084fc63436290ff6e29bc67622679dad.	2023-01-16 02:10:10 +04:00
Ivan Savenko	96141f010b	Merge remote-tracking branch 'vcmi/develop' into translate_launcher	2023-01-15 23:55:49 +02:00