Merge remote-tracking branch 'origin/dev_danil' into dev_maxim

# Conflicts: # scripts/PRD.gd # scripts/network.gd
2025-02-07 06:42:17 +03:00
parent a3e03c7da1 2e8082a26a
commit 2a9b0ab6ab
14 changed files with 509 additions and 443 deletions
--- a/scripts/network.gd
+++ b/scripts/network.gd
@@ -279,7 +279,7 @@ func set_fs_attenuation(attenuation: float):
 func connect_fs_2():
    if client_fs_2:
        disconnect_fs_2(client_fs_2)
-    
+
    client_fs_2 = StreamPeerTCP.new()
    peerstream_fs_2 = PacketPeerStream.new()
    var rc = client_fs_2.connect_to_host(ip_fs_2, Constants.PORT_FS)