1
0
mirror of https://github.com/vcmi/vcmi.git synced 2025-01-16 02:47:36 +02:00
Commit Graph

15790 Commits

Author SHA1 Message Date
Ivan Savenko
d6ff7896fe Fix possible crash on closing game from main menu 2024-05-20 10:57:25 +00:00
Ivan Savenko
6f6555d19c Downgrade fatal exception to disconnection message 2024-05-19 12:54:51 +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
0dfa781655 Add mutex as a quick fix for concurrent access to text handler by client
and server
2024-05-18 09:02:21 +00:00
Ivan Savenko
004e6d1fcb Fix crash on starting random map with random number of players 2024-05-17 18:25:09 +00:00
Ivan Savenko
194b3389f9
Merge pull request #3989 from vcmi/beta
Merge beta -> master
2024-05-16 13:08:20 +03:00
Ivan Savenko
1f1e693a5b
Merge pull request #3972 from IvanSavenko/release_151
Release 1.5.1 preparation
2024-05-16 11:50:07 +03:00
Ivan Savenko
09416a5687 Update changelog 2024-05-16 08:03:06 +00:00
Ivan Savenko
aadbf6dd6a Ignore duplicate disconnected calls 2024-05-16 08:03:06 +00:00
Ivan Savenko
f963b827e9 Add more descriptive error messages 2024-05-16 08:03:06 +00:00
Asirome
ff0d5d63d9 Update spanish.json (#3967) 2024-05-16 08:03:06 +00:00
Gigas002
ad7363b36a Update github.yml 2024-05-16 08:03:06 +00:00
Gigas002
1525703973 Update github.yml 2024-05-16 08:03:06 +00:00
Asirome
90c494f05f Update spanish.json 2024-05-16 08:03:06 +00:00
Ivan Savenko
a58285eff0 Add 1.5.1 download counter 2024-05-16 08:03:06 +00:00
Ivan Savenko
161913c462 Updated changelog 2024-05-16 08:03:06 +00:00
Ivan Savenko
e023f04187 Android build ID bump 2024-05-16 08:03:06 +00:00
Ivan Savenko
b00d878ca1
Merge pull request #3986 from Laserlicht/mapeditor_improvements
Mapeditor improvements
2024-05-16 10:59:18 +03:00
Ivan Savenko
698d726cf9
Merge pull request #3985 from Laserlicht/fix_graphical
fixes graphical glitch when there is no savegame (ExtraOptions)
2024-05-16 10:11:46 +03:00
Laserlicht
0c5fb8125f #2590 enable high dpi 2024-05-16 00:32:15 +02:00
Laserlicht
9628001f57 #3864 possibility to search in army setting 2024-05-16 00:24:58 +02:00
Laserlicht
284cc3460d mapeditor: add extension and open vcmi folder 2024-05-16 00:01:02 +02:00
Laserlicht
ec9a2b0478
change gh-action to gcc12 2024-05-15 21:27:16 +02:00
Laserlicht
eb96f42ba0
fixes graphical glitch when there is no savegame 2024-05-15 21:07:47 +02:00
Ivan Savenko
e00046dd70
Merge pull request #3955 from IvanSavenko/text_input_refactor
Fix message text length limit in lobby chat
2024-05-15 16:46:44 +03: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
Laserlicht
560923fc1f
show cheating problem message only once per AI 2024-05-15 12:50:51 +02:00
Laserlicht
1274790023
reuse strings 2024-05-15 12:40:01 +02:00
Ivan Savenko
2f70c530fa
Merge pull request #3969 from altiereslima/beta
Update portuguese.json
2024-05-15 13:24:23 +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
Ivan Savenko
a7d5a081b4
Merge pull request #3982 from Laserlicht/hotseat_hide
Fix hotseat hide
2024-05-15 13:15:22 +03:00
Ivan Savenko
78bab01cb4
Merge pull request #3984 from Laserlicht/patch-2
update metainfo to reflect gamepad support
2024-05-15 13:15:10 +03:00
Laserlicht
b51028a643
update metainfo to reflect gamepad support 2024-05-15 01:42:43 +02:00
Laserlicht
e9b2159c0a
hint about disabled cheats for nullkiller 2024-05-15 00:18:14 +02:00
altiereslima
f872406a08 Update portuguese.ts 2024-05-14 18:34:06 -03:00
altiereslima
00a39921e8 Update portuguese.ts 2024-05-14 18:34:03 -03:00
Ivan Savenko
ced21f0837
Merge pull request #3981 from IvanSavenko/asio_fix
Simple workaround to fix vcmiserver shutdown procedure
2024-05-15 00:14:14 +03:00
Laserlicht
8b59b78003
Publish if cheats or unlimited replays allowed to all players 2024-05-14 22:48:32 +02:00
Laserlicht
79206ce65b fix hotseat hide 2024-05-14 22:25:10 +02:00
Ivan Savenko
35954dc41b Simple workaround to fix vcmiserver shutdown procedure
At the moment, vcmilobby *requires* async writes in order to handle
multiple connections with different speeds and at optimal performance,
without hanging if one player is too slow and can't eat all data server
sent to him at once.

However server (and potentially - client) can not handle this mode and
may shutdown either socket or entire asio service too early, before all
writes are performed, leading to weird freeze on ending scenario where
client would not receive notifications about end of game.
2024-05-14 19:40:20 +00:00