Merge branch 'master' of https://github.com/Regalis11/Barotrauma into develop

2023-12-14 11:56:39 -03:00
parent 283d9db518 7f295c291e
commit 448e4cdfbb
376 changed files with 7775 additions and 2879 deletions
@@ -648,6 +648,13 @@ namespace Barotrauma.Networking
            set;
        }

+        [Serialize(true, IsPropertySaveable.Yes)]
+        public bool AllowImmediateItemDelivery
+        {
+            get;
+            set;
+        }
+
        [Serialize(false, IsPropertySaveable.Yes)]
        public bool LockAllDefaultWires
        {
@@ -845,6 +852,13 @@ namespace Barotrauma.Networking
            private set;
        }

+        [Serialize(10.0f, IsPropertySaveable.Yes)]
+        public float MinimumMidRoundSyncTimeout
+        {
+            get;
+            private set;
+        }
+
        private bool karmaEnabled;
        [Serialize(false, IsPropertySaveable.Yes)]
        public bool KarmaEnabled