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

Merge branch 'master' into new-netcode

Browse Source 
Conflicts:
	Subsurface/Properties/AssemblyInfo.cs
	Subsurface/Source/Characters/Animation/HumanoidAnimController.cs
	Subsurface/Source/Characters/Character.cs
	Subsurface/Source/Items/Components/Door.cs
	Subsurface/Source/Items/Components/Power/PowerContainer.cs
	Subsurface/Source/Items/Components/Signal/Wire.cs
	Subsurface/Source/Items/Item.cs
	Subsurface/Source/Networking/ChatMessage.cs
	Subsurface/Source/Networking/GameClient.cs
	Subsurface/Source/Networking/GameServer.cs
	Subsurface/Source/Networking/GameServerLogin.cs
	Subsurface/Source/Networking/GameServerSettings.cs
	Subsurface/Source/Networking/NetworkMember.cs
This commit is contained in:
Regalis
2016-11-24 19:43:45 +02:00
parent 0c9a55e9e0 12f98268b5
commit adde3461ea
93 changed files with 1872 additions and 683 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
Subsurface/Source/GameSession/GameSession.cs
View File

@@ -161,7 +161,7 @@ namespace Barotrauma
}
}
public void StartShift(string levelSeed, bool loadSecondSub = true)
public void StartShift(string levelSeed, bool loadSecondSub = false)
{
Level level = Level.CreateRandom(levelSeed);
@@ -362,6 +362,17 @@ namespace Barotrauma
}
public void AddToGUIUpdateList()
{
if (CrewManager != null) CrewManager.AddToGUIUpdateList();
if (gameMode != null) gameMode.AddToGUIUpdateList();
infoButton.AddToGUIUpdateList();
if (infoFrame != null) infoFrame.AddToGUIUpdateList();
}
public void Update(float deltaTime)
{
TaskManager.Update(deltaTime);