(4b33eda28) Merge branch 'dev' into enemy-ai

2019-03-25 19:49:34 +02:00
parent 7d74b5bd52
commit 26594e2c6c
31 changed files with 207 additions and 148 deletions
@@ -15,7 +15,6 @@ namespace Barotrauma
        public Vector3 Position;

        public float NetworkUpdateTimer;
-        public const float NetworkUpdateInterval = 0.2f;

        public float Scale;