1515 Commits

Author	SHA1	Message	Date
Ivan Savenko	f65f4b1285	Disable new UI if enhancements are off	2023-11-13 19:49:41 +02:00
Ivan Savenko	d1ae5bbee5	Implement AI simturns checkbox	2023-11-13 19:06:56 +02:00
Ivan Savenko	c5eeaa6526	Added non-linear slider for better simturn duration selection	2023-11-13 19:06:56 +02:00
Ivan Savenko	7391f2a6ee	Added custom-made blue version of checkbox	2023-11-13 19:06:56 +02:00
Ivan Savenko	e160b8557b	Implement min/max simturns callbacks	2023-11-13 19:06:56 +02:00
Ivan Savenko	1f045ab128	Layout improvements for turn options tab	2023-11-13 19:06:56 +02:00
Ivan Savenko	32633d5f52	Initial version of Turn Options tab screen	2023-11-13 19:06:56 +02:00
Ivan Savenko	0b7c61e53f	Fix Tree of Knowledge config	2023-11-12 16:58:02 +02:00
Ivan Savenko	2835044282	Merge pull request #3159 from IvanSavenko/beta ... Merge beta -> develop (rebased)	2023-11-07 22:49:29 +02:00
Dydzio	aa96a53f37	Fix comment	2023-11-07 20:11:18 +02:00
Dydzio	66110d7bac	Fix commanders levelup bonus to match WoG	2023-11-07 20:10:55 +02:00
Tomasz Zieliński	ec0bf05163	Rename "cpu" parameter to correct "humans"	2023-10-30 17:21:03 +01:00
krs	ab7caa0777	Removed space after Torosar hero name	2023-10-23 23:57:37 +02:00
Ivan Savenko	3880ea58b9	Merge branch 'josch/dos2unix' into develop	2023-10-22 18:39:03 +03:00
Ivan Savenko	3867e512f7	Merge pull request #3064 from IvanSavenko/bonus_metaidentifier ... Type-safe bonus system	2023-10-22 18:34:12 +03:00
Ivan Savenko	b0a67a66e4	Merge pull request #3092 from IvanSavenko/compatibility_mods ... Better support for compatibility mods	2023-10-22 18:02:45 +03:00
Ivan Savenko	36a1d6c415	Removed remaining integer bonus subtypes from configs	2023-10-22 16:55:19 +03:00
Ivan Savenko	0a10fc30b8	(lib) Bonus subtype is now stored as metaidentifier that can store any ... other identifier inside it	2023-10-22 16:54:43 +03:00
Ivan Savenko	b50ebba1ba	Added mod type "Compatibility" that is hidden in launcher	2023-10-21 23:55:20 +03:00
Ivan Savenko	b9540fa507	Split object jsons into smaller files	2023-10-21 00:31:48 +03:00
Johannes Schauer Marin Rodrigues	a1a5bc28c2	convert line endings from CRLF (Windows) to LF (Linux/Unix) ... Mixed line endings cause problems when exporting patches with git-format-patch and then trying to "git am" a patch with mixed and non-matching line endings. In such a situation git will fail to apply the patch. This commit runs the dos2unix tools on the remaining files with CRLF (\r\n) line endings to convert them to line-feeds (\n) only. Files that are Windows specific like *.vcxproj and *.props files were not converted. Closes: #3073	2023-10-19 16:23:21 +02:00
Ivan Savenko	01920bb74e	Fix treasure chests	2023-10-19 15:41:41 +03:00
Ivan Savenko	8f4791914e	Show content preview only for Witch Huts / Shrines / Tree	2023-10-19 15:17:58 +03:00
Ivan Savenko	530c70c282	Added object descriptions present in H3	2023-10-19 13:34:15 +03:00
Ivan Savenko	ce480c8c84	Fixed Scholar handling	2023-10-18 17:14:22 +03:00
Ivan Savenko	48eba6c362	Fix Witch Hut messages to match H3	2023-10-17 16:52:57 +03:00
Ivan Savenko	eedaa63f5f	Hnadling of Shrine messages now matches H3	2023-10-17 16:35:34 +03:00
Ivan Savenko	850d0ff8eb	Show (mostly) correct messages in Shrines	2023-10-16 18:16:15 +03:00
Ivan Savenko	0ea44520fd	Fix build	2023-10-16 00:12:39 +03:00
Ivan Savenko	e10de0594e	Scholar is now configurable object (partial)	2023-10-16 00:12:39 +03:00
Ivan Savenko	ca368f606f	Added new files	2023-10-16 00:12:39 +03:00
Ivan Savenko	bb05c2dea5	Implemented configurable shrine	2023-10-16 00:12:39 +03:00
Ivan Savenko	98fd939ed6	Cartographer/Observatory is now configurable object	2023-10-16 00:12:38 +03:00
Ivan Savenko	f3ed589e35	Use same fow radius calculation as in H3	2023-10-16 00:12:38 +03:00
Ivan Savenko	c0a31b716a	Added new version of witch hut config	2023-10-16 00:12:38 +03:00
Ivan Savenko	fd01a25352	Implemented basic version of configurable Witch Hut	2023-10-16 00:12:38 +03:00
Ivan Savenko	f72a106e30	Overwrite Catherine / Kendal portraits in AB+ correctly	2023-10-04 23:23:09 +03:00
Ivan Savenko	037efdf5fc	Improvements to type safety of Identifier class ... - Constructor of Identifier from integer is now explicit - Lobby hero/town selection now uses Identifiers instead of int's - Removed serialization workaround for hero portraits - Added dummy objects for custom heroes portraits for ID resolver to use - HeroInstance now stores portrait ID only in case of custom portrait - Fixed loading of campaign heroes portraits on RoE maps	2023-10-04 18:05:23 +03:00
Laserlicht	ec8580b99e	Merge branch 'develop' into patch-4map_overview_rework	2023-10-02 21:03:16 +02:00
Nordsoft91	041ffceb07	Merge pull request #2952 from Alexander-Wilms/develop ... Enable VSync to prevent screen tearing while scrolling across map	2023-10-01 14:08:00 +02:00
Laserlicht	7f4361eb10	name -> path	2023-10-01 01:11:11 +02:00
Laserlicht	648a37310f	description	2023-10-01 00:35:11 +02:00
Laserlicht	65c21064b5	added var	2023-10-01 00:18:25 +02:00
Laserlicht	61aae7bccc	code review	2023-09-30 22:49:22 +02:00
Laserlicht	2eb4413978	fix height	2023-09-30 20:44:46 +02:00
Laserlicht	73a05d82e1	fix	2023-09-30 20:18:12 +02:00
Laserlicht	c6adcc40f5	add date; cleanup	2023-09-30 17:56:51 +02:00
Laserlicht	79e66c38df	layout	2023-09-30 17:14:22 +02:00
Ivan Savenko	71a1ed816a	Merge pull request #2892 from Laserlicht/highscore_menu ... Highscore Menu & end video	2023-09-27 15:48:47 +03:00
Ivan Savenko	efe3393408	Merge pull request #2947 from Laserlicht/enableUiEnhancements_button ... enableUiEnhancements button	2023-09-27 15:47:25 +03:00
Ivan Savenko	94dbde05a0	Merge pull request #2868 from IvanSavenko/simultaneous_turns ... Simultaneous turns	2023-09-27 15:45:02 +03:00
Laserlicht	bb358148d8	Update generalOptionsTab.json	2023-09-26 20:58:24 +02:00
Laserlicht	012f4b91b2	Update generalOptionsTab.json	2023-09-26 20:43:47 +02:00
Alexander Wilms	23d1638d70	Add VSync to settings	2023-09-26 18:55:25 +02: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	403acc0cf1	Update spell 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	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	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	54adeef29f	Added temporary UI for simturns testing	2023-09-26 13:42:20 +03:00
Laserlicht	5061792cce	enableUiEnhancements button	2023-09-25 13:11:08 +02:00
Laserlicht	f3e1943aaf	Merge branch 'develop' into highscore_menu	2023-09-23 21:38:17 +02:00
Nordsoft91	a36450e2d1	Merge pull request #2882 from Nordsoft91/ai-cheating ... Add basic system to give more advantages for ai player	2023-09-23 03:21:19 +02:00
Laserlicht	1a0f5cf159	calc preperation	2023-09-23 00:21:36 +02:00
Laserlicht	a4cb74f0dc	highscore input window	2023-09-22 20:39:20 +02:00
Ivan Savenko	455c13164e	Merge pull request #2886 from IvanSavenko/h3m_parser_fixes ... H3m parser fixes	2023-09-22 18:53:51 +03:00
Laserlicht	909b06f7c1	draw images	2023-09-22 02:19:31 +02:00
Laserlicht	92b0e2b400	initial highscore support	2023-09-22 01:39:35 +02:00
Laserlicht	4d8414bd3d	unlock functionality	2023-09-20 23:06:32 +02:00
Ivan Savenko	921569e02e	Fixed "Long Live the King", 1st scenario victory condition	2023-09-20 21:58:47 +03:00
nordsoft	cb3bbc6680	Restructured difficulty config	2023-09-20 16:12:26 +02:00
nordsoft	0de912e67b	Add basic system to add more advantages for ai player	2023-09-20 03:50:35 +02:00
Nordsoft91	86b0804be3	Merge pull request #2841 from krs0/quickfix/fix_market_of_time_missing_template ... Fix Market of Time missing Template	2023-09-18 01:49:41 +02:00
Nordsoft91	717a765123	Merge pull request #2813 from Laserlicht/textcolor ... Textcolor support	2023-09-16 14:12:17 +02:00
Ivan Savenko	a669cc3829	Merge pull request #2839 from krs0/feature/fix_skill_schema ... Fix broken skill schema	2023-09-16 12:02:47 +03:00
krs	f80f594688	Fix Market of Time missing Template	2023-09-15 23:13:43 +03:00
krs	6c9b65c391	Fix adventure map widget json	2023-09-15 22:15:10 +03:00
krs	ffaf4c5b01	Fix broken skill schema	2023-09-15 22:03:23 +03:00
Laserlicht	621d463694	color are now html color names	2023-09-15 15:27:26 +02:00
Laserlicht	f5505c9f6d	support for predefined colors	2023-09-15 15:27:26 +02:00
Ivan Savenko	f8541d0ae4	Merge branch 'vcmi/master' into 'vcmi/develop'	2023-09-15 13:59:02 +03:00
Ivan Savenko	feb272e102	Updated map object and bonuses documentations	2023-09-13 21:55:36 +03:00
Ivan Savenko	c6588e0bd1	Updated schemas & docs for several game entities	2023-09-13 21:55:36 +03:00
Ivan Savenko	a09147a433	Do not block map layer toggles in world view mode	2023-09-12 21:15:14 +03:00
Nordsoft91	d011e1ff0d	Update mod.json schema	2023-09-09 15:24:52 +02:00
nordsoft	2b3f211659	Enable quick combat by default	2023-09-09 14:42:13 +02:00
Ivan Savenko	e8453916cf	Merge remote-tracking branch 'vcmi/beta' into develop	2023-09-08 18:49:06 +03:00
Ivan Savenko	fccd564d8d	Merge pull request #2769 from IvanSavenko/touch_tolerance ... (1.3.2) Implemented tolerance for touch events	2023-09-08 16:45:04 +03:00
Ivan Savenko	8112b8082e	Add new option to settings	2023-09-08 13:23:18 +03:00
nordsoft	8c94d082c8	Merge remote-tracking branch 'upstream/develop' into launcher-size-support	2023-09-08 01:51:52 +02:00
nordsoft	40ea45498f	Rename	2023-09-07 19:57:57 +02:00
Andrii Danylchenko	55af9ed5a0	Fix market of time, crashes game	2023-09-05 23:31:32 +03:00
nordsoft	1ef407ea9f	Fixes	2023-09-02 14:10:50 +04:00
Ivan Savenko	cab2bddf7e	Merge pull request #2712 from Laserlicht/dim_map ... Dim adventuremap	2023-09-01 22:37:10 +03:00
Nordsoft91	c45ab07d0b	Merge pull request #2698 from Nordsoft91/turn-timer ... Turn timer fixes	2023-09-01 00:31:52 +04:00