(2da6c898b) Added 'pretty' merge script

2019-03-25 10:57:38 -03:00
parent 94c1b29beb
commit 991639709c
5 changed files with 224 additions and 24 deletions
@@ -35,8 +35,8 @@ namespace Barotrauma.Networking
        public const float DeleteDisconnectedTime = 20.0f;

        public const float ItemConditionUpdateInterval = 0.15f;
+
        public const float LevelObjectUpdateInterval = 0.5f;
-        public const float HullUpdateInterval = 0.5f;

        public const int MaxEventPacketsPerUpdate = 4;