(cc26984a5) Merge remote-tracking branch 'origin/dev' into human-ai

2019-05-16 05:45:37 +03:00
parent 04997cd2f3
commit 68ced76e1b
53 changed files with 791 additions and 243 deletions
@@ -166,9 +166,7 @@ namespace Barotrauma
            get { return enabled; }
            set { enabled = value; }
        }
-
-        public bool TileSprites;
-
+        
        private static GUITextBlock toolTipBlock;

        public Vector2 Center