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
Ivan Savenko
80acd7e77c
Simplified and fixed server restart procedure:
...
- Replaced several assertions with runtime_error's to detect them in
release builds
- Removed multiple dispatchMainThread calls in server shutdown code to
simplify debugging and code flow
- Moved handling of gameplay shutdown and score calculation from
PlayerInterface to ServerHandler (not perfect, but better than before)
2024-04-07 14:19:57 +03:00
Evgeny Malygin
25125f96da
Fix: licenses, pragma guards, StdInc
2024-03-29 07:48:52 +02:00
Ivan Savenko
8e9caf54f2
Added all missing text alignment values
2024-03-27 13:10:55 +02:00
Ivan Savenko
7c9aa9d953
Show all rooms (including private) in room list
2024-03-27 13:10:55 +02:00
Ivan Savenko
2d37180fe2
Chat textbox now correctly positioned and uses blue slider
2024-03-27 13:10:55 +02:00
Ivan Savenko
07d201502e
Refactoring of button class to prepare for configurable button
2024-02-29 13:57:25 +02:00
Ivan Savenko
ef8ff00973
Unified common primitive-based UI elements
2024-02-18 22:15:31 +02:00
Ivan Savenko
af671d109f
Made graphical primitive-based UI more configurable
2024-02-18 20:48:45 +02:00
Ivan Savenko
c3957c2c2a
Moved json files to new directory, split on per-class basis
2024-02-14 13:08:24 +02:00
Alexander Wilms
c65794b9e3
Fix typos
2024-02-13 15:23:30 +01:00
Ivan Savenko
6e399eb21a
Make some non-const static variables const or constexpr
2024-02-12 13:22:54 +02:00
Ivan Savenko
f2ecd4cf11
Merge branch 'develop' into 'lobby'
2024-02-11 16:13:13 +02:00
Alexander Wilms
0495c52cf4
Don't call ScreenHandler::onScreenResize() when the window has been (un)maximized to avoid creating a huge texture and crashing
2024-02-05 18:59:55 +01:00
Ivan Savenko
80fc2bb695
Merge remote-tracking branch 'vcmi/develop' into lobby
2024-02-03 21:11:34 +02:00
Laserlicht
e8c541f873
end with auto combat
2024-01-26 23:15:56 +01:00
Ivan Savenko
80e960bc8e
Finalized new TCP networking API
2024-01-19 23:52:28 +02:00
Ivan Savenko
c2c43602ea
Initial version of global lobby server available in client
2024-01-19 23:49:59 +02:00
Alexander Wilms
cca08e29da
Remove duplicate semicolons
2024-01-16 19:02:39 +00:00
Ivan Savenko
1f0bcbc194
Added option to configure dropdown position
2023-12-07 13:57:16 +02:00
Ivan Savenko
0fd966818f
Remove 'visible' property from images, replaced with enable/disabled
...
call
2023-12-07 13:57:16 +02:00
Ivan Savenko
a3f9450d83
Relax UI locking to reduce delays in AI actions
2023-11-18 19:41:00 +02:00
Ivan Savenko
a9f868b379
Merge pull request #3166 from IvanSavenko/simturns_ui
...
UI for Simturns
2023-11-15 14:10:57 +02:00
Ivan Savenko
c5eeaa6526
Added non-linear slider for better simturn duration selection
2023-11-13 19:06:56 +02:00
Alexander Wilms
c0c16fed75
Move FPS counter to bottom left, set width of black background to suffice for 3 digit FPS
...
Fixes #3171
2023-11-13 02:52:19 +01:00
Ivan Savenko
359af84d59
Fix crash on starting battle in MP
2023-11-09 01:22:09 +02:00
Ivan Savenko
864462b84a
Reduce excessive updates of garrisons. Fixes selection reset in simturns
2023-11-09 00:01:48 +02:00
Alexander Wilms
3616235bb5
FramerateManager.cpp: Merge this "if" statement with the enclosing one.
...
Collapsible "if" statements should be merged
2023-10-27 14:30:04 +00:00
Nordsoft91
8f2b50a5e2
Merge pull request #3095 from Laserlicht/team_alignment
...
fix team alignments
2023-10-26 23:19:18 +02:00
Laserlicht
abb279f5b4
use config
2023-10-24 18:51:58 +02:00
Ivan Savenko
3880ea58b9
Merge branch 'josch/dos2unix' into develop
2023-10-22 18:39:03 +03:00
Laserlicht
0b0082eebc
format
2023-10-22 00:22:49 +02:00
Laserlicht
ab59c153b3
fix
2023-10-22 00:22:16 +02:00
Laserlicht
05a9f0fe39
move to EventReceiver
2023-10-22 00:05:14 +02:00
Laserlicht
6939989026
try to fix
2023-10-21 23:37:59 +02:00
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
Ivan Savenko
d295840c64
Merge pull request #3075 from josch/spelling
...
some spelling fixes
2023-10-19 11:15:25 +03:00
Johannes Schauer Marin Rodrigues
f9e1b302c7
some spelling fixes
2023-10-18 01:41:02 +02:00
Alexandre Detiste
15e45f966c
typos found by lintian
2023-10-17 22:06:08 +02:00
Laserlicht
c96cc405ed
town now updates
2023-10-14 23:41:12 +02:00
Nordsoft91
093c8149e5
Merge pull request #3040 from Laserlicht/infobox_next
2023-10-13 10:38:32 +02:00
Laserlicht
f9db3d131f
lastActivated with overload
2023-10-10 23:51:05 +02:00
Laserlicht
890c4ac19d
quick army managment click next
2023-10-10 22:11:06 +02:00
nordsoft
d7d435dcb7
Add game pause
2023-10-08 16:03:57 +02:00
Ivan Savenko
037efdf5fc
Improvements to type safety of Identifier class
...
- Constructor of Identifier from integer is now explicit
- Lobby hero/town selection now uses Identifiers instead of int's
- Removed serialization workaround for hero portraits
- Added dummy objects for custom heroes portraits for ID resolver to use
- HeroInstance now stores portrait ID only in case of custom portrait
- Fixed loading of campaign heroes portraits on RoE maps
2023-10-04 18:05:23 +03:00
Ivan Savenko
e322d0a084
Merge pull request #2966 from IvanSavenko/simplify_ui_lock
...
Simplified locking of game UI state
2023-10-04 16:50:23 +03:00
Laserlicht
ec8580b99e
Merge branch 'develop' into patch-4map_overview_rework
2023-10-02 21:03:16 +02:00
Laserlicht
61aae7bccc
code review
2023-09-30 22:49:22 +02:00
Ivan Savenko
d6b9fa8fbd
Replaced CPlayerInterface::pim with CGuiHandler::interfaceLock
...
- Removed CPlayerInterface::pim since this lock does not actually
protects LOCPLINT but rather entire game UI state
- added more logical CGuiHandler::interfaceLock
- interface lock is now non-recursive and is locked only once by initial
caller that want to access GUI
2023-09-27 18:33:52 +03:00
Alexander Wilms
f52562eeb7
Fix freezing of hero and long enemy turns without sleeping in FramerateManager::framerateDelay()
2023-09-27 16:09:52 +02:00
Alexander Wilms
0d11c5197d
Remove superfluous vsyncEnabled attribute
2023-09-26 23:48:53 +02:00
Alexander Wilms
ecc7648ef8
Use display index from settings
2023-09-26 23:05:48 +02:00
Alexander Wilms
e2eeec96a9
Fix stuttering animations when using high frame rate limit or vsync
2023-09-26 22:53:45 +02:00
Alexander Wilms
bfa5ef7990
Don't sleep in FramerateManager::framerateDelay() if VSync is enabled
2023-09-26 18:55:25 +02:00
Laserlicht
2d2c7ee8e0
added tolerance
2023-09-18 20:35:23 +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
