Merge pull request #288 from Amsterdam/release/2.6.2

Release/2.6.2
Amsterdam · Jul 27, 2021 · 5403dda · 5403dda
2 parents afcc0b2 + 2d180f7
commit 5403dda
Show file tree

Hide file tree

Showing 114 changed files with 19,944 additions and 3,309 deletions.
diff --git a/3DAmsterdam/.collabignore b/3DAmsterdam/.collabignore
@@ -0,0 +1,33 @@
+# ===========================
+# Default Collab Ignore Rules
+# ===========================
+
+# OS Generated
+# ============
+.DS_Store
+._*
+.Spotlight-V100
+.Trashes
+Icon?
+ehthumbs.db
+[Tt]humbs.db
+[Dd]esktop.ini
+
+# Visual Studio / MonoDevelop generated
+# =====================================
+[Ee]xported[Oo]bj/
+*.userprefs
+*.csproj
+*.pidb
+*.suo
+*.sln
+*.user
+*.unityproj
+*.booproj
+
+# Unity generated
+# ===============
+[Oo]bj/
+[Bb]uild
+sysinfo.txt
+*.stackdump
diff --git a/3DAmsterdam/Assets/3DAmsterdam/Prefabs/Terrain.prefab b/3DAmsterdam/Assets/3DAmsterdam/Prefabs/Terrain.prefab
diff --git a/3DAmsterdam/Assets/3DAmsterdam/Scenes/3DAmsterdam.unity b/3DAmsterdam/Assets/3DAmsterdam/Scenes/3DAmsterdam.unity
diff --git a/3DAmsterdam/Assets/Netherlands3D/Input/ActionHandler.cs b/3DAmsterdam/Assets/Netherlands3D/Input/ActionHandler.cs
@@ -13,7 +13,6 @@ namespace Netherlands3D.InputHandler
     /// </summary>
     /// 
     //TODO: When old input system is needed, replace parts in this script that require new input system
-    [DefaultExecutionOrder(-1000)]
     public class ActionHandler:MonoBehaviour
     {
 

diff --git a/3DAmsterdam/Assets/Netherlands3D/Materials/Utilities/MaskingBlock.mat b/3DAmsterdam/Assets/Netherlands3D/Materials/Utilities/MaskingBlock.mat
diff --git a/...etherlands3D/Materials/Utilities/Grid.mat → ...nds3D/Materials/Utilities/MeasureLine.mat b/...etherlands3D/Materials/Utilities/Grid.mat → ...nds3D/Materials/Utilities/MeasureLine.mat
diff --git a/...lands3D/Materials/Utilities/Grid.mat.meta → .../Materials/Utilities/MeasureLine.mat.meta b/...lands3D/Materials/Utilities/Grid.mat.meta → .../Materials/Utilities/MeasureLine.mat.meta
diff --git a/3DAmsterdam/Assets/Netherlands3D/Materials/Utilities/MeasureLineDashed.mat b/3DAmsterdam/Assets/Netherlands3D/Materials/Utilities/MeasureLineDashed.mat