1
0
mirror of https://github.com/vcmi/vcmi.git synced 2024-12-16 10:19:47 +02:00
Commit Graph

584 Commits

Author SHA1 Message Date
Ivan Savenko
0d6ec0d224 Reviewed usage of EBlitMode, now specified clearly in all cases 2024-07-19 10:08:50 +00:00
Ivan Savenko
230add02e4 Remove no longer used code 2024-07-19 10:08:50 +00:00
Ivan Savenko
920a39844b Unified naming of method to recolor UI element to current player scheme 2024-07-19 10:08:50 +00:00
Ivan Savenko
fcafe53da9 Restored previously disabled University code, add interface to notify
market-like objects
2024-07-19 10:08:50 +00:00
Laserlicht
e629b7a371 reduce to 12 with gap 2024-07-17 19:26:18 +02:00
Laserlicht
b8d872aa60 mobile adjustments 2024-07-17 04:24:27 +02:00
Laserlicht
b568e2f628
Merge branch 'vcmi:develop' into quickspell 2024-07-17 03:20:31 +02:00
Laserlicht
1daf6dfad1 make hideable 2024-07-16 23:36:23 +02:00
Laserlicht
37b5de689a move to left side 2024-07-16 22:47:40 +02:00
Alexander Wilms
02e429e973 Fix typos using https://github.com/crate-ci/typos
Changes were reviewed manually
2024-06-24 03:47:19 +02:00
Laserlicht
53a1bf2051 add spell cast 2024-06-21 21:29:19 +02:00
Ivan Savenko
5b0b1ad7f7 Update texture while UI is locked to avoid concurrent accesses to pixel
data if netpack applier causes redraw
2024-06-12 18:12:03 +00:00
Ivan Savenko
9e5f9a88c3 Fix renamed end turn shortcut 2024-05-23 18:49:06 +00:00
Ivan Savenko
d1aa4ecd10
Merge pull request #4013 from IvanSavenko/shortcuts_additions
[1.5.2] Shortcuts additions
2024-05-21 14:18:55 +03:00
Ivan Savenko
ffe14fc1fc
Merge pull request #4022 from vcmi/master
Merge master -> beta
2024-05-20 18:09:51 +03:00
Ivan Savenko
5feef488e3 Added Ctrl & Shift versions for swap artifacts shortcut. Exchange window
shortcuts now work even without vcmi extras
2024-05-19 12:28:03 +00:00
Ivan Savenko
0d6d6fca03 Add detection of missing shortcuts 2024-05-19 09:59:12 +00:00
Ivan Savenko
11c00711f9 Add string ID's for all new shortcuts 2024-05-19 09:12:36 +00:00
Ivan Savenko
6ba36cf6c0 Add separate shortcuts for adventure map and settings window 2024-05-19 09:12:36 +00:00
Ivan Savenko
dd337dba7b Fixed Puzzle Map hotkey not working due to having inactive button in
world view mode
2024-05-19 09:12:36 +00:00
Ivan Savenko
0db8266495 Implemented some of the requested shortcuts 2024-05-19 09:12:36 +00:00
Ivan Savenko
88fbb7ee71 Most of buttons created in cpp now have assigned shortcut 2024-05-19 09:12:36 +00:00
Ivan Savenko
947d07faa4 Add separate shortcuts for saving and loading of artifact costumes 2024-05-18 16:27:42 +00:00
Ivan Savenko
d502850054 Add network thread termination logic for adventure map animations 2024-05-18 12:15:48 +00:00
Ivan Savenko
9bfe000724 Added semi-workaround method for network thread shutdown:
Currently closing game while network thread is waiting for something is
very bug-prone, since network thread may resume during shutdown and
access partially destroyed client state.

Now if exit has been requested, the very first step would be semi-
graceful shutdown of network thread (via exception throwing). This may
in theory skip some cleanup in non-RAII code, but since game is shutting
down this does not matters much.

This logic applies to:
- shutting down while network thread is waiting for dialogs
- shuttind down while network thread waiting for animations in combat
2024-05-18 11:04:10 +00:00
Ivan Savenko
93c3cf372b Reworked TextInput to allow text overflow support 2024-05-15 12:45:45 +00:00
Ivan Savenko
1abe9007bc Moved CTextInput to a separate file. No changes in logic 2024-05-15 12:45:45 +00:00
Ivan Savenko
7267e02b8d Better handling of Ctrl / Cmd modifier keys on Apple systems:
- Test only for Cmd modifier key when processing mouse clicks
- Test both Ctrl and Cmd modifier key when processing keyboard input
- This logic is now used for all Apple systems - macOS and iOS
2024-05-12 17:09:31 +00:00
Ivan Savenko
45e35f357d
Merge pull request #3866 from IvanSavenko/input_config
More configurable input settings
2024-05-01 09:49:02 +03:00
Ivan Savenko
89d6ddd916 Allow input configuration via config file 2024-04-30 20:56:47 +03:00
Ivan Savenko
dd9e002031 Add hotkey to track human player hero in MP. Fixed broken 'toggle grid'
hotkey
2024-04-30 19:10:10 +03:00
Ivan Savenko
742149062a Apply SonarCloud suggestions 2024-04-30 16:40:23 +03:00
Ivan Savenko
1dc27046ef Unified game controller input with keyboard/mouse 2024-04-30 15:21:07 +03:00
Ivan Savenko
9a71614588 Simplify code 2024-04-30 12:01:03 +03:00
Ivan Savenko
0d8d75afd4 Spaces -> tabs 2024-04-30 11:38:13 +03:00
Ivan Savenko
9187beb7ee
Merge branch 'joystick_support' into joystick_support 2024-04-30 11:27:55 +03:00
kdmcser
92b1c8deb5 Merge branch 'develop' into joystick_support 2024-04-29 00:49:04 +08:00
SoundSSGood
ce68b3f45d class CArtifactsOfHeroMain : public CKeyShortcut 2024-04-27 21:35:38 +03:00
SoundSSGood
ce9d2d8ab8 Switching costume 2024-04-27 21:35:37 +03:00
SoundSSGood
25dea7e364 Saving costume 2024-04-27 21:35:37 +03:00
kdmcser
1eea8398b4 make joystick configurable 2024-04-27 22:42:54 +08:00
kdmcser
60c4ddb515 change hardware cursor to software cursor when joystick available 2024-04-21 22:51:47 +08:00
M
6fed084055 Do not use enter for non-campaign game start, do not use "B" for non-campaign game start 2024-04-20 15:43:39 +02:00
kdmcser
876bae0b73 delete useless include and open joystick in InputSourceGameController constructor. 2024-04-15 23:07:44 +08:00
kdmcser
cee8d34fc5 Merge branch 'develop' into joystick_support 2024-04-15 22:37:15 +08:00
Ivan Savenko
d4594baa05
Merge pull request #3749 from IvanSavenko/configurable_shortcuts
Configurable keyboard shortcuts
2024-04-13 12:47:30 +03:00
kdmcser
beaebb3a5f a simple implement for game controller 2024-04-13 13:12:25 +08:00
Ivan Savenko
611249d11d Added workaround for weird SDL behavior that causes SDL to report text
input as active when app starts until first actual text input
2024-04-11 22:00:20 +03:00
Ivan Savenko
16c56cf6c5 Keyboard shortcuts are now loaded from config file 2024-04-11 21:21:46 +03:00
Ivan Savenko
cbd5f57069 Added workaround for potential access to CIntObject after destruction 2024-04-11 13:25:54 +03:00