Merge branch 'level-gen-overhaul'

2016-09-27 20:19:29 +03:00
parent 790212a20b 9b15d2f894
commit 2bdc7441fc
20 changed files with 712 additions and 253 deletions
@@ -206,6 +206,7 @@ namespace Barotrauma

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