Merge branch 'master' of https://bitbucket.org/Regalis11/repo

Conflicts: Subsurface_Solution.v12.suo
2015-06-21 22:48:36 +03:00
parent 24ba9b1b98 b45073fdec
commit 2c4eb52d41
8 changed files with 1271 additions and 1 deletions
--- a/Subsurface/DebugConsole.cs
+++ b/Subsurface/DebugConsole.cs
@@ -204,6 +204,9 @@ namespace Subsurface
                        Hull.EditWater = !Hull.EditWater;
                    }
                    break;
+                case "generatelevel":
+                    Game1.Level = new Level(Game1.localRandom.Next(), 20, 5000, 5000);
+                    break;
                case "fowenabled":
                case "fow":
                case "drawfow":