Merge branch 'main' of http://212.24.110.183:3000/IPSEITY/Unheimlich_POC

# Conflicts:
#	Assets/_Content/Scenes/BodiesInWater.unity

Packages/OctoCore/Runtime/Prefabs/OctoPlayerFP.prefab

@@ -12,6 +12,8 @@ GameObject:
   - component: {fileID: 3666612565151794712}
   - component: {fileID: 6053283114444666027}
   - component: {fileID: 6989128982853398086}
+  - component: {fileID: 1836997810253213181}
+  - component: {fileID: 1984479600479780032}
   m_Layer: 0
   m_Name: Camera Player
   m_TagString: MainCamera
@@ -137,6 +139,46 @@ MonoBehaviour:
     m_VarianceClampScale: 0.9
     m_ContrastAdaptiveSharpening: 0
   m_Version: 2
+--- !u!114 &1836997810253213181
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2101508725665932610}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 4ccb80e2899444642bdbf406a3c31f7b, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: AK.Wwise.Unity.MonoBehaviour::AkGameObj
+  m_listeners:
+    initialListenerList: []
+    useDefaultListeners: 1
+  isEnvironmentAware: 1
+  isStaticObject: 0
+  usePositionOffsetData: 0
+  m_positionOffsetData:
+    KeepMe: 0
+    positionOffset: {x: 0, y: 0, z: 0}
+  scalingFactor: 1
+  m_posOffsetData: {fileID: 0}
+  listenerMask: 1
+--- !u!114 &1984479600479780032
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2101508725665932610}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: a835ee92b0863c9459a0f816c5ff62ac, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: AK.Wwise.Unity.MonoBehaviour::AkAudioListener
+  isDefaultListener: 1
+  bOverrideScalingFactor: 0
+  scalingFactor: -1
+  listenerId: 0
 --- !u!1 &8162540767767967414
 GameObject:
   m_ObjectHideFlags: 0
@@ -148,6 +190,7 @@ GameObject:
   - component: {fileID: 8725966219179855439}
   - component: {fileID: 1735456339091181674}
   - component: {fileID: 5295567073180248356}
+  - component: {fileID: 8671514338638212349}
   m_Layer: 0
   m_Name: OctoPlayerFP
   m_TagString: Player
@@ -215,11 +258,14 @@ MonoBehaviour:
     IsRunning: 0
     Yaw: 0
     Pitch: 0
+    Driver: {fileID: 0}
   _references:
     Controller: {fileID: 1735456339091181674}
   _settings:
     Mode: 0
     Orientation: 1
+    AllowMove: 1
+    AllowLook: 1
     WalkSpeed: 10
     RunSpeed: 20
     JumpDuration: 0.5
@@ -236,6 +282,34 @@ MonoBehaviour:
     SensitivityY: 0.1
     MinPitch: -80
     MaxPitch: 80
+--- !u!114 &8671514338638212349
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8162540767767967414}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 5a11b07babb12d446a356745e7a37303, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: Assembly-CSharp::Audio_FootstepsController
+  footstepEvent:
+    idInternal: 0
+    valueGuidInternal: 
+    WwiseObjectReference: {fileID: 11400000, guid: 41aa8cbccefacf24b97ee9067316b3dc, type: 2}
+  defaultSwitch:
+    idInternal: 0
+    valueGuidInternal: 
+    groupIdInternal: 0
+    groupGuidInternal: 
+    WwiseObjectReference: {fileID: 11400000, guid: cea23ef8af49aa54f9c3833465570bb2, type: 2}
+  _stepInterval: 0.5
+  _minVelocity: 0.3
+  _rayDistance: 0.2
+  _groundLayer:
+    serializedVersion: 2
+    m_Bits: 4294967295
 --- !u!1001 &2564566619627430770
 PrefabInstance:
   m_ObjectHideFlags: 0