1
0
mirror of https://github.com/vcmi/vcmi.git synced 2025-07-07 00:58:39 +02:00
Commit Graph

261 Commits

Author SHA1 Message Date
e7af9d5607 Code review fixes, Sonarcloud fixes 2024-03-04 21:23:17 +01:00
f650072da1 Remove useless code 2024-03-01 11:46:01 +01:00
5f95955535 Store and load last difficulty setting 2024-03-01 10:57:48 +01:00
fe918de2df Remove invalid assertion 2024-02-19 00:36:21 +02:00
9ebd194ab1 Merge pull request #3609 from IvanSavenko/single_process
Allow running server as part of client process
2024-02-14 12:06:22 +02:00
7c34d48258 Minor fixes and corrections to network-related code. No functionality
changes.
2024-02-12 18:57:20 +02:00
74f9b03516 Fix crash on closing client while server is active 2024-02-12 16:36:13 +02:00
0fc0ad238b Fixes for server shutdown logic, implemented connection aborting for
local server
2024-02-11 17:55:02 +02:00
0d263c5571 Implemented option to run server as a thread with shared VLC 2024-02-11 17:55:02 +02:00
38ba42ef7a Rename 'c' to 'logicConnection' 2024-02-11 16:26:27 +02:00
f2ecd4cf11 Merge branch 'develop' into 'lobby' 2024-02-11 16:13:13 +02:00
522cb571b3 Remove redundant virtual specifiers
`grep -nr virtual | grep -v googletest | grep override > ../redundant_virtual.txt`

```python
import os

with open("../redundant_virtual.txt") as f:
    for line in f:
        print()
        line: str = line.strip()
        print(line)
        tmp = line.split(":")
        file = tmp[0].strip()
        code = tmp[-1].strip()
        print(file)
        print(code)
        new_code = code.replace("virtual ", "", 1)
        # https://superuser.com/a/802490/578501
        command = f"export FIND='{code}' && export REPLACE='{new_code}' && ruby -p -i -e \"gsub(ENV['FIND'], ENV['REPLACE'])\" {file}"
        os.system(command)
```
2024-02-10 20:46:13 +01:00
1a144fc516 Some progress on private rooms support 2024-02-10 19:02:25 +02:00
d4bedd8d8d Fixed handling of match server crash 2024-02-04 19:58:09 +02:00
7dee24edae Cleanup 2024-02-03 23:30:16 +02:00
1b6ac1052a Properly lock UI mutex on accessing GUI state from network thread 2024-02-03 22:24:32 +02:00
bd4c7e3ac0 Added LobbyPrepareStartGame pack to replace old workarounds 2024-02-03 19:57:23 +02:00
2c2bec791c Fixes and cleanup of game client network shutdown and restart 2024-02-03 19:27:04 +02:00
29c0989849 Use std::byte to manage network data 2024-02-02 02:02:09 +02:00
c12558bf8a Simplified code 2024-02-02 01:26:53 +02:00
c5c46a7c9a Implemented connecting to server via proxy 2024-01-30 21:31:41 +02:00
eaca128c99 Code cleanup 2024-01-26 19:15:57 +02:00
322c5faf63 Merge remote-tracking branch 'vcmi/develop' into lobby 2024-01-26 16:52:23 +02:00
388ca6e776 Added list of active accounts and rooms to UI. Added room creation logic 2024-01-26 16:32:36 +02:00
9e62eb28c5 Fix merge 2024-01-21 00:53:22 +02:00
fc4ae3bd8c Merge remote-tracking branch 'vcmi/develop' into lobby 2024-01-20 23:01:49 +02:00
cc7fc4a2c6 Fix headless mode 2024-01-20 22:55:27 +02:00
baa73f5433 Code cleanup 2024-01-20 00:26:25 +02:00
709905b1a0 Simplified networking API 2024-01-19 23:52:28 +02:00
80e960bc8e Finalized new TCP networking API 2024-01-19 23:52:28 +02:00
ffa58152ac Client-side support for hosting game server via lobby 2024-01-19 23:49:59 +02:00
55b504792e Implemented basic version of login window and persistent connection on
client
2024-01-19 23:49:59 +02:00
78b7d9e726 Replaced open port check with server crash check 2024-01-19 23:49:59 +02:00
0196707083 Fix UUID initialization on client 2024-01-19 23:49:59 +02:00
2396c14114 Fixed logic for reconnection attempts to local server. Cleanup.
Added distinct fields in config for local and remote connection.
Removed code for restoring last session since it does not works as
intended and often triggers after crash
2024-01-19 23:49:59 +02:00
a3639e77b1 Fixed handling of connection failure on client 2024-01-19 23:49:59 +02:00
5694777a96 Simplified connection logic 2024-01-19 23:49:59 +02:00
8ea69e457a Simplified applying of lobby packs 2024-01-19 23:49:59 +02:00
22f0ca67c6 Fix connection to game lobby & map load 2024-01-19 23:49:59 +02:00
0a1153e1c6 Switch client-server communication to new API 2024-01-19 23:49:59 +02:00
496c13b34a Stabilization 2024-01-19 13:56:06 +02:00
9af7c63a26 Fix build 2024-01-19 13:56:05 +02:00
ea1f05d15a Stabilization 2024-01-19 13:55:22 +02:00
bd5682ecc3 Merge remote-tracking branch 'vcmi/master' into develop 2024-01-19 13:49:54 +02:00
f3277b7953 Define each identifier in a dedicated statement 2024-01-10 00:22:23 +00:00
c635ca562e fix campaign completion 2024-01-07 14:36:07 +01:00
cb9c4bbaf0 unlimited replay option 2023-12-28 20:48:19 +01:00
fc4827c89c option for allowing cheats 2023-12-27 14:39:35 +01:00
b8a4091356 Fix regressions from timers - client may be destroyed while receiving
timer update or pack reply
2023-11-27 20:27:10 +02:00
301ac2457a Cleanup 2023-11-13 17:48:55 +02:00