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

Barotrauma/BarotraumaShared/SharedSource/Networking/ServerSettings.cs

@@ -36,6 +36,7 @@ namespace Barotrauma.Networking
 
     public enum RespawnMode
     {
+        None,
         MidRound,
         BetweenRounds,
         Permadeath,
@@ -420,6 +421,19 @@ namespace Barotrauma.Networking
             set { tickRate = MathHelper.Clamp(value, 1, 60); }
         }
 
+        private int maxLagCompensation = 150;
+        [Serialize(150, IsPropertySaveable.Yes, description:
+            "Maximum amount of lag compensation for firing weapons, in milliseconds. " +
+            "E.g. when a client fires a gun, the server will be notified about it with some latency, and checks if it hit anything in the past (at the time the shot was taken), up to this limit. " +
+            "The largest allowed lag compensation is 500 milliseconds.")]
+        public int MaxLagCompensation
+        {
+            get { return maxLagCompensation; }
+            set { maxLagCompensation = MathHelper.Clamp(value, 0, 500); }
+        }
+
+        public float MaxLagCompensationSeconds => maxLagCompensation / 1000.0f;
+
         [Serialize(true, IsPropertySaveable.Yes, description: "Do clients need to be authenticated (e.g. based on Steam ID or an EGS ownership token). Can be disabled if you for example want to play the game in a local network without a connection to external services.")]
         public bool RequireAuthentication
         {