(a2943d8b7) Merge branch 'dev' into human-ai

2019-05-16 05:04:10 +03:00
parent 60f52375e6
commit 039d07f693
76 changed files with 1407 additions and 856 deletions
@@ -25,6 +25,8 @@ namespace Barotrauma

        private bool removed;

+        private bool removed;
+
 #if CLIENT
        private List<Decal> burnDecals = new List<Decal>();
 #endif