Bug fixing

Domsmasher1 · Nov 2, 2021 · 345dd57 · 345dd57
1 parent 886e072
commit 345dd57
Show file tree

Hide file tree

Showing 153 changed files with 321 additions and 1,559 deletions.
diff --git a/Features/Erosion/Implementing/Assets/Scenes/Testing voxels V2 (3d objects).unity b/Features/Erosion/Implementing/Assets/Scenes/Testing voxels V2 (3d objects).unity
@@ -38,7 +38,7 @@ RenderSettings:
   m_ReflectionIntensity: 1
   m_CustomReflection: {fileID: 0}
   m_Sun: {fileID: 0}
-  m_IndirectSpecularColor: {r: 0.44657898, g: 0.4964133, b: 0.5748178, a: 1}
+  m_IndirectSpecularColor: {r: 0.4465782, g: 0.49641252, b: 0.5748167, a: 1}
   m_UseRadianceAmbientProbe: 0
 --- !u!157 &3
 LightmapSettings:
@@ -1424,7 +1424,6 @@ GameObject:
   - component: {fileID: 2110237123}
   - component: {fileID: 2110237122}
   - component: {fileID: 2110237125}
-  - component: {fileID: 2110237126}
   m_Layer: 5
   m_Name: PauseMenu
   m_TagString: Untagged
@@ -1525,18 +1524,6 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 9882b0d187501854c810b9e41647c83e, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
+  lockCursor: 1
   pauseMenuUI: {fileID: 1267862844}
   hitMarkerUI: {fileID: 1660231439}
