365 Commits

Author	SHA1	Message	Date
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
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
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
krs	ffaf4c5b01	Fix broken skill schema	2023-09-15 22:03:23 +03: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
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	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
nordsoft	1ef407ea9f	Fixes	2023-09-02 14:10:50 +04:00
Michael	e650f0100b	setting + all non popups	2023-08-30 21:41:28 +02:00
Ivan Savenko	695a51d8c8	Merge remote-tracking branch 'vcmi/beta' into develop	2023-08-28 21:19:53 +03:00
Ivan Savenko	5be87b30c1	Merge pull request #2625 from dydzio0614/artifacts-backpack-gui ... Artifacts backpack GUI	2023-08-28 19:59:11 +03:00
nordsoft	6380a02e10	Upgrade launcher default repo	2023-08-28 17:10:52 +04:00
Michael	bbd69fd430	added setting	2023-08-27 00:33:52 +02:00
Michael	65884b15d0	Update settings.json ... best setting as default (subfolder with map-name)	2023-08-22 20:51:28 +02:00
Dydzio	cab6fb76aa	Draft version of backpack button + new setting for original H3 UI mode	2023-08-20 17:45:43 +02:00
Michael	e3a4c65100	code review	2023-08-20 14:14:47 +02:00
Dydzio	6bfbe80cc9	Allow toggling quick combat spells usage	2023-08-19 17:23:55 +02:00
Ivan Savenko	59c599cbf9	Reverted FPS limit change on mobile systems	2023-08-05 13:35:58 +03:00
Ivan Savenko	6c52293dd9	Merge pull request #2425 from IvanSavenko/fix_combat_replay ... Attempt to fix combat replay queries	2023-07-29 00:03:44 +03:00
heroesiiifan	648f7344c7	Update mod.json	2023-07-28 00:34:28 +00:00
heroesiiifan	ddfeeb152d	Update settings.json	2023-07-28 00:33:42 +00:00
Ivan Savenko	aed8c411fc	Minor rework & cleanup of combat replays	2023-07-27 19:25:55 +03:00
krs	4ce774a380	Wrong placement of onlyOnWaterMap in spells schema.	2023-07-22 13:42:57 +03:00
Ivan Savenko	8456f92bf7	Merge pull request #2292 from IvanSavenko/radial_wheel_garrison ... Radial wheel for army management	2023-07-21 20:54:49 +03:00
DjWarmonger	377bec277d	Merge pull request #2350 from vcmi/ban_stuff_on_water_maps ... Ban objects on maps without water	2023-07-21 15:48:13 +02:00
Ivan Savenko	6cd219738b	Added option to disable radial wheel in config (no UI)	2023-07-21 15:47:42 +03:00
Ivan Savenko	ddda46a7fd	Merge pull request #2358 from dydzio0614/persistent-hero-info-window ... Add option for persistent hero info window as in HD mod	2023-07-19 14:46:16 +03:00
Ivan Savenko	07a8c75bec	Merge pull request #2305 from dydzio0614/unlimited-autosave ... Ability to change autosave limit + set autosave prefix	2023-07-19 14:45:51 +03:00
Tomasz Zieliński	ad5081f9fe	Merge remote-tracking branch 'origin/develop' into ban_stuff_on_water_maps	2023-07-19 12:05:30 +02:00
Tomasz Zieliński	147f0bce8a	Fix description	2023-07-19 08:27:43 +02:00
Tomasz Zieliński	f3d2a50d2e	Update schemas with new properties	2023-07-18 19:24:45 +02:00
Ivan Savenko	317183e00d	Merge branch 'develop' into info-box-army-management	2023-07-18 16:05:09 +03:00
Ivan Savenko	e0977693b0	Merge pull request #2336 from IvanSavenko/left_button_map_drag ... Left button map drag	2023-07-18 16:03:05 +03:00
Dydzio	48a72f90f7	Add option for persistent hero info window as in HD mod	2023-07-17 23:25:16 +02:00
Dydzio	5882cbae78	Merge branch 'develop' into unlimited-autosave	2023-07-16 15:19:04 +02:00
Dydzio	fe26ab4501	Add settings entry, immediately refresh info bar on setting toggle	2023-07-16 14:52:43 +02:00
heroesiiifan	b09e50f29a	adding missing lang to mod.json	2023-07-16 09:13:32 +00:00
heroesiiifan	4b4b73d374	added missing lang in settings.json	2023-07-16 09:10:32 +00:00
Ivan Savenko	61750d30c2	Implemented dragging map via left mouse click (off by default)	2023-07-16 12:00:40 +03:00
Ivan Savenko	57e7db7fdf	Add missing language entry	2023-07-15 16:09:44 +03:00
Dydzio	ad66acdd79	End turn autosave support + making it default	2023-07-13 22:07:42 +02:00
Dydzio	bcb061b58f	Merge branch 'develop' into unlimited-autosave	2023-07-13 20:53:10 +02:00
Ivan Savenko	b30db5fc1f	Merge pull request #2301 from Laserlicht/haptic_feedback ... Haptic feedback	2023-07-13 12:56:54 +03:00
Ivan Savenko	78415c573b	Merge pull request #2289 from IvanSavenko/resolution_fixes ... Fix issues with changing game resolution	2023-07-11 14:35:07 +03:00
Dydzio	fbf0bf78d6	Configurable autosave limit and prefix - ingame handling	2023-07-08 23:04:01 +02:00
Michael	ff51b8f46b	Setting for haptic feedback	2023-07-08 18:47:38 +02:00
heroesiiifan	108e768ae2	fix language syntax error	2023-07-07 22:59:40 +00:00
Ivan Savenko	0c83e34093	Implemented reserved area for iOS notch / cutout	2023-07-07 14:29:03 +03:00
Ivan Savenko	fa4a0004b2	Merge pull request #2291 from IvanSavenko/terrain_animations_config ... Moved hardcoded terrain palette-cycling animations to config	2023-07-07 14:28:39 +03:00
DjWarmonger	f9e1a70ab8	Merge pull request #2278 from vcmi/rmg_factions ... Rmg factions	2023-07-06 22:15:36 +02:00
Tomasz Zieliński	fcf7a29f45	Update schemat for RMG template	2023-07-06 17:39:09 +02:00
Ivan Savenko	3bce245780	Moved hardcoded terrain palette-cycling animations to config	2023-07-05 22:07:20 +03:00
Ivan Savenko	02f23086b6	Updated according to review	2023-07-03 14:34:53 +03:00
Ivan Savenko	8ac56f06b0	Added Hungarian	2023-07-03 14:34:53 +03:00
Ivan Savenko	4b366e1fe8	Added new languages: Czech, Italian, Korean	2023-07-03 14:34:53 +03:00
Ivan Savenko	21c45bd84f	Added new settings to Launcher: ... - UI Scaling selection - Allied AI selection - Separate main/secondary mod repo	2023-07-03 14:34:53 +03:00
Ivan Savenko	e0ea994656	Moved some pathfinding options to game settings	2023-06-25 17:42:36 +03:00
krs	afe0146021	Renamed settings option to reflect that same option is used for both ranges.	2023-06-23 19:50:39 +03:00
Ivan Savenko	56680e102d	Merge pull request #2245 from IvanSavenko/platform_settings ... Allow defining default values of settings per platform	2023-06-23 13:32:30 +03:00
Ivan Savenko	69dc95c3c8	Merge pull request #2235 from IvanSavenko/hota_h3m_support ... Hota h3m support	2023-06-23 13:32:10 +03:00
Mike	fe535ec470	Updated settings.json ... Corrected comma related formatting errors	2023-06-21 16:05:29 -07:00
Ivan Savenko	8f602b2ef6	Allow defining default values of settings per platform	2023-06-21 10:55:30 +03:00
Ivan Savenko	ffdac314e9	Added selection of long touch duration	2023-06-20 19:58:05 +03:00
Ivan Savenko	d1917898a9	Update validation schemas	2023-06-20 19:37:27 +03:00
Ivan Savenko	77b58bc66d	Cleaned up object constructors to reduce duplicated code	2023-06-16 17:59:50 +03:00
Ivan Savenko	8614419954	Merge pull request #2208 from IvanSavenko/obstacles_foreground ... Implemented foreground/background obstacles	2023-06-14 15:49:08 +03:00
krs	9496cb4058	rangedFullDamageLimitHighlightOnHover is now turned off by default	2023-06-11 19:36:46 +03:00
krs	c0591573bf	Working Version	2023-06-11 18:40:47 +03:00
Ivan Savenko	428fb832c6	Implemented foreground/background obstacles: ... - obstacles now have "foreground" field - if "foreground" field set, obstacle will appear on top of other objects, such as units - if "foreground" is not set, obstacle will appear below units - updated schema and cleared up obstacles config	2023-06-06 15:53:14 +03:00
Ivan Savenko	238a02eb5e	It is now possible to cancel attack-via-swiping by moving finger away	2023-06-05 19:20:20 +03:00
Ivan Savenko	6283329aeb	Added option to disable edge scrolling	2023-06-05 19:20:20 +03:00
Ivan Savenko	a08ff1e6ef	Removed no longer used touchscreen option	2023-06-05 19:20:08 +03:00
Ivan Savenko	b20109c830	Test version of swipe gesture for in-combat attacks	2023-06-05 19:20:08 +03:00
Ivan Savenko	2c7b94d17f	Remove unused map swipe option	2023-06-05 19:20:08 +03:00
krs	289a6da3d7	Merge fix for battlefield	2023-05-19 21:23:08 +03:00
krs	105dcf5a9f	Fixed white spaces	2023-05-19 21:14:01 +03:00
krs	2e6cae80a9	Schemas rearranged ... Artifact Schema rearranged Battlefield schema rearanged Bonus schema rearranged Faction Schema rearanged Hero Schema rearranged HeroClass schema rearranged MapHeader schema updated, something fishy in events Mod schema updated. Settings not complete Object schema rearranged Object schema rearranged object type schema rearranged obstacles schema rearranged Rivers schema updated roads schema updated script schema updated skill schema updated spell schema updated template schema update terrain schemas updated town buildings schema update town siege schema updated town structure schema updated	2023-05-19 21:04:47 +03:00
Ivan Savenko	805721f8d7	Add missing check for file presence	2023-05-16 21:58:09 +03:00
Ivan Savenko	5e3a0a1a75	Fixed json validation	2023-05-15 22:22:54 +03:00
Ivan Savenko	a4b102e46f	Implemented UI scaling (non-selectable option for now)	2023-05-09 13:10:33 +03:00
Ivan Savenko	4c93b8f3f2	Use separate json for vcmi-1.3	2023-05-04 19:38:36 +03:00
Konstantin	05eccbc2bb	vcmi: split bonus to enumerator and HeroBonus.h	2023-05-03 18:01:06 +03:00
nordsoft	bfc75ccd39	Merge remote-tracking branch 'upstream/develop' into battle-dialog	2023-04-11 02:22:42 +04:00
krs	709a8a6eb3	movementHighlightOnHover is now saved with settings	2023-04-08 20:42:16 +03:00