(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
@@ -136,6 +136,17 @@ namespace Barotrauma
            }
        }

+        public GUIButton CPRButton
+        {
+            get { return cprButton; }
+        }
+
+        public float HealthBarPulsateTimer
+        {
+            get { return healthBarPulsateTimer; }
+            set { healthBarPulsateTimer = MathHelper.Clamp(value, 0.0f, 10.0f); }
+        }
+
        static CharacterHealth()
        {
            damageOverlay = new Sprite("Content/UI/damageOverlay.png", Vector2.Zero);