Unstable v0.10.6.0 (October 13th 2020)

This commit is contained in:
Juan Pablo Arce
2020-10-13 12:59:45 -03:00
parent 768f516e7c
commit 6b36bf809d
59 changed files with 1036 additions and 421 deletions
@@ -1340,6 +1340,9 @@ namespace Barotrauma
decalsCleaned = true;
#if SERVER
decalUpdatePending = true;
#elif CLIENT
pendingDecalUpdates.Add(decal);
networkUpdatePending = true;
#endif
}
}
@@ -833,7 +833,7 @@ namespace Barotrauma
if (location.Discovered)
{
#if CLIENT
RemoveFogOfWar(StartLocation);
RemoveFogOfWar(location);
#endif
if (furthestDiscoveredLocation == null || location.MapPosition.X > furthestDiscoveredLocation.MapPosition.X)
{
@@ -50,7 +50,7 @@ namespace Barotrauma
//observable collection because some entities may need to be notified when the collection is modified
public readonly ObservableCollection<MapEntity> linkedTo = new ObservableCollection<MapEntity>();
private bool flippedX, flippedY;
protected bool flippedX, flippedY;
public bool FlippedX { get { return flippedX; } }
public bool FlippedY { get { return flippedY; } }
@@ -534,7 +534,7 @@ namespace Barotrauma
public virtual void FlipX(bool relativeToSub)
{
flippedX = !flippedX;
if (!relativeToSub || Submarine == null) return;
if (!relativeToSub || Submarine == null) { return; }
Vector2 relative = WorldPosition - Submarine.WorldPosition;
relative.Y = 0.0f;
@@ -548,7 +548,7 @@ namespace Barotrauma
public virtual void FlipY(bool relativeToSub)
{
flippedY = !flippedY;
if (!relativeToSub || Submarine == null) return;
if (!relativeToSub || Submarine == null) { return; }
Vector2 relative = WorldPosition - Submarine.WorldPosition;
relative.X = 0.0f;