From f8642efa2366b5d42c8f5b9a93b361a17b4da067 Mon Sep 17 00:00:00 2001 From: Vladislav Khorev Date: Thu, 26 Feb 2026 21:02:16 +0300 Subject: [PATCH] merge --- resources/multiplayer_menu/AvailableServers.png | 4 ++-- resources/multiplayer_menu/Backbutton.png | 4 ++-- resources/multiplayer_menu/Button.png | 4 ++-- resources/multiplayer_menu/Button2.png | 4 ++-- resources/multiplayer_menu/Button3.png | 4 ++-- resources/multiplayer_menu/Filledbuttons.png | 4 ++-- resources/multiplayer_menu/JoinServer.png | 4 ++-- resources/multiplayer_menu/ServerName.png | 4 ++-- resources/multiplayer_menu/title.png | 4 ++-- src/network/WebSocketClientEmscripten.cpp | 4 ++-- 10 files changed, 20 insertions(+), 20 deletions(-) diff --git a/resources/multiplayer_menu/AvailableServers.png b/resources/multiplayer_menu/AvailableServers.png index 8a5759d..d4c055e 100644 --- a/resources/multiplayer_menu/AvailableServers.png +++ b/resources/multiplayer_menu/AvailableServers.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b6c6555671ec968eff10211ef2efd8ac097c52bf602b314d101f78c57f4a7059 -size 1823 +oid sha256:69624bbb22ebac925c3eb9299c862f07fa0815a6d90ed14e7e91a14be588e4d0 +size 8167 diff --git a/resources/multiplayer_menu/Backbutton.png b/resources/multiplayer_menu/Backbutton.png index 9ee46af..37cdae0 100644 --- a/resources/multiplayer_menu/Backbutton.png +++ b/resources/multiplayer_menu/Backbutton.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e0bcfe59a76449bd26a8558bbcf59a2bb06227d4ad99f5686a41ff567ca4b2bb -size 1814 +oid sha256:113c524330190fbdf36f0f7b4ebfc03032170aff5011f8c17201533b52db872f +size 5387 diff --git a/resources/multiplayer_menu/Button.png b/resources/multiplayer_menu/Button.png index a08abec..620425a 100644 --- a/resources/multiplayer_menu/Button.png +++ b/resources/multiplayer_menu/Button.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:9e9ef4f2c9e8b45419915f4630e9ec3228388e6eff9c1f6fffd8a7762f0437c7 -size 3508 +oid sha256:2e0267f247715722ee0881e96dc83d1c83a999c718af1bac64b5964c1a2c7335 +size 8074 diff --git a/resources/multiplayer_menu/Button2.png b/resources/multiplayer_menu/Button2.png index 49b0468..884b2fa 100644 --- a/resources/multiplayer_menu/Button2.png +++ b/resources/multiplayer_menu/Button2.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:9b9dc0b621e0125c32d21cf2a941638fc758ababd52b933b3aa806d8fba2d2bb -size 3575 +oid sha256:629aa9499976abeeb83194b4cc67153383ab4ebdfc46dd98e4c3733ee7b92e4e +size 8612 diff --git a/resources/multiplayer_menu/Button3.png b/resources/multiplayer_menu/Button3.png index b7f3804..892fcca 100644 --- a/resources/multiplayer_menu/Button3.png +++ b/resources/multiplayer_menu/Button3.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:fcb8c3d841ab6e449adf66263e4bd27d80240f591e090e6047bc1206dd4d9b10 -size 3742 +oid sha256:a74a8b4c954ceb45d582b46d0e5bf2f544f5d933d1b264b4d80fb2720c3a6e68 +size 9129 diff --git a/resources/multiplayer_menu/Filledbuttons.png b/resources/multiplayer_menu/Filledbuttons.png index ae03c85..26f29f7 100644 --- a/resources/multiplayer_menu/Filledbuttons.png +++ b/resources/multiplayer_menu/Filledbuttons.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:eb124591fa4995b4f958f082976d87cf3bc22b560dc790d0dac6d89c158c9a78 -size 2315 +oid sha256:8977b432e9b190f568456026e05fc9ae3a9eec7a90b285095578071c03e839ea +size 8375 diff --git a/resources/multiplayer_menu/JoinServer.png b/resources/multiplayer_menu/JoinServer.png index aec320d..7db6904 100644 --- a/resources/multiplayer_menu/JoinServer.png +++ b/resources/multiplayer_menu/JoinServer.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:66448d4bc67ad1cd0ed4ddd4e3671b17ffe97d11e59185d123b1b621badb6449 -size 1282 +oid sha256:2f01d975f7e6bec5e796b8b4272462b0b4d3d99076af3873c4d819a50b9dbe82 +size 4177 diff --git a/resources/multiplayer_menu/ServerName.png b/resources/multiplayer_menu/ServerName.png index b8b0d63..d8df64c 100644 --- a/resources/multiplayer_menu/ServerName.png +++ b/resources/multiplayer_menu/ServerName.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b8bd3c9e3fa4fff2c9f5cba2858e8a964be237406162ed7dd7046690a8543eb4 -size 1367 +oid sha256:7b197ead1094f297c06083c909d8a910812d0981386578a75fd74af67d54819e +size 4304 diff --git a/resources/multiplayer_menu/title.png b/resources/multiplayer_menu/title.png index 4702a8a..30e6644 100644 --- a/resources/multiplayer_menu/title.png +++ b/resources/multiplayer_menu/title.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ffcfc5e1d00f135259a94122d60c9524524b6f40d9cf7d26d17dd25b793ade40 -size 1830 +oid sha256:d52df5a072c43ef1a113cdc6fcb0af32fe5fcf353775bb0ad6907921ced30840 +size 7477 diff --git a/src/network/WebSocketClientEmscripten.cpp b/src/network/WebSocketClientEmscripten.cpp index 98044e9..9534cf0 100644 --- a/src/network/WebSocketClientEmscripten.cpp +++ b/src/network/WebSocketClientEmscripten.cpp @@ -7,8 +7,8 @@ namespace ZL { void WebSocketClientEmscripten::Connect(const std::string& host, uint16_t port) { // Формируем URL. Обратите внимание, что в Web часто лучше использовать ws://localhost - //std::string url = "ws://" + host + ":" + std::to_string(port); - std::string url = "wss://api.spacegame.fishrungames.com"; + std::string url = "ws://" + host + ":" + std::to_string(port); + //std::string url = "wss://api.spacegame.fishrungames.com"; EmscriptenWebSocketCreateAttributes attr = { url.c_str(),