(1762f02b3) Merge branch 'dev' into human-ai

2019-05-16 05:08:22 +03:00
parent 4797f6b0d3
commit 454dda56c7
91 changed files with 1138 additions and 744 deletions
@@ -377,6 +377,12 @@ namespace Barotrauma.Networking
            private set;
        }

+        [Serialize(true, true)]
+        public bool VoipEnabled {
+            get;
+            private set;
+        }
+
        [Serialize(true, true)]
        public bool EndRoundAtLevelEnd
        {