1457 Commits

Author	SHA1	Message	Date
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
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
Mike	75820c3bdf	Fixed overlapped text display in adventure map settings	2023-06-25 16:27:00 -07:00
Ivan Savenko	e0ea994656	Moved some pathfinding options to game settings	2023-06-25 17:42:36 +03:00
Ivan Savenko	f7b27da00e	Implemented support for "coast visitable" objects: ... - objects marked as coast visitable can be visited from land even when placed in water - added isBlockedVisitable and isCoastVisitable method to CGObjectInstance - implemented json config for these properties in banks	2023-06-25 17:42:33 +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	3913b8e98c	Heroes placed on water in map will be automatically given boat	2023-06-20 19:37:27 +03:00
Ivan Savenko	d4728f78ce	Support for hota victory conditions	2023-06-20 19:37:27 +03:00
Ivan Savenko	c43783db58	Use string ID's instead of raw strings for win/loss conditions	2023-06-20 19:37:27 +03:00
Ivan Savenko	5118a642bc	Fix duplicated randomResource object	2023-06-16 18:00:19 +03:00
Ivan Savenko	77b58bc66d	Cleaned up object constructors to reduce duplicated code	2023-06-16 17:59:50 +03:00
Ivan Savenko	4d947be287	Adventure map shipyard nwo has configurable boat type	2023-06-16 17:59:50 +03:00
Ivan Savenko	487f441f47	Implemented boat selection for town shipyards	2023-06-16 17:59:49 +03:00
Ivan Savenko	a94b68e6aa	Hill fort upgrade costs are now loaded from json	2023-06-16 17:59:10 +03:00
Ivan Savenko	2e7c382612	Moved creature upgrade logic to CGObjectInstance inheritors	2023-06-16 17:59:10 +03:00
Ivan Savenko	fc190b14bb	Spell shrines can now be configured in json	2023-06-16 17:59:10 +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
DjWarmonger	3be7720868	Merge pull request #2218 from vcmi/pregenerate_treasures ... Okay, merging this for PvP feedback.	2023-06-13 20:46:34 +02:00
krs	9496cb4058	rangedFullDamageLimitHighlightOnHover is now turned off by default	2023-06-11 19:36:46 +03:00
krs	5158a5f7db	Fix After Merge	2023-06-11 19:31:50 +03:00
krs	d622bc613a	Fix after options merge.	2023-06-11 18:42:58 +03:00
krs	c0591573bf	Working Version	2023-06-11 18:40:47 +03:00
Tomasz Zieliński	f4dc8e6529	Limit morale / bonusing objects to one per zone	2023-06-10 14:58:50 +02:00
Tomasz Zieliński	6ed1dab3fb	Add random resource to RMG pool	2023-06-08 19:04:44 +02: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	18105aa96d	Minor fixes for settings window	2023-06-05 21:19:10 +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	70155b48e1	Only show touchscreen options on systems that have one	2023-06-05 19:20:08 +03:00
Ivan Savenko	2c7b94d17f	Remove unused map swipe option	2023-06-05 19:20:08 +03:00
Ivan Savenko	526ce1b546	Merge pull request #2177 from krs0/feature/Move_battle_fake_lables_into_separate_group ... Move battle fake labels into separate group, and small fixes	2023-06-05 18:56:38 +03:00
Ivan Savenko	3519fd8302	Added view patterns for hota terrains	2023-05-31 23:18:39 +03:00
Ivan Savenko	952708e865	Basic version of object templates mapping	2023-05-31 23:18:39 +03:00
Ivan Savenko	ffd7144df8	Implemented identifiers mapping for town buildings	2023-05-31 23:01:57 +03:00
Ivan Savenko	927fcc7d45	Removed hota objects desription, will be added to hota mod instead	2023-05-31 23:01:57 +03:00
Ivan Savenko	daaaf84392	Icon index for map format is now defined in config	2023-05-31 23:01:57 +03:00
Ivan Savenko	fb55719671	Map format support status can now be loaded from gameSettings	2023-05-31 23:01:57 +03:00
Ivan Savenko	eff6551f80	Merge pull request #2171 from krs0/feature/schema_updates ... Rearranging Schemas	2023-05-29 15:37:50 +03:00
DjWarmonger	c99aa74434	Merge pull request #2053 from vcmi/parellel_rmg ... Okay, let's merge this.	2023-05-29 13:50:02 +02:00
krs	6daa933aa2	Fixed errors and added a line after CreatureNumbersToggleGroup to separate them visually from next element.	2023-05-24 20:16:49 +03:00
krs	a7606010ee	Moved creatureInfo into a group for easier calculations	2023-05-24 20:16:49 +03:00
Tomasz Zieliński	0e37c7b7d0	By deafult use multithreaded RMG	2023-05-24 18:16:04 +02:00
Ivan Savenko	d18b240d6d	Added separate borderless & exclusive fullscreen options	2023-05-19 22:43:52 +03:00
Ivan Savenko	f2dfd6de42	Updated settings window to use new layouts & library	2023-05-19 22:43:52 +03:00
Ivan Savenko	7cbfd8117e	Implemented simple layout to simplify widget json definitions	2023-05-19 22:43:52 +03:00
Ivan Savenko	7cd898a87a	Implemented "customTypes" in UI json to reduce duplicated definitions	2023-05-19 22:43:52 +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	c45d4f8d22	Few more fixes to building ordering	2023-05-15 22:22:54 +03:00
Ivan Savenko	ca19fc7fcc	Backported minor z-ordering fixes from hota mod	2023-05-15 22:22:54 +03:00
Ivan Savenko	5e3a0a1a75	Fixed json validation	2023-05-15 22:22:54 +03:00
Ivan Savenko	b9f18288f9	Fix duplicated widget name in settings window	2023-05-12 22:58:36 +03:00
Ivan Savenko	edd5d11734	Fix issues discovered by self-review	2023-05-09 13:10:33 +03:00