(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
@@ -365,9 +365,9 @@ namespace Barotrauma
            OnDeselected?.Invoke(this, Keys.None);
        }

-        public override void Flash(Color? color = null, float flashDuration = 1.5f)
+        public override void Flash(Color? color = null, float flashDuration = 1.5f, bool useRectangleFlash = false, Vector2? flashRectOffset = null)
        {
-            textBlock.Flash(color, flashDuration);
+            textBlock.Flash(color, flashDuration, useRectangleFlash, flashRectOffset);
        }
        
        protected override void Update(float deltaTime)