13106 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Ivan Savenko	4d43562bca	Merge pull request #2924 from Laserlicht/datetime_android ... Datetime android	2023-09-27 15:43:46 +03:00
Ivan Savenko	724eb7902e	Merge pull request #2950 from soulsource/feature/make-erm-compile-again ... Make ERM compile again.	2023-09-27 15:42:33 +03:00
Ivan Savenko	d0046d29f2	Merge pull request #2957 from ProjectMutilation/fix-pvs-issues ... Fixed some issues found by pvs	2023-09-27 15:40:37 +03:00
Ivan Savenko	9147fd49ab	Merge pull request #2932 from Laserlicht/mainmenu_layer ... fix layer problem in mainmenu	2023-09-27 15:37:40 +03:00
Maxim Korotkov	ade7a035f5	artifactUtils: reduced cyclomatic complexity in check ... Signed-off-by: Maxim Korotkov <korotkov.maxim.s@gmail.com>	2023-09-27 09:05:58 +03:00
Maxim Korotkov	59acf639da	client: render: fixed copy-past errror in genFromJson() ... Signed-off-by: Maxim Korotkov <korotkov.maxim.s@gmail.com>	2023-09-27 09:05:58 +03:00
Maxim Korotkov	56061d116e	vcai: Combined cases with the same actions	2023-09-27 09:05:58 +03:00
Maxim Korotkov	f874d27797	AI: removed redundant checks ... The pointers "up" and "down" were checked against nullptr but it's always non-null Also added curly braces for if statement. It's good practice for avoiding shooting yourself to the foot Signed-off-by: Maxim Korotkov <korotkov.maxim.s@gmail.com>	2023-09-27 09:05:58 +03:00
Laserlicht	2738dc3190	better approach for redrawing	2023-09-26 21:12:04 +02:00
Nordsoft91	8c6381b497	Merge pull request #2951 from Laserlicht/spell_icon ... specific spell icon (artifacts)	2023-09-26 20:13:19 +02:00
Nordsoft91	12eac2d4ba	Merge pull request #2941 from Laserlicht/spellbook ... Big Spellbook	2023-09-26 20:12:30 +02:00
Nordsoft91	c803b57c33	Merge pull request #2889 from Nordsoft91/mod-compatibility-check ... Proper mod compatibility check logic	2023-09-26 19:29:46 +02:00
Ivan Savenko	0864f975aa	Merge pull request #2860 from IvanSavenko/modding_docs_update ... Update modding documentation	2023-09-26 17:29:59 +03:00
Laserlicht	ac5f552219	fix	2023-09-26 15:56:39 +02:00
Laserlicht	93e2826e3e	new constructor	2023-09-26 15:53:44 +02:00
nordsoft	056cba55a8	Show loading screen immediately on restart	2023-09-26 15:45:46 +02:00
Ivan Savenko	67a98d086f	Clarified animations format	2023-09-26 16:00:33 +03:00
Ivan Savenko	0ab766479d	One more documentation update iteration	2023-09-26 15:55:27 +03:00
Ivan Savenko	8210a2cafd	Added list of all identifiers from base game	2023-09-26 15:55:27 +03:00
Ivan Savenko	43246477d4	Update bonuses docs	2023-09-26 15:55:27 +03:00
Ivan Savenko	403acc0cf1	Update spell docs	2023-09-26 15:55:27 +03:00
Ivan Savenko	ddda6c0c01	Updated localization docs	2023-09-26 15:55:27 +03:00
Ivan Savenko	9f894d6ca0	Updated RMG template schema	2023-09-26 15:55:27 +03:00
Ivan Savenko	f4ee9424e4	Removed unused properties	2023-09-26 15:55:27 +03:00
Ivan Savenko	9710a6b7b3	Updated terrain/river/road schema, added docs	2023-09-26 15:55:27 +03:00
Ivan Savenko	7b8ca9fd40	Add missing schema for "rmg" section of object description	2023-09-26 15:55:27 +03:00
Ivan Savenko	0b044663d9	Updated docs	2023-09-26 15:55:27 +03:00
Ivan Savenko	dfc72134f2	Removed unused property	2023-09-26 15:55:27 +03:00
Ivan Savenko	52cb4505e1	RMG schema now actually works	2023-09-26 15:55:27 +03:00
Ivan Savenko	43020c8108	Added value missing from schema	2023-09-26 15:55:27 +03:00
Ivan Savenko	27b75dbbea	Fixed silent errors on invalid Json references in schemas	2023-09-26 15:55:27 +03:00
Ivan Savenko	9c4475385b	Updated most of remaining bonus type docs	2023-09-26 15:55:27 +03:00
Ivan Savenko	524c476264	Removed no longer used bonuses	2023-09-26 15:55:27 +03:00
Ivan Savenko	a7ebbf8680	Updated bonus documentation up to SPELL_AFTER_ATTACK	2023-09-26 15:55:27 +03:00
Laserlicht	ab55615359	remove double code	2023-09-26 10:28:10 +02:00
Laserlicht	6b5f6030e2	header	2023-09-25 23:02:16 +02:00
Laserlicht	096036dc9f	spell icon	2023-09-25 22:58:59 +02:00
Andreas Grois	6225d8585d	Make ERM compile again. ... This is not a proper clean up. It does not bring the code up to the current state of the rest of the codebase. However, the module now compiles again.	2023-09-25 21:26:23 +02:00
Laserlicht	7cf654992f	code review	2023-09-25 16:34:36 +02:00
Ivan Savenko	b89fa254fc	Merge pull request #2921 from vdhan/develop ... add Vietnamese	2023-09-25 12:34:00 +03:00
Ivan Savenko	e8fdf46a29	Merge pull request #2939 from utzuro/develop ... fix some ukrainian strings in the android launcher	2023-09-25 11:40:31 +03:00
Laserlicht	28f4046937	ready	2023-09-25 01:04:06 +02:00
Laserlicht	3e4a5b7d80	border and variable	2023-09-25 00:31:32 +02:00
Laserlicht	a6b68be2df	offsets	2023-09-24 23:50:50 +02:00
Nordsoft91	9042778bcb	Merge pull request #2937 from Nordsoft91/lobby ... [!] Fix issue with impossible room ready status	2023-09-24 23:37:39 +02:00
nordsoft	2a3e371caf	Remove any modification of enabled mods during game loading	2023-09-24 23:34:46 +02:00
Laserlicht	8b5c9db21b	basic offset	2023-09-24 23:15:09 +02:00
Laserlicht	240d291de9	big spellbook	2023-09-24 22:24:51 +02:00
An Vu	b8eba01b7d	add Launcher and Map Editor	2023-09-24 21:09:09 +07:00
utzuro	240151374d	fix word in the translation	2023-09-24 22:44:35 +09:00