Merge branch 'master' into animcontroller-overhaul

2016-10-19 21:15:44 +03:00
parent e2d0e7fe24 8cb9450217
commit 92b61ee816
9 changed files with 116 additions and 29 deletions
@@ -67,6 +67,16 @@ namespace Barotrauma
        
        public SpriteEffects SpriteEffects = SpriteEffects.None;

+        public bool resizeHorizontal
+        {
+            get { return prefab.resizeHorizontal; }
+        }
+
+        public bool resizeVertical
+        {
+            get { return prefab.resizeVertical; }
+        }
+
        private bool flippedX;

        public override Sprite Sprite