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

2019-05-16 05:14:00 +03:00
parent 8be0b0676e
commit bec7aadfa9
65 changed files with 1579 additions and 1449 deletions
@@ -174,6 +174,11 @@ namespace Barotrauma
            if (frame != null) frame.ApplyStyle(style);
        }

+        public override void Flash(Color? color = null, float flashDuration = 1.5f, bool useRectangleFlash = false, Vector2? flashRectInflate = null)
+        {
+            Frame.Flash(color, flashDuration, useRectangleFlash, flashRectInflate);
+        }
+
        protected override void Draw(SpriteBatch spriteBatch)
        {
            //do nothing