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/AICharacter.cs
	Subsurface/Source/Characters/Animation/HumanoidAnimController.cs
	Subsurface/Source/Characters/Character.cs
	Subsurface/Source/GameMain.cs
	Subsurface/Source/Items/Components/Signal/Connection.cs
	Subsurface/Source/Items/Item.cs
	Subsurface/Source/Networking/GameServer.cs
	Subsurface/Source/Networking/GameServerLogin.cs
	Subsurface/Source/Physics/PhysicsBody.cs
This commit is contained in:
Regalis
2017-03-11 13:24:09 +02:00
parent c851770386 ede3f1c393
commit 5bdb57b98a
264 changed files with 31522 additions and 704 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
Subsurface/Source/GameMain.cs
View File

@@ -103,6 +103,12 @@ namespace Barotrauma
{
get { return NetworkMember as GameClient; }
}
public double TotalElapsedTime
{
get;
private set;
}
public GameMain()
{
@@ -202,6 +208,7 @@ namespace Barotrauma
public IEnumerable<object> Load()
{
GUI.GraphicsDevice = GraphicsDevice;
GUI.Init(Content);
GUIComponent.Init(Window);
@@ -215,7 +222,7 @@ namespace Barotrauma
TitleScreen.LoadState = 1.0f;
yield return CoroutineStatus.Running;
GUI.LoadContent(GraphicsDevice);
GUI.LoadContent();
TitleScreen.LoadState = 2.0f;
yield return CoroutineStatus.Running;
@@ -306,6 +313,8 @@ namespace Barotrauma
while (Timing.Accumulator >= Timing.Step)
{
TotalElapsedTime = gameTime.TotalGameTime.TotalSeconds;
fixedTime.IsRunningSlowly = gameTime.IsRunningSlowly;
TimeSpan addTime = new TimeSpan(0, 0, 0, 0, 16);
fixedTime.ElapsedGameTime = addTime;