Cursor support and sensitivity setting! (#741)

* ny commitmelding lol * Aweosme commit * Fixed saving encapsulated data to JSON * removed unnecessary line in MainMenuMoveCamera * fixed quality not starting with right value * fixed levelselect cards hover issue * Fueredoriku hates mice --------- Co-authored-by: chrbraa <[email protected]>
hackerspace-ntnu · Jul 12, 2024 · ddc537d · ddc537d
1 parent b2d3ff5
commit ddc537d
Show file tree

Hide file tree

Showing 24 changed files with 16,863 additions and 9,005 deletions.
diff --git a/Assets/Prefabs/Gamestate/InputManager.prefab b/Assets/Prefabs/Gamestate/InputManager.prefab
@@ -65,11 +65,11 @@ MonoBehaviour:
   m_MoveRepeatRate: 0.1
   m_XRTrackingOrigin: {fileID: 0}
   m_ActionsAsset: {fileID: -944628639613478452, guid: 243a37e9744e079e7a1be1b16e3abd19, type: 3}
-  m_PointAction: {fileID: 0}
+  m_PointAction: {fileID: -3307047310100473676, guid: 243a37e9744e079e7a1be1b16e3abd19, type: 3}
   m_MoveAction: {fileID: 3556201639114768378, guid: 243a37e9744e079e7a1be1b16e3abd19, type: 3}
   m_SubmitAction: {fileID: 2531282545373754177, guid: 243a37e9744e079e7a1be1b16e3abd19, type: 3}
   m_CancelAction: {fileID: -5458812682994459350, guid: 243a37e9744e079e7a1be1b16e3abd19, type: 3}
-  m_LeftClickAction: {fileID: 2531282545373754177, guid: 243a37e9744e079e7a1be1b16e3abd19, type: 3}
+  m_LeftClickAction: {fileID: -8002779723883729139, guid: 243a37e9744e079e7a1be1b16e3abd19, type: 3}
   m_MiddleClickAction: {fileID: 0}
   m_RightClickAction: {fileID: 0}
   m_ScrollWheelAction: {fileID: 0}

diff --git a/Assets/Prefabs/Gamestate/StaticInfo.prefab b/Assets/Prefabs/Gamestate/StaticInfo.prefab
@@ -15,6 +15,7 @@ GameObject:
   - component: {fileID: 6426285471098592642}
   - component: {fileID: 5022952277509122877}
   - component: {fileID: 6572921195520930000}
+  - component: {fileID: 3780314087357157891}
   m_Layer: 0
   m_Name: StaticInfo
   m_TagString: Untagged
@@ -217,3 +218,22 @@ MonoBehaviour:
   - {fileID: 11400000, guid: b3561cb4178fb97b49ad139a8802559f, type: 2}
   - {fileID: 11400000, guid: ce090b8391704374cb30f8ae3b85ae72, type: 2}
   customRulesTemplate: {fileID: 11400000, guid: 78d6c599f9b46f347a2164c209c4afd4, type: 2}
+--- !u!114 &3780314087357157891
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8579357797008554893}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 3a21a5d09b8415b46910fd7e3d444796, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  mainAudioMixer: {fileID: 24100000, guid: 92cf7610df7967a41806df0e74d33c49, type: 2}
+  LowerSensLimit: 0.1
+  UpperSensLimit: 3
+  LowerFOVLimit: 60
+  UpperFOVLimit: 120
+  LowerZoomFOVLimit: 20
+  UpperZoomFOVLimit: 50
diff --git a/Assets/Prefabs/UI/Elements/Dropdown.prefab b/Assets/Prefabs/UI/Elements/Dropdown.prefab
@@ -1399,7 +1399,7 @@ GameObject:
   - component: {fileID: 1988978234052568614}
   - component: {fileID: 7786018998957624118}
   - component: {fileID: 8296568250077800006}
-  - component: {fileID: 6819799358055070464}
+  - component: {fileID: 7182465716744361408}
   m_Layer: 5
   m_Name: Dropdown
   m_TagString: Untagged
