(133a5b1da) Merge branch 'dev' into human-ai

This commit is contained in:
Joonas Rikkonen
2019-05-16 05:27:51 +03:00
parent ab49749f8b
commit 3bce90251a
17 changed files with 150 additions and 238 deletions
@@ -17,6 +17,8 @@ namespace Barotrauma.Items.Components
Passive
};
private bool dynamicDockingIndicator = true;
private bool unsentChanges;
private float networkUpdateTimer;
@@ -653,7 +655,7 @@ namespace Barotrauma.Items.Components
Vector2 dockingDir = sourcePortPos - targetPortPos;
Vector2 normalizedDockingDir = Vector2.Normalize(dockingDir);
if (!DynamicDockingIndicator)
if (!dynamicDockingIndicator)
{
if (steering.DockingSource.IsHorizontal)
{