v0.14.6.0

This commit is contained in:
Joonas Rikkonen
2021-06-17 17:54:52 +03:00
parent 3f324b14e8
commit c27e2ea5ab
348 changed files with 13156 additions and 4266 deletions
@@ -186,16 +186,12 @@ namespace Barotrauma.Networking
if (updateReturnTimer > 1.0f)
{
updateReturnTimer = 0.0f;
if (shuttleSteering != null)
{
shuttleSteering.SetDestinationLevelStart();
}
UpdateReturningProjSpecific();
shuttleSteering?.SetDestinationLevelStart();
UpdateReturningProjSpecific(deltaTime);
}
}
partial void UpdateReturningProjSpecific();
partial void UpdateReturningProjSpecific(float deltaTime);
private IEnumerable<object> ForceShuttleToPos(Vector2 position, float speed)
{
@@ -278,6 +274,7 @@ namespace Barotrauma.Networking
if (hull.Submarine != RespawnShuttle) { continue; }
hull.OxygenPercentage = 100.0f;
hull.WaterVolume = 0.0f;
hull.BallastFlora?.Kill();
}
foreach (Character c in Character.CharacterList)