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

2022-12-09 17:33:44 -03:00
parent 83c9c25164 6f788fb8b4
commit 90c3cef977
416 changed files with 12674 additions and 5862 deletions
@@ -386,12 +386,17 @@ namespace Barotrauma.Networking

        private bool autoRestart;

-        public bool IsPublic;
-
        private int maxPlayers;

        public List<SavedClientPermission> ClientPermissions { get; private set; } = new List<SavedClientPermission>();

+        [Serialize(true, IsPropertySaveable.Yes)]
+        public bool IsPublic
+        {
+            get;
+            set;
+        }
+
        private int tickRate = 20;
        [Serialize(20, IsPropertySaveable.Yes)]
        public int TickRate
@@ -522,13 +527,20 @@ namespace Barotrauma.Networking
            }
        }

-        [Serialize(Barotrauma.LosMode.Opaque, IsPropertySaveable.Yes)]
+        [Serialize(LosMode.Opaque, IsPropertySaveable.Yes)]
        public LosMode LosMode
        {
            get;
            set;
        }

+        [Serialize(EnemyHealthBarMode.ShowAll, IsPropertySaveable.Yes)]
+        public EnemyHealthBarMode ShowEnemyHealthBars
+        {
+            get;
+            set;
+        }
+
        [Serialize(800, IsPropertySaveable.Yes)]
        public int LinesPerLogFile
        {