---- !u!114 &2110237126
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 2110237120}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: f3cf022b25974454088efb392e5f39c5, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  lockCursor: 1
diff --git a/Features/Erosion/Implementing/Assets/Scripts/Curserlock.cs b/Features/Erosion/Implementing/Assets/Scripts/Curserlock.cs
diff --git a/Features/Erosion/Implementing/Assets/Scripts/Curserlock.cs.meta b/Features/Erosion/Implementing/Assets/Scripts/Curserlock.cs.meta
diff --git a/Features/Erosion/Implementing/Assets/Scripts/PauseMenu.cs b/Features/Erosion/Implementing/Assets/Scripts/PauseMenu.cs
@@ -5,6 +5,8 @@
 public class PauseMenu : MonoBehaviour
 {
     public static bool GameIsPaused = false;
+    public static bool ChangeMouse = false;
+    public bool lockCursor = true;
 
     public GameObject pauseMenuUI;
     public GameObject hitMarkerUI;
@@ -17,7 +19,7 @@ void Start()
     }
     void Update()
     {
-     if (Input.GetKeyDown(KeyCode.Escape))
+        if (Input.GetKeyDown(KeyCode.Escape))
         {
             if (GameIsPaused)
             {
@@ -26,7 +28,10 @@ void Update()
             {
                 Pause();
             }
+           lockCursor = !lockCursor;
         }
+        Cursor.lockState = lockCursor ? CursorLockMode.Locked : CursorLockMode.None;
+        Cursor.visible = !lockCursor;
     }
     public void Resume ()
     {
@@ -35,6 +40,10 @@ public void Resume ()
         GameIsPaused = false;
         hitMarkerUI.SetActive(true);
 
+        Cursor.lockState = lockCursor ? CursorLockMode.Locked : CursorLockMode.None;
+        Cursor.visible = !lockCursor;
+
+        lockCursor = !lockCursor;
     }
     void Pause ()
     {

diff --git a/Features/Erosion/Implementing/Library/ArtifactDB b/Features/Erosion/Implementing/Library/ArtifactDB
diff --git a/Features/Erosion/Implementing/Library/Artifacts/10/10f546d8d44340586427af80a14d57d4 b/Features/Erosion/Implementing/Library/Artifacts/10/10f546d8d44340586427af80a14d57d4
diff --git a/...facts/f2/f216736d70ccc5b5a849115e2fce0593 → ...facts/1a/1a8f33e01c295f9bf24ddd24231bffd9 b/...facts/f2/f216736d70ccc5b5a849115e2fce0593 → ...facts/1a/1a8f33e01c295f9bf24ddd24231bffd9
diff --git a/...facts/16/1655fbd1d052abd9bbfb0aca4870937e → ...facts/1d/1d6caa9151c7d08068eacec2f48eba89 b/...facts/16/1655fbd1d052abd9bbfb0aca4870937e → ...facts/1d/1d6caa9151c7d08068eacec2f48eba89
diff --git a/...facts/90/909e9279e799bb444f620ae8d6602397 → ...facts/1d/1da1518c36c31b12b33a5f957b3b5e77 b/...facts/90/909e9279e799bb444f620ae8d6602397 → ...facts/1d/1da1518c36c31b12b33a5f957b3b5e77
diff --git a/Features/Erosion/Implementing/Library/Artifacts/2f/2f1b4a87a8e764d64efbdfec682782d5 b/Features/Erosion/Implementing/Library/Artifacts/2f/2f1b4a87a8e764d64efbdfec682782d5
diff --git a/...facts/de/deddf645689decc90024c093f9151a1a → ...facts/3a/3a646904862040744b48f841bfc9e2fd b/...facts/de/deddf645689decc90024c093f9151a1a → ...facts/3a/3a646904862040744b48f841bfc9e2fd
diff --git a/Features/Erosion/Implementing/Library/Artifacts/52/52758a8f2268868719a159d90490c696 b/Features/Erosion/Implementing/Library/Artifacts/52/52758a8f2268868719a159d90490c696
diff --git a/Features/Erosion/Implementing/Library/Artifacts/52/52ecd96d49a63d8ae3f75ff088955136 b/Features/Erosion/Implementing/Library/Artifacts/52/52ecd96d49a63d8ae3f75ff088955136
diff --git a/...facts/e0/e01e7b57facc3b87960a29a4b5039a9b → ...facts/60/6072475941609e3194e3b6fecd0e14fd b/...facts/e0/e01e7b57facc3b87960a29a4b5039a9b → ...facts/60/6072475941609e3194e3b6fecd0e14fd
diff --git a/Features/Erosion/Implementing/Library/Artifacts/63/63c017be34e0dd50e681a949d7756c28 b/Features/Erosion/Implementing/Library/Artifacts/63/63c017be34e0dd50e681a949d7756c28
diff --git a/Features/Erosion/Implementing/Library/Artifacts/74/742ba25467baa7193efa4efda3199242 b/Features/Erosion/Implementing/Library/Artifacts/74/742ba25467baa7193efa4efda3199242
diff --git a/Features/Erosion/Implementing/Library/Artifacts/75/75c16b140906af139e62b988331bea19 b/Features/Erosion/Implementing/Library/Artifacts/75/75c16b140906af139e62b988331bea19
diff --git a/Features/Erosion/Implementing/Library/Artifacts/88/886e9afeeeae6276fa78468dd0bfde1d b/Features/Erosion/Implementing/Library/Artifacts/88/886e9afeeeae6276fa78468dd0bfde1d
diff --git a/...facts/83/830f34864671e6c2e5b050f2d10c95d6 → ...facts/95/955d9181342676ded1948fb2632c4c18 b/...facts/83/830f34864671e6c2e5b050f2d10c95d6 → ...facts/95/955d9181342676ded1948fb2632c4c18
diff --git a/Features/Erosion/Implementing/Library/Artifacts/a5/a597321ba38b95da65754f1d9deb889d b/Features/Erosion/Implementing/Library/Artifacts/a5/a597321ba38b95da65754f1d9deb889d
diff --git a/...facts/60/60ee7b83cf14c3b63dd839517180d955 → ...facts/a8/a8ac9430fc4fe5670942f7192e01441e b/...facts/60/60ee7b83cf14c3b63dd839517180d955 → ...facts/a8/a8ac9430fc4fe5670942f7192e01441e
diff --git a/Features/Erosion/Implementing/Library/Artifacts/b8/b8ccbc0ba6884083c47b4565292cfb40 b/Features/Erosion/Implementing/Library/Artifacts/b8/b8ccbc0ba6884083c47b4565292cfb40
diff --git a/Features/Erosion/Implementing/Library/Artifacts/be/bea8c490a87a58d91bc2f9bfccf94c61 b/Features/Erosion/Implementing/Library/Artifacts/be/bea8c490a87a58d91bc2f9bfccf94c61
diff --git a/...facts/80/80a5e5f1d36bd054ebbd4cc930c66883 → ...facts/bf/bfafe1fc94205e3d44b29966204d796d b/...facts/80/80a5e5f1d36bd054ebbd4cc930c66883 → ...facts/bf/bfafe1fc94205e3d44b29966204d796d
diff --git a/...facts/cc/cc49527aa8f4596729b5a3f17c4ca4a3 → ...facts/c5/c5db04b78fd1443e69abf2f4617d43ef b/...facts/cc/cc49527aa8f4596729b5a3f17c4ca4a3 → ...facts/c5/c5db04b78fd1443e69abf2f4617d43ef
diff --git a/Features/Erosion/Implementing/Library/Artifacts/cc/cc103b55738e9aa5112bf91e53febb9b b/Features/Erosion/Implementing/Library/Artifacts/cc/cc103b55738e9aa5112bf91e53febb9b
diff --git a/Features/Erosion/Implementing/Library/Artifacts/d5/d5746e996f88fb4b03b4af70af28dd21 b/Features/Erosion/Implementing/Library/Artifacts/d5/d5746e996f88fb4b03b4af70af28dd21
diff --git a/Features/Erosion/Implementing/Library/Artifacts/e2/e2347e2384a8e4090b78c04c7cf1d69f b/Features/Erosion/Implementing/Library/Artifacts/e2/e2347e2384a8e4090b78c04c7cf1d69f
diff --git a/Features/Erosion/Implementing/Library/Artifacts/ee/eee75cfb177ce5322c55b8b31f7cea5e b/Features/Erosion/Implementing/Library/Artifacts/ee/eee75cfb177ce5322c55b8b31f7cea5e
diff --git a/...facts/79/79b523ec1a8c111520ffcce009e5273c → ...facts/f6/f634284e272e75dd1cca6c38ce489da2 b/...facts/79/79b523ec1a8c111520ffcce009e5273c → ...facts/f6/f634284e272e75dd1cca6c38ce489da2
diff --git a/Features/Erosion/Implementing/Library/BuildPlayerData/Editor/TypeDb-All.json b/Features/Erosion/Implementing/Library/BuildPlayerData/Editor/TypeDb-All.json
diff --git a/Features/Erosion/Implementing/Library/BuildPlayerData/Player/TypeDb-All.json b/Features/Erosion/Implementing/Library/BuildPlayerData/Player/TypeDb-All.json
diff --git a/Features/Erosion/Implementing/Library/BuildPlayerData/response.rsp b/Features/Erosion/Implementing/Library/BuildPlayerData/response.rsp
@@ -1,23 +1,23 @@
--a="C:\Users\Dominic\Desktop\Realistic-Terain-Creation\Features\Erosion\Implementing\Library\PlayerScriptAssemblies\Assembly-CSharp.dll"
--a="C:\Users\Dominic\Desktop\Realistic-Terain-Creation\Features\Erosion\Implementing\Library\PlayerScriptAssemblies\UnityEngine.TestRunner.dll"
--a="C:\Users\Dominic\Desktop\Realistic-Terain-Creation\Features\Erosion\Implementing\Library\PlayerScriptAssemblies\Unity.Timeline.dll"
--a="C:\Users\Dominic\Desktop\Realistic-Terain-Creation\Features\Erosion\Implementing\Library\PlayerScriptAssemblies\Unity.TextMeshPro.dll"
--a="C:\Users\Dominic\Desktop\Realistic-Terain-Creation\Features\Erosion\Implementing\Library\PlayerScriptAssemblies\UnityEngine.UI.dll"
--a="C:\Users\Dominic\Desktop\Realistic-Terain-Creation\Features\Erosion\Implementing\Library\PackageCache\[email protected]\Runtime\AOT\Newtonsoft.Json.dll"
--a="C:\Users\Dominic\Desktop\Realistic-Terain-Creation\Features\Erosion\Implementing\Library\PackageCache\[email protected]\Runtime\Portable\Newtonsoft.Json.dll"
--a="C:\Users\Dominic\Desktop\Realistic-Terain-Creation\Features\Erosion\Implementing\Library\PackageCache\[email protected]\Runtime\Newtonsoft.Json.dll"
--a="C:\Users\Dominic\Desktop\Realistic-Terain-Creation\Features\Erosion\Implementing\Library\PackageCache\[email protected]\net35\unity-custom\nunit.framework.dll"
+-a="C:\Users\whi0026\Desktop\Realistic-Terain-Creation\Features\Erosion\Implementing\Library\PlayerScriptAssemblies\Assembly-CSharp.dll"
+-a="C:\Users\whi0026\Desktop\Realistic-Terain-Creation\Features\Erosion\Implementing\Library\PlayerScriptAssemblies\UnityEngine.TestRunner.dll"
+-a="C:\Users\whi0026\Desktop\Realistic-Terain-Creation\Features\Erosion\Implementing\Library\PlayerScriptAssemblies\Unity.Timeline.dll"
+-a="C:\Users\whi0026\Desktop\Realistic-Terain-Creation\Features\Erosion\Implementing\Library\PlayerScriptAssemblies\Unity.TextMeshPro.dll"
+-a="C:\Users\whi0026\Desktop\Realistic-Terain-Creation\Features\Erosion\Implementing\Library\PlayerScriptAssemblies\UnityEngine.UI.dll"
+-a="C:\Users\whi0026\Desktop\Realistic-Terain-Creation\Features\Erosion\Implementing\Library\PackageCache\[email protected]\Runtime\AOT\Newtonsoft.Json.dll"
+-a="C:\Users\whi0026\Desktop\Realistic-Terain-Creation\Features\Erosion\Implementing\Library\PackageCache\[email protected]\Runtime\Portable\Newtonsoft.Json.dll"
+-a="C:\Users\whi0026\Desktop\Realistic-Terain-Creation\Features\Erosion\Implementing\Library\PackageCache\[email protected]\Runtime\Newtonsoft.Json.dll"
+-a="C:\Users\whi0026\Desktop\Realistic-Terain-Creation\Features\Erosion\Implementing\Library\PackageCache\[email protected]\net35\unity-custom\nunit.framework.dll"
 -s="C:\Program Files\Unity\Hub\Editor\2020.3.12f1\Editor\Data\Managed\UnityEngine"
--s="C:\Users\Dominic\Desktop\Realistic-Terain-Creation\Features\Erosion\Implementing\Library\PlayerScriptAssemblies"
--s="C:\Users\Dominic\Desktop\Realistic-Terain-Creation\Features\Erosion\Implementing\Library\PackageCache\[email protected]\Runtime\AOT"
--s="C:\Users\Dominic\Desktop\Realistic-Terain-Creation\Features\Erosion\Implementing\Library\PackageCache\[email protected]\Runtime\Portable"
--s="C:\Users\Dominic\Desktop\Realistic-Terain-Creation\Features\Erosion\Implementing\Library\PackageCache\[email protected]\Runtime"
--s="C:\Users\Dominic\Desktop\Realistic-Terain-Creation\Features\Erosion\Implementing\Library\PackageCache\[email protected]\net35\unity-custom"
+-s="C:\Users\whi0026\Desktop\Realistic-Terain-Creation\Features\Erosion\Implementing\Library\PlayerScriptAssemblies"
+-s="C:\Users\whi0026\Desktop\Realistic-Terain-Creation\Features\Erosion\Implementing\Library\PackageCache\[email protected]\Runtime\AOT"
+-s="C:\Users\whi0026\Desktop\Realistic-Terain-Creation\Features\Erosion\Implementing\Library\PackageCache\[email protected]\Runtime\Portable"
+-s="C:\Users\whi0026\Desktop\Realistic-Terain-Creation\Features\Erosion\Implementing\Library\PackageCache\[email protected]\Runtime"
+-s="C:\Users\whi0026\Desktop\Realistic-Terain-Creation\Features\Erosion\Implementing\Library\PackageCache\[email protected]\net35\unity-custom"
 -s="C:\Program Files\Unity\Hub\Editor\2020.3.12f1\Editor\Data\Managed\UnityEngine"
 -s="C:\Program Files\Unity\Hub\Editor\2020.3.12f1\Editor\Data\NetStandard\ref\2.0.0"
 -s="C:\Program Files\Unity\Hub\Editor\2020.3.12f1\Editor\Data\NetStandard\compat\2.0.0\shims\netstandard"
 -s="C:\Program Files\Unity\Hub\Editor\2020.3.12f1\Editor\Data\NetStandard\Extensions\2.0.0"
 -s="C:\Program Files\Unity\Hub\Editor\2020.3.12f1\Editor\Data\NetStandard\compat\2.0.0\shims\netfx"
--o="C:\Users\Dominic\Desktop\Realistic-Terain-Creation\Features\Erosion\Implementing\Library\BuildPlayerData\Player"
+-o="C:\Users\whi0026\Desktop\Realistic-Terain-Creation\Features\Erosion\Implementing\Library\BuildPlayerData\Player"
 -rn="RuntimeInitializeOnLoads.json"
 -tn="TypeDb-All.json"