(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
@@ -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)