Merge branch 'master' of https://github.com/Regalis11/Barotrauma into develop

This commit is contained in:
EvilFactory
2023-03-13 13:32:14 -03:00
335 changed files with 11052 additions and 5179 deletions
@@ -61,10 +61,7 @@ namespace Barotrauma
GameMain.GameSession?.CrewManager?.AutoShowCrewList();
#endif
foreach (MapEntity entity in MapEntity.mapEntityList)
{
entity.IsHighlighted = false;
}
MapEntity.ClearHighlightedEntities();
#if RUN_PHYSICS_IN_SEPARATE_THREAD
var physicsThread = new Thread(ExecutePhysics)
@@ -139,10 +136,7 @@ namespace Barotrauma
{
if (body.Enabled && body.BodyType != FarseerPhysics.BodyType.Static) { body.Update(); }
}
foreach (MapEntity e in MapEntity.mapEntityList)
{
e.IsHighlighted = false;
}
MapEntity.ClearHighlightedEntities();
#if CLIENT
var sw = new System.Diagnostics.Stopwatch();