Merge https://github.com/Regalis11/Barotrauma into develop

2023-06-15 12:13:50 -03:00
parent 6b461e1026 f95be0511c
commit 15daa64f66
210 changed files with 4491 additions and 2580 deletions
@@ -44,8 +44,8 @@ namespace Barotrauma.Networking
    partial class ServerSettings : ISerializableEntity
    {
        public const int PacketLimitMin = 1200,
-                         PacketLimitWarning = 2400,
-                         PacketLimitDefault = 3000,
+                         PacketLimitWarning = 3500,
+                         PacketLimitDefault = 4000,
                         PacketLimitMax = 10000;

        public const string SettingsFile = "serversettings.xml";
@@ -396,8 +396,10 @@ namespace Barotrauma.Networking
            set;
        }

-        private int tickRate = 20;
-        [Serialize(20, IsPropertySaveable.Yes)]
+        public const int DefaultTickRate = 20;
+
+        private int tickRate = DefaultTickRate;
+        [Serialize(DefaultTickRate, IsPropertySaveable.Yes)]
        public int TickRate
        {
            get { return tickRate; }
@@ -526,7 +528,7 @@ namespace Barotrauma.Networking
            }
        }

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