(3e7222290) Merge branch 'dev' of https://github.com/Regalis11/Barotrauma-development into dev

This commit is contained in:
Joonas Rikkonen
2019-04-05 16:11:59 +03:00
parent 7007804063
commit af1970e8a4
2 changed files with 91 additions and 11 deletions
@@ -20,7 +20,7 @@ namespace Barotrauma
public static bool EditWater, EditFire;
public const float OxygenDistributionSpeed = 500.0f;
public const float OxygenDeteriorationSpeed = 0.3f;
public const float OxygenConsumptionSpeed = 1000.0f;
public const float OxygenConsumptionSpeed = 700.0f;
public const int WaveWidth = 32;
public static float WaveStiffness = 0.02f;