Unstable 0.15.15.0 (and the one before it I forgor)

This commit is contained in:
Markus Isberg
2021-11-18 21:34:30 +09:00
parent 10e5fd5f3e
commit 80f39cd2a3
257 changed files with 4916 additions and 2582 deletions
@@ -95,7 +95,7 @@ namespace Barotrauma
MathHelper.Clamp(particlePos.Y, hull.WorldRect.Y - hull.WorldRect.Height, hull.WorldRect.Y));
}
private IEnumerable<object> DimLight(LightSource light)
private IEnumerable<CoroutineStatus> DimLight(LightSource light)
{
float currBrightness = 1.0f;
while (light.Color.A > 0.0f && flashDuration > 0.0f)
@@ -438,7 +438,7 @@ namespace Barotrauma
for (int i = 0; i < Bodies.Count; i++)
{
Vector2 pos = FarseerPhysics.ConvertUnits.ToDisplayUnits(Bodies[i].Position);
if (Submarine != null) pos += Submarine.Position;
if (Submarine != null) { pos += Submarine.DrawPosition; }
pos.Y = -pos.Y;
GUI.DrawRectangle(spriteBatch,
pos,
@@ -202,6 +202,7 @@ namespace Barotrauma
}
}
GUITextBlock.AutoScaleAndNormalize(parent.Content.GetAllChildren<GUITextBlock>().Where(c => c != submarineNameText && c != descBlock));
parent.ForceLayoutRecalculation();
}
}
}