Merged branch master into new-netcode

2016-09-27 19:45:14 -03:00
parent ff326bdc00 2bdc7441fc
commit fc8eab688d
20 changed files with 712 additions and 253 deletions
--- a/Subsurface/Source/GameMain.cs
+++ b/Subsurface/Source/GameMain.cs
@@ -218,6 +218,7 @@ namespace Barotrauma

            Mission.Init();
            MapEntityPrefab.Init();
+            LevelGenerationParams.LoadPresets();
            TitleScreen.LoadState = 10.0f;
        yield return CoroutineStatus.Running;