vlad.os/LuaCsForBarotraumaEP
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'refs/remotes/barotrauma/combat-mission'

Browse Source 
Conflicts:
	Subsurface/Source/GUI/GUIListBox.cs
This commit is contained in:
juanjp600
2016-10-04 22:30:29 -03:00
parent 4874ad2ef8 bddcc36673
commit 14ae355f19
29 changed files with 525 additions and 440 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
Subsurface/Source/Networking/GameServer.cs
View File

@@ -284,6 +284,8 @@ namespace Barotrauma.Networking
{
if (ShowNetStats) netStats.Update(deltaTime);
if (settingsFrame != null) settingsFrame.Update(deltaTime);
if (log.LogFrame != null) log.LogFrame.Update(deltaTime);
if (!started) return;
@@ -302,8 +304,6 @@ namespace Barotrauma.Networking
if (gameStarted)
{
//inGameHUD.Update((float)Physics.step);
if (respawnManager != null) respawnManager.Update(deltaTime);
bool isCrewDead =
@@ -1336,7 +1336,6 @@ namespace Barotrauma.Networking
}
else if (log.LogFrame!=null)
{
log.LogFrame.Update(0.016f);
log.LogFrame.Draw(spriteBatch);
}