Ivan Savenko
ffe14fc1fc
Merge pull request #4022 from vcmi/master
...
Merge master -> beta
2024-05-20 18:09:51 +03:00
Ivan Savenko
017aaefc40
Handle invalid main menu config
2024-05-20 11:00:21 +00:00
Ivan Savenko
d6ff7896fe
Fix possible crash on closing game from main menu
2024-05-20 10:57:25 +00:00
Ivan Savenko
d5f32c27b0
Merge pull request #3996 from IvanSavenko/retaliation_tweaks
...
[1.5.2] Retaliation preview tweaks
2024-05-19 15:44:16 +03:00
Ivan Savenko
9ed749e104
Merge pull request #3991 from Laserlicht/preselect_last_save_while_loading
...
[1.5.2] preselect last save in loading screen
2024-05-19 15:42:59 +03: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
85d8e093df
Battle console: attempt to re-split string if it is too long to fit into
...
two lines due to line break
2024-05-17 12:22:21 +00:00
Laserlicht
359503f878
preselect last save in loading screen
2024-05-16 13:16:14 +02:00
Laserlicht
eb96f42ba0
fixes graphical glitch when there is no savegame
2024-05-15 21:07:47 +02:00
Ivan Savenko
0ab23c68f6
Deactivate on-screen keyboard if input is deactivated
2024-05-15 12:55:36 +00:00
Ivan Savenko
bbdd2ffb37
Force-show on-screen keyboard when clicking on active status bar
2024-05-15 12:45:45 +00:00
Ivan Savenko
fe4b4a4fba
Hopefully better logic for on-screen keyboard visibility
2024-05-15 12:45:45 +00:00
Ivan Savenko
533b26f23b
Fix build
2024-05-15 12:45:45 +00:00
Ivan Savenko
d374cec6fb
Force-show on-screen keyboard if player closed it before
2024-05-15 12:45:45 +00:00
Ivan Savenko
7790b8969d
Simplify TextInput constructor
2024-05-15 12:45:45 +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
1b1f724de1
Merge pull request #3970 from Laserlicht/extra
...
ExtraOptions improvements
2024-05-15 15:20:59 +03:00
Ivan Savenko
94d5dc1d7b
Merge pull request #3971 from Laserlicht/battle_log
...
battle log as window
2024-05-15 13:16:33 +03:00
Ivan Savenko
eb6e42c780
Merge pull request #3974 from IvanSavenko/hotfix_compat
...
Relax vcmi version compatibility checks in lobby
2024-05-15 13:15:35 +03:00
Laserlicht
79206ce65b
fix hotseat hide
2024-05-14 22:25:10 +02:00
Ivan Savenko
aa575c9093
Allow joining game hosted by other vcmi versions if only patch version
...
is different
2024-05-14 14:12:01 +00:00
Ivan Savenko
da9d82b697
Merge pull request #3973 from vcmi/master
...
Merge master -> beta
2024-05-14 16:59:10 +03:00
Ivan Savenko
22d51bd473
Fix freeze on closing game window while in game
2024-05-14 12:32:22 +00:00
Laserlicht
f596fbc9b3
Apply suggestions from code review
...
Co-authored-by: Ivan Savenko <saven.ivan@gmail.com>
2024-05-14 12:44:08 +02:00
Ivan Savenko
c92a5bbbab
Attempt to track crashes with unclear cause
2024-05-14 09:44:40 +00:00
Ivan Savenko
f061f98ddd
Merge pull request #3959 from IvanSavenko/fix_mac_hotkeys
...
Better handling of Ctrl / Cmd modifier keys on Apple systems
2024-05-14 12:16:55 +03:00
Laserlicht
e06c09d709
battle log expansion
2024-05-14 02:50:57 +02:00
Laserlicht
07a06ea08a
block for guests
2024-05-14 00:49:33 +02:00
Laserlicht
941c1576c5
improve extraoptions
2024-05-14 00:33:30 +02:00
Ivan Savenko
4787b9eded
Block movement if first node in path needs more move points that we have
2024-05-13 17:25:20 +00:00
Ivan Savenko
f8e4e41c39
Fix possible thread race on server shutdown:
...
- Main thread shutting down server from player request
- Network thread shutting down server due to server shutting down
network
2024-05-13 16:00:19 +00:00
Ivan Savenko
d295784f6e
Shutdown server immediately without leaving hanging server in main menu
2024-05-13 15:43:05 +00:00
Ivan Savenko
93da58beed
Do not use locks on single-threaded server.
...
Especially since this lock is global and is shared between client and
server for no reason
2024-05-13 15:42:33 +00:00
Ivan Savenko
95d761bbb8
Handle corrupted H3 data - show message box instead of silent crash
2024-05-13 15:41:47 +00:00
Ivan Savenko
876fe9adae
Fix size of invite window
2024-05-13 14:14:05 +00:00
Ivan Savenko
93038b791e
Fix connection termination handling
2024-05-13 14:09:59 +00:00
Ivan Savenko
2bb96018b8
Update list of player in invite window on new player or new invite
2024-05-13 13:48:01 +00:00
Ivan Savenko
7188849aa4
Show active room invites and invited players in UI
2024-05-13 12:12:55 +00:00
Ivan Savenko
a4ea74fbbc
Send list of active invites as part of room description
2024-05-13 11:43:28 +00:00
Ivan Savenko
58d1c93c1b
Merge pull request #3931 from IvanSavenko/retaliation_preview
...
[1.5.1] Retaliation preview
2024-05-13 14:40:00 +03:00
Ivan Savenko
c898d16458
Merge pull request #3948 from IvanSavenko/lobby_ui_fix
...
[1.5.1] Fixes for lobby UI
2024-05-13 14:39:53 +03:00
Ivan Savenko
0aa7362adf
Fix possible crash on accessing faction description
2024-05-12 20:24:09 +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
f55d07a829
Fix not visible text after switching to channel without slider in log
2024-05-11 20:53:39 +00:00
Ivan Savenko
890e794e32
Only play chat sound for messages from current room or in private
2024-05-11 20:42:39 +00:00
Ivan Savenko
793a17f95d
Automatically scroll to end on new chat message
2024-05-11 20:42:14 +00:00
Ivan Savenko
a341abbd31
Merge pull request #3927 from IvanSavenko/fix_doubleclick
...
[1.5.1] Fixed mouse double-click handling in some widgets
2024-05-11 21:57:15 +03:00
