1527 Commits

Author	SHA1	Message	Date
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
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	432ed18579	Fix overlap of timer and fps widgets	2023-08-28 19:46:09 +04:00
nordsoft	44791b6665	Revert "Auxiliary commit to revert individual files from c7390a921e3871102292f589978e9e9010eface9" ... This reverts commit e749954761facf4a760c6b4ef361f2ebce7b1f01.	2023-08-28 17:21:38 +04:00
nordsoft	6380a02e10	Upgrade launcher default repo	2023-08-28 17:10:52 +04:00
nordsoft	1e527a6942	Minor changes	2023-08-28 17:10:52 +04:00
nordsoft	d758727c23	Basic timer ui is almost complete	2023-08-28 17:10:52 +04:00
Nordsoft91	ffc4b989f0	Merge pull request #2679 from Laserlicht/smooth_scroll ... Smooth scroll	2023-08-28 17:08:57 +04:00
Andrii Danylchenko	2fef0e8d40	Fix market of time, crashes game	2023-08-27 21:01:32 +03:00
Michael	bbd69fd430	added setting	2023-08-27 00:33:52 +02:00
Ivan Savenko	b0eec85aca	Merge pull request #2632 from rilian-la-te/resist-rework-pt1 ... Spell resistance rework: part 1	2023-08-25 01:13:57 +03:00
Nordsoft91	979cf129bc	Merge pull request #2637 from Laserlicht/autosave	2023-08-25 00:09:49 +04:00
Michael	b22a9ff2d0	Merge branch 'develop' into autosave	2023-08-23 21:39:04 +02:00
nordsoft	b8ab64f448	Make options tab configurable	2023-08-23 19:29:50 +04:00
Konstantin	d20711bcd6	immunities: polishing	2023-08-23 17:53:09 +03:00
Nordsoft91	1bad0e96ef	Merge pull request #2635 from Nordsoft91/loading-bar ... Loading progress bar	2023-08-23 17:28:19 +04:00
Michael	fed9ae5157	Merge branch 'develop' into autosave	2023-08-23 00:37:15 +02:00
Michael	65884b15d0	Update settings.json ... best setting as default (subfolder with map-name)	2023-08-22 20:51:28 +02:00
nordsoft	d50edc28ab	Merge remote-tracking branch 'upstream/develop' into turn-timer ... # Conflicts: # server/CGameHandler.cpp # server/CGameHandler.h	2023-08-22 00:54:38 +04:00
nordsoft	dbc3a93013	Merge remote-tracking branch 'upstream/develop' into loading-bar ... # Conflicts: # server/CGameHandler.h	2023-08-22 00:46:54 +04:00
nordsoft	45f13c7964	Progress update on client side	2023-08-21 19:21:27 +04:00
Nordsoft91	4edee00a97	Merge pull request #2605 from Laserlicht/map_preview ... Map preview	2023-08-21 14:56:21 +04: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
nordsoft	314a17cdd9	Paint timer color into player color	2023-08-19 19:45:25 +04:00
Dydzio	6bfbe80cc9	Allow toggling quick combat spells usage	2023-08-19 17:23:55 +02:00
nordsoft	647c7c15a3	Add sound notification for timer	2023-08-17 01:10:03 +04:00
krs	5207ba7e00	Removed WoG artifacts from core. Replaced with unused to avoid crashes.	2023-08-14 15:06:48 +03:00
nordsoft	f01973a4f0	Configurable turn timer	2023-08-14 01:13:37 +04:00
Ivan Savenko	59c599cbf9	Reverted FPS limit change on mobile systems	2023-08-05 13:35:58 +03:00
Ivan Savenko	ac4282bf31	Merge pull request #2456 from IvanSavenko/outdated_extras_workaround ... Added workaround for running game with outdated extras mod from 1.2	2023-08-02 21:27:10 +03:00
Ivan Savenko	791eb1a37b	Added workaround for running game with outdated extras mod from 1.2	2023-08-01 14:47:17 +03:00
Andrii Danylchenko	f1a9ae99ee	NKAI: various behavior fixes, undo max_gold_preasure	2023-07-31 22:01:12 +03:00
Andrii Danylchenko	6490c65490	nkai: fix freezes	2023-07-31 22:01:12 +03:00
Andrii Danylchenko	c93bb0a502	nkai: fixes and skill rewards	2023-07-31 22:01:11 +03:00
Andrii Danylchenko	69ceee5dd6	NKAI: penalty for extra chains	2023-07-31 22:01:11 +03:00
Andrii Danylchenko	0fd118d3ce	NKAI: gold reward	2023-07-31 22:01:11 +03:00
Andrii Danylchenko	b19ac01bf9	Fuzzy rework, added more defence and gather army routines	2023-07-31 22:01:10 +03:00
Andrii Danylchenko	b1ca663eb6	Fuzzy rework	2023-07-31 22:01:10 +03:00
Ivan Savenko	d9e7a8f88a	Merge pull request #2446 from IvanSavenko/bugfixing ... (1.3.0) Bugfixing	2023-07-31 16:21:43 +03:00
Ivan Savenko	986c8799a8	Move checkboxes 2 slots above to avoid overflowing below window border	2023-07-31 13:31:44 +03:00
Ivan Savenko	5776e171c4	Fix list of possible resources given by some objects, e.g. windmills	2023-07-30 12:31:35 +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
Dydzio	e4303c63ce	Add json entries for missing bonuses	2023-07-25 17:13:02 +02: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	cefbe5152e	Merge pull request #2359 from IvanSavenko/crashfixing ... Fix crashes from 1.2.1 statistics on Google Play	2023-07-21 15:44:37 +03:00
Ivan Savenko	3c6839722a	Merge pull request #2362 from IvanSavenko/banks_guard_preview ... Implemented support for showing amount of guards in banks	2023-07-21 15:44:11 +03:00
Ivan Savenko	f320d88ce7	Merge pull request #2361 from dydzio0614/missing-setting-label ... Add missing label for new setting	2023-07-19 14:46:29 +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
Ivan Savenko	7f1b982264	Implemented support for showing amount of guards in banks	2023-07-19 13:17:50 +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
Dydzio	d18e5b3351	Add missing label for new setting	2023-07-18 22:35:45 +02:00
Tomasz Zieliński	f3d2a50d2e	Update schemas with new properties	2023-07-18 19:24:45 +02:00
Ivan Savenko	f520043c46	Fix typo	2023-07-18 17:31:21 +03: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
Tomasz Zieliński	03b3771f19	Ban Navigation on maps without water	2023-07-18 10:54:36 +02:00
Dydzio	48a72f90f7	Add option for persistent hero info window as in HD mod	2023-07-17 23:25:16 +02:00
Tomasz Zieliński	025b0814c8	+ Handled banning spells and artifacts ... + Rename allowedSpell => allowedSpells	2023-07-17 17:21:28 +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
Dydzio	ea0ee87299	Interactable hero status - alternative infobox component	2023-07-15 23:14:59 +02:00
Ivan Savenko	d931ff75fc	Fixed positioning of units in tight formation to match H3	2023-07-15 16:09:44 +03:00
Ivan Savenko	8a92941681	Allow merging stack on recruitment to give place for recruited unit	2023-07-15 16:09:44 +03:00
Ivan Savenko	57e7db7fdf	Add missing language entry	2023-07-15 16:09:44 +03:00
Ivan Savenko	f61cc4c8f6	Change battle speed settings from 400/800 to 300/600	2023-07-15 16:09:44 +03:00
Ivan Savenko	cc6e8e8c7e	Fix corrupted artifact lock slot in Polish version of H3	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
Michael	11bcedc2bf	Update config/widgets/settings/generalOptionsTab.json ... Co-authored-by: Ivan Savenko <saven.ivan@gmail.com>	2023-07-12 22:56:23 +02: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	70b7f992de	fix	2023-07-08 20:34:11 +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