(0c3442136) Merge branch 'dev' into docking-interface

2019-05-03 13:41:23 +03:00
parent 45ba589d96
commit fbb7daed00
53 changed files with 1442 additions and 713 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)