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

15905 Commits

Author SHA1 Message Date
DjWarmonger
560d53a07c
Merge pull request #3960 from vcmi/fix-3941
#3941 - recruit hero when no heroes
2024-05-13 11:30:11 +02:00
Andrii Danylchenko
4634aa7169
Merge pull request #3953 from vcmi/fix-3930
#3930 - fix usage of wrong variable
2024-05-13 12:26:42 +03:00
Ivan Savenko
4412bb4d57
Merge pull request #3963 from IvanSavenko/heartbeat_fix
lobby server - Heartbeat fix
2024-05-13 10:13:31 +03:00
Ivan Savenko
0aa7362adf Fix possible crash on accessing faction description 2024-05-12 20:24:09 +00:00
Ivan Savenko
8b15836547 Do not attempt to load Json from empty string 2024-05-12 19:26:08 +00:00
Ivan Savenko
6d08ec6323 More robust handling of connection errors
Fixes potentially hanging by heartbeat sockets
2024-05-12 19:13:17 +00:00
Andrii Danylchenko
98afd43969 #3941 - recruit hero when no heroes 2024-05-12 21:10:31 +03: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
b207768cf3 Use STREQUAL instead of MATCHES where applicable 2024-05-12 17:06:46 +00:00
Ivan Savenko
62c2be160a Added changing thread name for FreeBSD 2024-05-12 15:10:29 +00:00
Ivan Savenko
55d7e31f7e Use hardening flags only for debug builds to avoid conflicts 2024-05-12 15:10:01 +00:00
Andrii Danylchenko
98a78b3386 #3930 - fix usage of wrong variable 2024-05-12 18:04:23 +03:00
Ivan Savenko
2c99b13482
Merge pull request #3952 from dydzio0614/default-popups-dim
Do not darken background for small windows by default
2024-05-12 16:04:29 +03:00
Ivan Savenko
06aab2ccbb
Merge pull request #3924 from vcmi/fix_road_routing
Route roads away from zone borders
2024-05-12 16:02:38 +03:00
Ivan Savenko
9921065088
Merge pull request #3947 from godric3/map-editor-fix-prison-hero-selection
map editor: fix prison hero selection
2024-05-12 16:01:25 +03:00
Dydzio
762022328f Change default background dim setting to trigger only for fullscreen size windows 2024-05-12 13:11:54 +02:00
Ivan Savenko
33fd18e828
Merge pull request #3938 from IvanSavenko/lobby_fixes
[1.5.1] Fixes for issues with lobby server
2024-05-12 10:13:00 +03: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
godric3
578800b3e3 map editor: fix prison hero selection 2024-05-11 21:54:24 +02:00
Ivan Savenko
9049fb738a
Merge pull request #3946 from dydzio0614/mana-vortex-hero-order
Fix "bonusing" town building visiting hero order
2024-05-11 21:58:23 +03:00
Ivan Savenko
ae2368dbcf
Merge pull request #3928 from IvanSavenko/scouting_fix
[1.5.1] Reveal fow on hero recruitment
2024-05-11 21:57:27 +03: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
0ce78cae06
Merge pull request #3926 from IvanSavenko/optimize_map_list_load
[1.5.1] Improve performance of parsing of map headers for map list
2024-05-11 21:56:58 +03:00
Dydzio
f20ef4f1b3 Fix hero order for giving bonuses in town to match H3. 2024-05-11 20:21:02 +02: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
dae3569077 Fix build 2024-05-11 16:18:21 +00:00
Ivan Savenko
0403626c93 Fix excessive calls of steady_timer::async_wait 2024-05-11 16:10:07 +00:00
Ivan Savenko
67604e1e01 Reapply "Simple implementation of heartbeat package"
This reverts commit ede92c1a9c.
2024-05-11 16:10:08 +00:00
Ivan Savenko
4c3aac8f19 Use async_write to prevent locks if receiver is too slow 2024-05-11 16:09:03 +00:00
Ivan Savenko
fc4196e71c
Merge pull request #3943 from vcmi/master
Merge master -> beta
2024-05-11 18:48:42 +03:00
Ivan Savenko
2f4da1f124
Merge pull request #3929 from IvanSavenko/stabilization
[1.5.1] Stabilization
2024-05-11 17:31:23 +03:00
Ivan Savenko
147db10a28 Avoid crash if configs file is missing, e.g. broken version of mod 2024-05-11 13:19:07 +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
16f43254b5 Use async_resolve to avoid crash on resolve error 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
31401e219f Fix possible crash on nullptr dereference 2024-05-11 13:19:07 +00:00
Ivan Savenko
26b76db6e7
Merge pull request #3922 from IvanSavenko/version_bump_151
Version bump to 1.5.1
2024-05-11 16:17:48 +03: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
6d25c08561 Update translations 2024-05-10 19:40:44 +00:00
Ivan Savenko
d094a17298 Added simple damage preview for retaliations 2024-05-10 19:40:33 +00:00
Ivan Savenko
ac4204f660 Fixed calculation of retaliation damage 2024-05-10 19:40:14 +00:00
Tomasz Zieliński
5a979e42e2 Satisfy SonarCloud 2024-05-10 21:14:15 +02:00
Ivan Savenko
145cd38025 Use sight center for fow reveal actions 2024-05-10 16:48:44 +00:00
Ivan Savenko
19f2fbce1e Reveal terrain around newly recruited hero to account for Scouting 2024-05-10 16:48:20 +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
Tomasz Zieliński
ee27a79aa1 Sonarcloud issues 2024-05-10 17:07:09 +02:00