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/DebugConsole.cs
+++ b/Subsurface/Source/DebugConsole.cs
@@ -495,10 +495,6 @@ namespace Barotrauma
                case "fire":
                    if (GameMain.Client == null) Hull.EditFire = !Hull.EditFire;
                    
-                    break;
-                case "generatelevel":
-                    GameMain.Level = new Level("asdf", 50.0f, 500,500, 50);
-                    GameMain.Level.Generate();
                    break;
                case "fixitems":
                    foreach (Item it in Item.ItemList)