Merge branch 'Master' into Develop

SnpM · May 5, 2019 · d7819df · d7819df
2 parents 50dde04 + 4751069
commit d7819df
Show file tree

Hide file tree

Showing 19 changed files with 11 additions and 12 deletions.
diff --git a/Core/Game/Managers/ClientManager.cs b/Core/Game/Managers/ClientManager.cs
diff --git a/Core/Game/Managers/ServerSimulator.cs b/Core/Game/Managers/ServerSimulator.cs
diff --git a/Core/Game/Player/OrderMarker.cs b/Core/Game/Player/OrderMarker.cs
@@ -1,4 +1,4 @@
-using UnityEngine;
+using UnityEngine;
 
 public class OrderMarker : MonoBehaviour
 {

diff --git a/Core/Game/Player/UI/StatsBar.cs b/Core/Game/Player/UI/StatsBar.cs
@@ -1,4 +1,4 @@
-using UnityEngine;
+using UnityEngine;
 using System;
 
 namespace Lockstep.UI

diff --git a/Core/Simulation/Grid/Core/GridNode.cs b/Core/Simulation/Grid/Core/GridNode.cs
diff --git a/Core/Simulation/Grid/Utility/Tools/Blocker/Blocker.cs b/Core/Simulation/Grid/Utility/Tools/Blocker/Blocker.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;
 

diff --git a/Core/Simulation/Physics/Core/PhysicsTool.cs b/Core/Simulation/Physics/Core/PhysicsTool.cs
@@ -60,4 +60,4 @@ public static void CircleCast(Vector2d position, long radius, FastList<LSBody> o
 			}
 		}
 	}
-}
+}
diff --git a/Core/Utility/Array2D.cs b/Core/Utility/Array2D.cs
diff --git a/Core/Utility/LSUtility.cs b/Core/Utility/LSUtility.cs
diff --git a/Core/Utility/MessageSystem/DefaultMessageRaiser.cs b/Core/Utility/MessageSystem/DefaultMessageRaiser.cs
diff --git a/Core/Utility/PathObject/Core/Editor/EditorPathObject.cs b/Core/Utility/PathObject/Core/Editor/EditorPathObject.cs
diff --git a/Core/Utility/Serialization/Compressor.cs b/Core/Utility/Serialization/Compressor.cs
diff --git a/Core/Utility/Serialization/Editor/Injector.cs b/Core/Utility/Serialization/Editor/Injector.cs
diff --git a/Extra/BuildSystem/BuildGrid/GridBuilder.cs b/Extra/BuildSystem/BuildGrid/GridBuilder.cs
diff --git a/Integration/Editor/CustomPropertyDrawers/CustomPropertyDrawers.cs b/Integration/Editor/CustomPropertyDrawers/CustomPropertyDrawers.cs
diff --git a/Integration/Editor/EditorCerealBehaviour.cs b/Integration/Editor/EditorCerealBehaviour.cs
diff --git a/Integration/Editor/LSEditorUtility.cs b/Integration/Editor/LSEditorUtility.cs
diff --git a/Integration/Environment/Heightmap/HeightmapSaver.cs b/Integration/Environment/Heightmap/HeightmapSaver.cs
diff --git a/Integration/Test/GridDebugger.cs b/Integration/Test/GridDebugger.cs