1908 Commits

Author	SHA1	Message	Date
Xilmi	5d6877e06d	Merge remote-tracking branch 'upstream/develop' into develop	2024-10-20 00:49:17 +02:00
Ivan Savenko	c25aef8f48	Merge pull request #4766 from SoundSSGood/fused-artifacts ... Fused artifacts	2024-10-16 15:08:20 +03:00
Olegmods	5e093d82b7	Update battlefields.json	2024-10-15 23:02:27 +03:00
Olegmods	049c6c539f	Revert changes	2024-10-15 23:01:53 +03:00
SoundSSGood	86d5c05ffa	Fused identical artifacts	2024-10-15 16:51:29 +03:00
Olegmods	5f34d3b067	Update obstacles.json	2024-10-15 14:15:43 +03:00
Olegmods	6c4e7f8058	Update obstacles.json	2024-10-15 11:09:14 +03:00
Laserlicht	9ed4dbaeb4	Merge remote-tracking branch 'upstream/develop' into adv_search	2024-10-14 19:52:55 +02:00
Xilmi	533806df6d	Merge remote-tracking branch 'upstream/develop' into develop	2024-10-11 19:07:56 +02:00
heroesiiifan	b56b6c1496	Update campaignMedia.json	2024-10-10 21:44:08 +00:00
Xilmi	61fba1fedd	Merge remote-tracking branch 'upstream/develop' into develop	2024-10-10 17:23:39 +02:00
Ivan Savenko	68e5cff276	Implement user-defined cursor scaling	2024-10-09 17:37:54 +00:00
Ivan Savenko	7d58f89992	Change default resolution from 800x600 to 1280x720	2024-10-09 17:37:54 +00:00
Ivan Savenko	daa706b847	Enable fullscreen as default	2024-10-09 17:37:54 +00:00
Ivan Savenko	42adc9d394	Enable auto-detection of UI scaling	2024-10-09 17:37:54 +00:00
Xilmi	9a40577994	Merge remote-tracking branch 'upstream/develop' into develop	2024-10-08 16:15:22 +02:00
Ivan Savenko	2399a5a765	Merge pull request #4712 from IvanSavenko/detect_conflict ... Detection of potential conflicts between mods	2024-10-07 17:57:52 +03:00
Laserlicht	344e845684	Merge branch 'develop' into adv_search	2024-10-07 12:56:54 +02:00
Laserlicht	a826b88641	Merge branch 'develop' into spell	2024-10-07 12:55:23 +02:00
Ivan Savenko	8e4152bc81	It is now possible to define objects directly in mod.json instead of ... using path to file with object definition	2024-10-06 19:42:15 +00:00
Ivan Savenko	66fdad145c	Added an option to configure validation level in launcher	2024-10-06 19:21:33 +00:00
Ivan Savenko	a7027e10f4	Merge pull request #4696 from Laserlicht/color_param ... color shift parameter to config	2024-10-06 16:03:45 +03:00
Xilmi	ddfeab8748	Merge remote-tracking branch 'upstream/develop' into develop	2024-10-03 13:38:51 +02:00
Laserlicht	e86b694b22	fast search	2024-10-01 21:36:45 +02:00
Laserlicht	d04f369d85	search basic implementation	2024-10-01 18:15:32 +02:00
Ivan Savenko	f816c3306b	Merge pull request #4694 from Laserlicht/spell_cast_only_self ... cast only on self	2024-10-01 17:20:20 +03:00
Laserlicht	be31041a48	"general" -> "interface"	2024-10-01 16:09:22 +02:00
Xilmi	3d9892f6b3	Merge remote-tracking branch 'upstream/develop' into develop	2024-10-01 16:08:57 +02:00
DjWarmonger	ffed9480e0	Merge pull request #4483 from vcmi/custom_objects_per_zone ... Customizable objects in RMG zones	2024-10-01 14:58:35 +02:00
Ivan Savenko	46ed052714	Merge pull request #4692 from dydzio0614/change-default-ai ... Change default neutral creatures AI to BattleAI	2024-10-01 15:28:43 +03:00
Ivan Savenko	6b72549078	Merge pull request #4690 from IvanSavenko/ttf_tweaks ... Tweaks for scalable / true type fonts	2024-10-01 15:28:11 +03:00
Laserlicht	844b078482	color shift parameter to config	2024-09-30 19:46:53 +02:00
Laserlicht	713fcd6543	research per day & seperate config	2024-09-30 02:40:28 +02:00
Dydzio	3c9ec0c30e	Change neutral AI to BattleAI	2024-09-29 15:44:24 +02:00
Xilmi	58eeccd119	Merge remote-tracking branch 'upstream/develop' into develop	2024-09-29 12:35:44 +02:00
Ivan Savenko	532ed9b12c	Adjusted ttf font sizes to better match H3 fonts	2024-09-28 19:29:49 +00:00
Dydzio	ac380b0f4c	Remove block of conflux creatures idle animations	2024-09-28 19:12:32 +02:00
Laserlicht	e6cb87abac	cast only on self	2024-09-28 17:32:53 +02:00
Laserlicht	8461189e95	code review + text	2024-09-28 16:10:03 +02:00
Laserlicht	f94f0a3274	new dialog	2024-09-28 15:51:53 +02:00
Laserlicht	d929bfb9d1	rename; introduce factor	2024-09-28 15:05:13 +02:00
Laserlicht	2052a26031	code review	2024-09-28 14:25:11 +02:00
Laserlicht	3559f9f923	HMI for spell research	2024-09-28 01:47:32 +02:00
Laserlicht	a9327b3fa3	netpacks	2024-09-27 22:47:22 +02:00
Laserlicht	efcac3b933	settings	2024-09-27 20:16:41 +02:00
Ivan Savenko	7f8f09c8fa	Merge pull request #4668 from Laserlicht/scenario_name ... Chronicles improvements	2024-09-27 20:01:47 +03:00
Ivan Savenko	19db016473	Merge pull request #4654 from dydzio0614/any-hex-shooting ... Allow targeting empty hex by shooters with multi-tile SPELL_LIKE_ABILITY	2024-09-27 19:23:33 +03:00
Ivan Savenko	69d9e34ebf	Merge pull request #4642 from Laserlicht/invincible_improvements ... Invincible bonus: only blocking non positive spells; counterstrike	2024-09-27 18:58:00 +03:00
Xilmi	1d831022e8	Merge remote-tracking branch 'upstream/develop' into develop	2024-09-25 14:08:34 +02:00
Laserlicht	2d60252e4c	read from mapheader; move chr to subfolder	2024-09-24 21:41:37 +02:00