(975eacb57) Merge branch 'dev' of https://github.com/Regalis11/Barotrauma-development into dev

2019-05-07 16:23:16 +03:00
parent bb6067df31
commit 482f3c1f3c
24 changed files with 200 additions and 97 deletions
@@ -166,9 +166,7 @@ namespace Barotrauma
            get { return enabled; }
            set { enabled = value; }
        }
-
-        public bool TileSprites;
-
+        
        private static GUITextBlock toolTipBlock;

        public Vector2 Center