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
Ivan Savenko
5b674baa91
Fix slow switching to a channel with large number of messages
2024-05-11 16:44:31 +00:00
Ivan Savenko
87e4756f6d
Fix crash on hiding empty map/save list
2024-05-11 13:19:07 +00:00
Ivan Savenko
1bc7c29111
Add workaround for visiting Altar of Sacrifice on 1.4 saves
2024-05-11 13:19:07 +00:00
Ivan Savenko
a74d9791a1
Remove indirect calls to CSH from server handler itself
2024-05-11 13:19:07 +00:00
Ivan Savenko
46f2b8b2d7
Attempt to fix weird crash on game start
2024-05-11 13:19:07 +00:00
Ivan Savenko
278e8ac65e
Do not show preview for ranged retaliation - not implemented in lib
2024-05-10 19:51:36 +00:00
Ivan Savenko
d094a17298
Added simple damage preview for retaliations
2024-05-10 19:40:33 +00:00
Ivan Savenko
64d6e48540
Fixed mouse double-click handling in some widgets.
...
Now double-click when 1st click was not inside widget should work as
expected:
- scenario list: 2nd click on non-selected scenario will select it
instead of starting unselected map
- component selection: 2nd click on non-selected component would select
it instead of confirming choice
- town portal dialog: 2nd click on non-selected town would only select
it
- tavern window: right-click would now also select this hero (h3 logic)
2024-05-10 16:05:59 +00:00
Ivan Savenko
8b861fc58f
Do not check for guards when teleporting using means other than DD
2024-05-07 20:05:23 +00:00
Ivan Savenko
ffc207888b
Added option to configure key modifiers (Alt, Shift, Ctrl). Fixes lobby
...
hotkey activation.
2024-05-07 08:58:45 +00:00
DjWarmonger
4949b98ed3
Merge pull request #3759 from Laserlicht/bio
...
Let's try this
2024-05-07 09:05:14 +02:00
Ivan Savenko
cd79953693
Fix crash on accessing campaign screen
2024-05-06 12:32:32 +00:00
SoundSSGood
03c6684622
Cosmetic market window fix
2024-05-03 12:36:13 +03:00
Ivan Savenko
6ac67775f5
Merge pull request #3861 from Laserlicht/pvp_options
...
Pvp options
2024-05-03 10:38:42 +03:00
Ivan Savenko
c19992ee5b
Do not animate events such as new monsters
2024-05-02 22:16:41 +03:00
Laserlicht
1f209fd94a
use MetaString
2024-05-02 21:03:23 +02:00
Laserlicht
37d9e862c2
Code review
2024-05-02 20:15:34 +02:00
Ivan Savenko
68bd54ae99
Fix server error messages on moving through garrisons
2024-05-02 18:05:57 +03:00
Ivan Savenko
d3d15cd6b9
Loop audio stream from video file on campaing prolog/epilog window
2024-05-02 16:45:46 +03:00
Ivan Savenko
c7dd0c6523
Fix possible crash on actions with no initiator set
...
Such as spawning of new wandering monsters on new month
2024-05-02 16:45:11 +03:00
Laserlicht
812e96ebb1
Guest can also use & renaming
2024-05-01 15:58:22 +02:00
Laserlicht
5b8b75da22
small fixes
2024-05-01 15:30:35 +02:00
Laserlicht
89b750c749
allow translations in chat
2024-05-01 15:00:36 +02:00
Laserlicht
426a008506
no slider needed when only 9 towns
2024-05-01 13:36:00 +02:00
