1
0
mirror of https://github.com/vcmi/vcmi.git synced 2024-12-22 22:13:35 +02:00
Commit Graph

140 Commits

Author SHA1 Message Date
Dydzio
48a72f90f7 Add option for persistent hero info window as in HD mod 2023-07-17 23:25:16 +02:00
Dydzio
fe26ab4501 Add settings entry, immediately refresh info bar on setting toggle 2023-07-16 14:52:43 +02: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
f61cc4c8f6 Change battle speed settings from 400/800 to 300/600 2023-07-15 16:09:44 +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
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
Mike
75820c3bdf Fixed overlapped text display in adventure map settings 2023-06-25 16:27:00 -07: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
ffdac314e9 Added selection of long touch duration 2023-06-20 19:58:05 +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
Ivan Savenko
18105aa96d Minor fixes for settings window 2023-06-05 21:19:10 +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
70155b48e1 Only show touchscreen options on systems that have one 2023-06-05 19:20:08 +03: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
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
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
Ivan Savenko
7228b08d1d Implemeted runtime generation of player-colored background texture 2023-05-09 13:10:33 +03:00
Ivan Savenko
342ea138f9 Fix remaining graphical artifacts on switching from world view 2023-05-09 13:10:33 +03:00
Ivan Savenko
8e320d8454 Fixed world view mode 2023-05-09 13:10:33 +03:00
Ivan Savenko
5ae507505a Fixed toggleable buttons (sleep/wake & subterra/surface) 2023-05-09 13:10:33 +03:00
Ivan Savenko
a0f1bf3928 Implemented user-selectable UI scaling mode 2023-05-09 13:10:33 +03:00
Ivan Savenko
97426a3f7c Implemented disabling of buttons based on condition 2023-05-09 13:10:33 +03:00
Ivan Savenko
d4098059b8 Proper support for player-colored buttons in UI 2023-05-09 13:10:33 +03:00
Ivan Savenko
019d7b6811 Integrated shortcuts into adventure window configuration 2023-05-09 13:10:33 +03:00
Ivan Savenko
63a1efbdc2 Fixed system options window 2023-05-09 13:10:33 +03:00
Ivan Savenko
d96edd9f56 Added larger town list for higher resolutions 2023-05-09 13:10:33 +03:00
Ivan Savenko
4958190e82 Fixed visibility of corner gems 2023-05-09 13:10:33 +03:00
Ivan Savenko
a015bf6507 Initial part of dynamically-sized adventure map:
- removed no longer used CConfigHandler
- remove no longer use resolutions.json
- moved widget management from adventure map to a separate class
- adventure map layout is now loaded from config
2023-05-09 13:10:33 +03:00
Ivan Savenko
6c637dd8e6 Integrated hotkeys with InterfaceObjectConfigurable 2023-05-01 17:59:21 +03:00
Ivan Savenko
832e56e005 Implementation of (very basic) shortcuts system
- Added EShortcut enumeration that contains all in-game shortcuts
- CIntObject::keyPressed now receive values from hotkey enumeration
- On keypress, SDL key code will be translated to shortcut ID
- Removed access to SDL key codes from most of engine
2023-05-01 17:58:17 +03:00
Ivan Savenko
dfa2e2a349 Merge beta into develop 2023-04-11 19:37:35 +03:00
krs
1644cab938 Added combat option Highlight Movement on Hover 2023-04-08 20:40:30 +03:00
Ivan Savenko
454168897e Fix handling of invalid hotkeys in configurable UI 2023-04-08 19:53:13 +03:00
nordsoft
52b53ab307 Feature and setting implemented 2023-04-08 01:49:59 +04:00
Ivan Savenko
507d8bf7fd Allow defining active areas for sliders. Fixes settings window. 2023-04-02 22:24:07 +03:00
Konstantin
a0c644a0e5 vcmi: actually implement AUTO for CInfoWindow
This is possible to use infobar interactions now.
2023-03-11 21:41:57 +03:00
Ivan Savenko
b7025125d5 Added map swipe option 2023-03-05 23:53:06 +02:00
Ivan Savenko
37b2fb7ff3 Fixed map options to support adventure map rewrite 2023-03-05 20:14:23 +02:00
Ivan Savenko
95440ad540 Minor fixes 2023-03-05 19:55:38 +02:00
Ivan Savenko
d34268d7d5 Split "Show available creatures in town" into two buttons 2023-03-05 19:55:38 +02:00
Ivan Savenko
17dfd3d34a Updated English translation 2023-03-05 19:55:38 +02:00
Ivan Savenko
b2e5e55c1e Added labels that indicate current option values 2023-03-05 19:55:37 +02:00
Ivan Savenko
2f556ccf60 Improved General options tab layout presentation 2023-03-05 19:53:27 +02:00
Ivan Savenko
33603f87f3 Finalized general layout 2023-03-05 19:53:27 +02:00
Ivan Savenko
b298895e61 Added placeholders for missing options 2023-03-05 19:53:27 +02:00
Ivan Savenko
919af720a8 Formatting cleanup 2023-03-05 19:53:27 +02:00
Ivan Savenko
c976176453 Added additional buttons for movement speeds 2023-03-05 19:53:26 +02:00
Ivan Savenko
c011a5a9cf Added lines to window to separate UI elements into groups 2023-03-05 19:51:42 +02:00
Ivan Savenko
273a06a878 Added frame for movement speed & map scrolling 2023-03-05 19:51:42 +02:00
Ivan Savenko
f23186f47d Slightly better layout for new settings window 2023-03-05 19:51:42 +02:00
Ivan Savenko
ebe996fa74 Hero movement speed and map scrolling speed now matches H3 2023-03-05 17:48:02 +02:00
Dydzio
9eccc29e16 Adjust tab positioning 2023-02-19 12:18:54 +01:00
Dydzio
7e409df3cb Apply manual changes from code review 2023-02-18 16:35:07 +01:00
Dydzio
c2ef3331ef Change main settings tabs to toggle group + fix json commas 2023-02-16 21:37:37 +01:00
Dydzio
9cabdfa675 Better position for main settings buttons 2023-02-15 20:34:08 +01:00
Dydzio
775db89241 Fix battle settings UI labels, add "dont show battle intro" setting 2023-02-15 20:29:29 +01:00
Dydzio
1d153f4ee9 "ForceMovementInfo" support + make other settings tab 2023-02-14 23:45:45 +01:00
Dydzio
daa2b63dde Further UI improvements 2023-02-14 22:22:11 +01:00
Dydzio
fb06aca0bb Further progress - UI tweaks, new settings etc 2023-02-14 20:30:06 +01:00
Dydzio
80a5595d6c Adding some settings options, minor UI fixes 2023-02-13 23:53:28 +01:00
Dydzio
b28a16ddd4 Settings UI tweaks 2023-02-12 21:35:30 +01:00
Dydzio
de5138c854 Basic separation of adventure map & general tabs 2023-02-12 19:25:59 +01:00
Dydzio
58bed920b4 Sort out settings files structure 2023-02-12 17:49:41 +01:00
Dydzio
ee186f3839 Conversion of battle settings to configurable interface 2023-02-12 13:51:57 +01:00
Dydzio
11df79dc2a Minor formatting 2023-02-12 11:55:39 +01:00
Dydzio
8f0da8fe17 Move battle options labels to configurable interface 2023-02-12 11:37:40 +01:00
Dydzio
5a08ec04fe Initial split of BattleOptionsWindow 2023-02-02 17:17:16 +01:00
Dydzio
88744633de Move buttons from mainOptions to SystemOptionsWindow 2023-01-30 23:26:33 +01:00
Dydzio
cc9d65a341 Make battle settings callable without battle, save last settings tab 2023-01-30 22:15:37 +01:00
Dydzio
9dd692cea4 Initial draft of tabbed settings window 2023-01-30 20:18:59 +01:00
Dydzio
0fdfd8bdcb Configurable interface for game settings, change sound/music sliders 2023-01-29 16:49:47 +01:00
Ivan Savenko
76540bd960 Fix tactics buttons positioning 2023-01-11 15:10:30 +02:00
Ivan Savenko
4b3782b5cf Post-merge fix 2023-01-09 23:22:59 +02:00
Ivan Savenko
1fece0ce18
Merge pull request #1229 from IvanSavenko/battle_improvements
Battle: Fixing bugs & Implementation of missing features
2023-01-09 22:07:13 +02:00
Ivan Savenko
bde988ca43
Merge pull request #1329 from IvanSavenko/translate_game
Translations support - base functionality for main game texts
2023-01-09 20:33:56 +02:00
Ivan Savenko
f155a35378 Fix positioning of UI elements in BattleWindow 2023-01-09 17:25:49 +02:00
Ivan Savenko
ffb37f067a Support for player-colored images in configurable UI 2023-01-04 16:40:15 +02:00
Ivan Savenko
d3ecd43aba Merge remote-tracking branch 'vcmi/develop' into battle_improvements 2023-01-04 16:20:53 +02:00
nordsoft
660d25a335 Make control panel configurable 2023-01-03 13:02:54 +04:00
Ivan Savenko
01d0cd4f7a Changed configurable UI to match text refactoring:
- help.txt strings are now loaded as (hover, help) pairs
- renamed string pairs from translate.json to use (hover, help) form
- interface builder will always load label texts via unified ID
- interface builder way of loading buttons text has been changed:
- - field has been renamed "zelp" -> "help" for consistency
- - "help" field now only accepts string or object json type
2023-01-01 14:56:45 +02:00
nordsoft
8f089b3302 Rename folder 2022-12-16 02:19:23 +04:00