(42d13c09f) Merge remote-tracking branch 'origin/tutorial-rework' into dev

2019-04-25 18:07:37 +03:00
parent 99344e4031
commit e83dba2959
53 changed files with 3623 additions and 550 deletions
@@ -168,6 +168,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