@@ -1452,7 +1452,7 @@ MonoBehaviour:
   m_Transition: 1
   m_Colors:
     m_NormalColor: {r: 0.9686275, g: 0.9450981, b: 0.89019614, a: 1}
-    m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
+    m_HighlightedColor: {r: 0.9686275, g: 0.9450981, b: 0.89019614, a: 1}
     m_PressedColor: {r: 0.7019608, g: 0.22352943, b: 0.22352943, a: 1}
     m_SelectedColor: {r: 1, g: 0.32156864, b: 0.32156864, a: 1}
     m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608}
@@ -1592,7 +1592,7 @@ MonoBehaviour:
   m_ChildScaleWidth: 0
   m_ChildScaleHeight: 0
   m_ReverseArrangement: 0
---- !u!114 &6819799358055070464
+--- !u!114 &7182465716744361408
 MonoBehaviour:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
@@ -1601,6 +1601,6 @@ MonoBehaviour:
   m_GameObject: {fileID: 8483670200265780626}
   m_Enabled: 1
   m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: ec0f4a25e2f5e984db50033e7cdf7a76, type: 3}
+  m_Script: {fileID: 11500000, guid: 13f5cdbcb24caa747b6dc3f8259a6829, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
diff --git a/Assets/Prefabs/UI/Elements/MenuButton.prefab b/Assets/Prefabs/UI/Elements/MenuButton.prefab
@@ -14,6 +14,7 @@ GameObject:
   - component: {fileID: 4086770535158334872}
   - component: {fileID: 6876812706352298441}
   - component: {fileID: 2734505668981740397}
+  - component: {fileID: 6501292704536297326}
   m_Layer: 5
   m_Name: MenuButton
   m_TagString: Untagged
@@ -65,7 +66,7 @@ MonoBehaviour:
   m_Colors:
     m_NormalColor: {r: 0.5458351, g: 0.739809, b: 0.8852896, a: 1}
     m_HighlightedColor: {r: 0.54509807, g: 0.7411765, b: 0.8862745, a: 1}
-    m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1}
+    m_PressedColor: {r: 0.5754717, g: 0.17101282, b: 0.17101282, a: 1}
     m_SelectedColor: {r: 0.8613051, g: 0.14618321, b: 0.14618321, a: 1}
     m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608}
     m_ColorMultiplier: 1
@@ -195,6 +196,18 @@ MonoBehaviour:
   m_EffectColor: {r: 0, g: 0, b: 0, a: 0.5}
   m_EffectDistance: {x: 5, y: -5}
   m_UseGraphicAlpha: 1
+--- !u!114 &6501292704536297326
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7072107538278606930}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 13f5cdbcb24caa747b6dc3f8259a6829, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
 --- !u!1 &7266211078871148662
 GameObject:
   m_ObjectHideFlags: 0
@@ -288,7 +301,7 @@ MonoBehaviour:
   m_faceColor:
     serializedVersion: 2
     rgba: 4294967295
-  m_fontSize: 70
+  m_fontSize: 30
   m_fontSizeBase: 24
   m_fontWeight: 400
   m_enableAutoSizing: 1

diff --git a/Assets/Prefabs/UI/Elements/Slider.prefab b/Assets/Prefabs/UI/Elements/Slider.prefab
@@ -556,6 +556,7 @@ GameObject:
   - component: {fileID: 2261462308808573997}
   - component: {fileID: 5152159382224659745}
   - component: {fileID: 628177840045729091}
+  - component: {fileID: 6380889236745050598}
   m_Layer: 5
   m_Name: Slider
   m_TagString: Untagged
@@ -693,3 +694,15 @@ MonoBehaviour:
   m_FlexibleWidth: -1
   m_FlexibleHeight: -1
   m_LayoutPriority: 1
+--- !u!114 &6380889236745050598
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8411587129487110349}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 13f5cdbcb24caa747b6dc3f8259a6829, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: