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

15932 Commits

Author SHA1 Message Date
Ivan Savenko
bb5627e98c
Merge pull request #3954 from IvanSavenko/fix_compile
Fix compilation issues
2024-05-14 12:16:27 +03:00
Ivan Savenko
278fd89360
Merge pull request #3968 from godric3/map-editor-fix-seer-crash
Map editor fix seer crash
2024-05-14 12:16:08 +03:00
Ivan Savenko
72527b4f47
Merge pull request #3965 from IvanSavenko/invite_fixes
[1.5.1] Fixes for player invite mechanics in lobby
2024-05-14 12:15:51 +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
altiereslima
b8d463d0bc Update portuguese.json 2024-05-13 18:12:16 -03:00
Ivan Savenko
c786354af3 Add better crash message for zero-length battlefield list 2024-05-13 21:03:06 +00:00
godric3
ddb641c0ef map editor: fix seer visit mode input initialization 2024-05-13 23:00:13 +02:00
godric3
e7c03e3387 map editor: block remove visit info button if no info to remove 2024-05-13 22:40:26 +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
2ddc6a1459 Android build ID bump 2024-05-13 16:59:41 +00:00
Ivan Savenko
62b564650d Fix possibly hanging pointer to deleted CGObjectInstance
Was stored by CRemoveObjectOperation and accessed on destruction even
though it has been removed by the game
2024-05-13 16:19:14 +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
Tomasz Zieliński
e9b5441b3d Add first version of documentation for RMG algorithms 2024-05-13 17:48:10 +02: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
ecb8d17ca8 Remove flag that requires optimized builds 2024-05-13 12:23:46 +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
e12db20314 Add missing field in schema 2024-05-13 11:42:05 +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
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