Merge branch 'Master' into Develop

Author: nibsbin

Core/Game/Managers/ClientManager.cs

@@ -1,4 +1,4 @@
-using UnityEngine;
+using UnityEngine;
 
 public class OrderMarker : MonoBehaviour
 {

Core/Game/Managers/ServerSimulator.cs

@@ -1,4 +1,4 @@
-using UnityEngine;
+using UnityEngine;
 using System;
 
 namespace Lockstep.UI

Core/Game/Player/OrderMarker.cs

@@ -1,24 +1,23 @@
 using UnityEngine;
 using FastCollections;
 using Lockstep;
-using System.Collections.Generic;
 
 //Blocker for static environment pieces in a scene.
 [RequireComponent(typeof(UnityLSBody))]
 public class Blocker : EnvironmentObject
 {
-    static readonly FastList<Vector2d> bufferCoordinates = new FastList<Vector2d>();
+	static readonly FastList<Vector2d> bufferCoordinates = new FastList<Vector2d>();
 
-    [SerializeField]
-    private bool _blockPathfinding = true;
-    public bool BlockPathfinding { get { return _blockPathfinding; } }
+	[SerializeField]
+	private bool _blockPathfinding = true;
+	public bool BlockPathfinding { get { return _blockPathfinding; } }
 
 
-    public LSBody CachedBody { get; private set; }
+	public LSBody CachedBody { get; private set; }
 
-    protected override void OnLateInitialize()
-    {
-        base.OnInitialize();
+	protected override void OnLateInitialize()
+	{
+		base.OnInitialize();
 
         CachedBody = this.GetComponent<UnityLSBody>().InternalBody;
 

Core/Game/Player/UI/StatsBar.cs

@@ -60,4 +60,4 @@ public static void CircleCast(Vector2d position, long radius, FastList<LSBody> o
 			}
 		}
 	}
-}
+}