Merge remote-tracking branch 'upstream/master' into develop

2026-04-09 09:12:16 -03:00
parent ef66d27ffe a4607dffad
commit 790378d2a5
198 changed files with 5587 additions and 3462 deletions
@@ -33,6 +33,13 @@ namespace Barotrauma.Networking
                DualStack = GameSettings.CurrentConfig.UseDualModeSockets,
                LocalAddress = serverSettings.ListenIPAddress,
            };
+            if (NetConfig.UseLenientHandshake)
+            {
+                // More lenient timeouts for local testing, so the server would start even without perfect conditions
+                netPeerConfiguration.ConnectionTimeout = 60.0f;
+                netPeerConfiguration.ResendHandshakeInterval = 5.0f;
+                netPeerConfiguration.MaximumHandshakeAttempts = 20;
+            }

            netPeerConfiguration.DisableMessageType(
                NetIncomingMessageType.DebugMessage