(bcb06cc5c) Unstable v0.9.9.0

2020-03-27 15:22:59 -03:00
parent c81486a993
commit b143329701
326 changed files with 9692 additions and 4364 deletions
@@ -138,7 +138,7 @@ namespace Barotrauma.Networking
                        {
                            return (a == null) == (b == null);
                        }
-                        return a.ToString().Equals(b.ToString(), StringComparison.InvariantCulture);
+                        return a.ToString().Equals(b.ToString(), StringComparison.OrdinalIgnoreCase);
                }
            }

@@ -608,6 +608,13 @@ namespace Barotrauma.Networking
            set;
        }

+        [Serialize(false, true)]
+        public bool DisableBotConversations
+        {
+            get;
+            set;
+        }
+
        public float SelectedLevelDifficulty
        {
            get { return selectedLevelDifficulty; }
@@ -759,7 +766,7 @@ namespace Barotrauma.Networking
            private set;
        }

-        [Serialize(120.0f, true)]
+        [Serialize(600.0f, true)]
        public float KickAFKTime
        {
            get;