(7e3aa6097) Merge remote-tracking branch 'origin/docking-interface' into dev

2019-05-03 13:48:31 +03:00
parent 8d3a48584b
commit 3701f0e957
12 changed files with 603 additions and 622 deletions
@@ -128,7 +128,7 @@ namespace Barotrauma
        protected Color flashColor;
        protected float flashDuration = 1.5f;
        private bool useRectangleFlash;
-        public float FlashTimer
+        public virtual float FlashTimer
        {
            get { return flashTimer; }
        }