Merge branch 'master' into dedicated-server

# Conflicts: # BarotraumaClient/Source/GameSettings.cs # BarotraumaClient/Source/Screens/NetLobbyScreen.cs
2017-06-23 10:21:02 -03:00
parent 3b343899c0 5d5923ab28
commit 1dc255bc2f
16 changed files with 288 additions and 92 deletions
@@ -17,6 +17,15 @@ namespace Barotrauma

        private bool sparks, shockwave, flames, smoke;

+        public Explosion(float range, float force, float damage, float structureDamage)
+        {
+            attack = new Attack(damage, structureDamage, 0.0f, range);
+            this.force = force;
+            sparks = true;
+            shockwave = true;
+            flames = true;
+        }
+
        public Explosion(XElement element)
        {
            attack = new Attack(element);