v0.14.6.0

2021-06-17 17:54:52 +03:00
parent 3f324b14e8
commit c27e2ea5ab
348 changed files with 13156 additions and 4266 deletions
@@ -635,6 +635,13 @@ namespace Barotrauma.Networking
            set;
        }

+        [Serialize(false, true)]
+        public bool AllowLinkingWifiToChat
+        {
+            get;
+            set;
+        }
+
        [Serialize(true, true)]
        public bool AllowFriendlyFire
        {
@@ -885,6 +892,8 @@ namespace Barotrauma.Networking
            get;
            set;
        }
+        // we do not serialize this value because it relies on a default setting
+        public int MaxMissionCount { get; set; } = CampaignSettings.DefaultMaxMissionCount;

        public void SetPassword(string password)
        {