Merge branch 'master' into new-netcode

Conflicts: Subsurface/Properties/AssemblyInfo.cs Subsurface/Source/Items/Components/DockingPort.cs Subsurface/Source/Items/Components/Signal/Wire.cs Subsurface/Source/Items/Item.cs
2016-12-29 22:18:27 +02:00
parent 020aac55ea 12b7290bad
commit 1f07b18e5b
134 changed files with 1799 additions and 683 deletions
@@ -901,6 +901,8 @@ namespace Barotrauma.Networking
                if (autoRestart) AutoRestartTimer = Math.Max(AutoRestartInterval, 5.0f);
                GameMain.NetLobbyScreen.StartButton.Enabled = true;

+                UpdateNetLobby(null, null);
+
                couldNotStart = true;
            }