Merge branch 'main' into 95-freeze-sequence

game/Assets/Prefabs/Cameras.prefab

@@ -610,6 +610,7 @@ GameObject:
   - component: {fileID: 5661344207789115423}
   - component: {fileID: 7951179702612018041}
   - component: {fileID: 4646968772435671935}
+  - component: {fileID: 6450882301115788249}
   m_Layer: 0
   m_Name: CM_ThirdPerson
   m_TagString: Untagged
@@ -718,7 +719,7 @@ MonoBehaviour:
   m_RecenterToTargetHeading:
     m_enabled: 0
     m_WaitTime: 1
-    m_RecenteringTime: 2
+    m_RecenteringTime: 1.1
     m_LegacyHeadingDefinition: -1
     m_LegacyVelocityFilterStrength: -1
   m_BindingMode: 4
@@ -727,9 +728,9 @@ MonoBehaviour:
   - m_Height: 2
     m_Radius: 2
   - m_Height: 1
-    m_Radius: 1.5
+    m_Radius: 2
   - m_Height: 0
-    m_Radius: 1.5
+    m_Radius: 2
   m_LegacyHeadingBias: 3.4028235e+38
   m_Rigs:
   - {fileID: 5661344207439169722}
@@ -836,6 +837,21 @@ MonoBehaviour:
           m_StringArgument: 
           m_BoolArgument: 0
         m_CallState: 2
+--- !u!114 &6450882301115788249
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5661344207789115490}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: c825c87a182e76448880f374c3ef9b73, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  _axisDifference: 0.3
+  _inputMagnitude: 0.1
+  _moveInput: {fileID: -470994912084233759, guid: d4d9eb5db7beac84ca3cb36cfc09cd0a, type: 3}
 --- !u!1 &5661344207849762654
 GameObject:
   m_ObjectHideFlags: 0

game/Assets/Prefabs/Player.prefab

@@ -607,7 +607,7 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1703779518772407877}
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: -0.036, y: 1.403, z: -0.093}
+  m_LocalPosition: {x: 0, y: 1.403, z: 0}
   m_LocalScale: {x: 0.1, y: 0.1, z: 0.1}
   m_Children: []
   m_Father: {fileID: 13726837642651460}

game/Assets/Prefabs/PlayerObjects.prefab

@@ -89,27 +89,31 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 5661344207112327334, guid: dfbecbd9a563dba43be2d6139d9b3f90, type: 3}
       propertyPath: m_LocalPosition.x
-      value: 1.4999695
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 5661344207112327334, guid: dfbecbd9a563dba43be2d6139d9b3f90, type: 3}
+      propertyPath: m_LocalPosition.y
+      value: 0.25224686
       objectReference: {fileID: 0}
     - target: {fileID: 5661344207112327334, guid: dfbecbd9a563dba43be2d6139d9b3f90, type: 3}
       propertyPath: m_LocalPosition.z
-      value: -0.7294996
+      value: -2.720001
       objectReference: {fileID: 0}
     - target: {fileID: 5661344207112327334, guid: dfbecbd9a563dba43be2d6139d9b3f90, type: 3}
       propertyPath: m_LocalRotation.w
-      value: 0.72316885
+      value: 0.9724168
       objectReference: {fileID: 0}
     - target: {fileID: 5661344207112327334, guid: dfbecbd9a563dba43be2d6139d9b3f90, type: 3}
       propertyPath: m_LocalRotation.x
-      value: -0.012375496
+      value: 0.2295565
       objectReference: {fileID: 0}
     - target: {fileID: 5661344207112327334, guid: dfbecbd9a563dba43be2d6139d9b3f90, type: 3}
       propertyPath: m_LocalRotation.y
-      value: -0.6904594
+      value: 0.040237267
       objectReference: {fileID: 0}
     - target: {fileID: 5661344207112327334, guid: dfbecbd9a563dba43be2d6139d9b3f90, type: 3}
       propertyPath: m_LocalRotation.z
-      value: -0.011815742
+      value: -0.009498731
       objectReference: {fileID: 0}
     - target: {fileID: 5661344207311831624, guid: dfbecbd9a563dba43be2d6139d9b3f90, type: 3}
       propertyPath: m_LocalPosition.x
@@ -125,19 +129,19 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 5661344207311831624, guid: dfbecbd9a563dba43be2d6139d9b3f90, type: 3}
       propertyPath: m_LocalRotation.w
-      value: 0.97784
+      value: 0.56752455
       objectReference: {fileID: 0}
     - target: {fileID: 5661344207311831624, guid: dfbecbd9a563dba43be2d6139d9b3f90, type: 3}
       propertyPath: m_LocalRotation.x
-      value: -0.13644
+      value: 0.06285194
       objectReference: {fileID: 0}
     - target: {fileID: 5661344207311831624, guid: dfbecbd9a563dba43be2d6139d9b3f90, type: 3}
       propertyPath: m_LocalRotation.y
-      value: 0.15792163
+      value: 0.7702346
       objectReference: {fileID: 0}
     - target: {fileID: 5661344207311831624, guid: dfbecbd9a563dba43be2d6139d9b3f90, type: 3}
       propertyPath: m_LocalRotation.z
-      value: -0.0165495
+      value: -0.28408483
       objectReference: {fileID: 0}
     - target: {fileID: 5661344207439169721, guid: dfbecbd9a563dba43be2d6139d9b3f90, type: 3}
       propertyPath: m_LocalPosition.x
@@ -153,39 +157,71 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 5661344207439169721, guid: dfbecbd9a563dba43be2d6139d9b3f90, type: 3}
       propertyPath: m_LocalRotation.w
-      value: 0.97784
+      value: 0.5675246
       objectReference: {fileID: 0}
     - target: {fileID: 5661344207439169721, guid: dfbecbd9a563dba43be2d6139d9b3f90, type: 3}
       propertyPath: m_LocalRotation.x
-      value: -0.13643998
+      value: 0.06285195
       objectReference: {fileID: 0}
     - target: {fileID: 5661344207439169721, guid: dfbecbd9a563dba43be2d6139d9b3f90, type: 3}
       propertyPath: m_LocalRotation.y
-      value: 0.15792166
+      value: 0.7702346
       objectReference: {fileID: 0}
     - target: {fileID: 5661344207439169721, guid: dfbecbd9a563dba43be2d6139d9b3f90, type: 3}
       propertyPath: m_LocalRotation.z
-      value: -0.016549498
+      value: -0.28408486
       objectReference: {fileID: 0}
     - target: {fileID: 5661344207544240914, guid: dfbecbd9a563dba43be2d6139d9b3f90, type: 3}
       propertyPath: m_XAxis.Value
-      value: -89.63728
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 5661344207544240914, guid: dfbecbd9a563dba43be2d6139d9b3f90, type: 3}
+      propertyPath: m_FollowOffset.z
+      value: -2
+      objectReference: {fileID: 0}
+    - target: {fileID: 5661344207544240914, guid: dfbecbd9a563dba43be2d6139d9b3f90, type: 3}
+      propertyPath: m_Heading.m_VelocityFilterStrength
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 5661344207544240915, guid: dfbecbd9a563dba43be2d6139d9b3f90, type: 3}
+      propertyPath: m_BiasY
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 5661344207544240915, guid: dfbecbd9a563dba43be2d6139d9b3f90, type: 3}
+      propertyPath: m_SoftZoneHeight
+      value: 0.55
       objectReference: {fileID: 0}
     - target: {fileID: 5661344207738413437, guid: dfbecbd9a563dba43be2d6139d9b3f90, type: 3}
       propertyPath: m_XAxis.Value
-      value: -89.63728
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 5661344207738413437, guid: dfbecbd9a563dba43be2d6139d9b3f90, type: 3}
+      propertyPath: m_FollowOffset.z
+      value: -2
+      objectReference: {fileID: 0}
+    - target: {fileID: 5661344207738413437, guid: dfbecbd9a563dba43be2d6139d9b3f90, type: 3}
+      propertyPath: m_Heading.m_VelocityFilterStrength
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 5661344207738413438, guid: dfbecbd9a563dba43be2d6139d9b3f90, type: 3}
+      propertyPath: m_SoftZoneHeight
+      value: 0.48
+      objectReference: {fileID: 0}
+    - target: {fileID: 5661344207789115422, guid: dfbecbd9a563dba43be2d6139d9b3f90, type: 3}
+      propertyPath: m_Enabled
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 5661344207789115488, guid: dfbecbd9a563dba43be2d6139d9b3f90, type: 3}
       propertyPath: m_LocalPosition.x
-      value: 1.4999695
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 5661344207789115488, guid: dfbecbd9a563dba43be2d6139d9b3f90, type: 3}
       propertyPath: m_LocalPosition.y
-      value: -0.80000305
+      value: 0.25224686
       objectReference: {fileID: 0}
     - target: {fileID: 5661344207789115488, guid: dfbecbd9a563dba43be2d6139d9b3f90, type: 3}
       propertyPath: m_LocalPosition.z
-      value: -0.7294996
+      value: -2.720001
       objectReference: {fileID: 0}
     - target: {fileID: 5661344207789115488, guid: dfbecbd9a563dba43be2d6139d9b3f90, type: 3}
       propertyPath: m_LocalRotation.w
@@ -206,14 +242,18 @@ PrefabInstance:
     - target: {fileID: 5661344207789115489, guid: dfbecbd9a563dba43be2d6139d9b3f90, type: 3}
       propertyPath: m_Follow
       value: 
-      objectReference: {fileID: 4676633831945762709}
+      objectReference: {fileID: 3150647428828152554}
     - target: {fileID: 5661344207789115489, guid: dfbecbd9a563dba43be2d6139d9b3f90, type: 3}
       propertyPath: m_LookAt
       value: 
       objectReference: {fileID: 3150647428828152554}
     - target: {fileID: 5661344207789115489, guid: dfbecbd9a563dba43be2d6139d9b3f90, type: 3}
-      propertyPath: m_XAxis.Value
+      propertyPath: m_YAxis.m_InvertInput
-      value: -89.63728
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 5661344207789115489, guid: dfbecbd9a563dba43be2d6139d9b3f90, type: 3}
+      propertyPath: m_Heading.m_VelocityFilterStrength
+      value: 1
       objectReference: {fileID: 0}
     - target: {fileID: 5661344207849762652, guid: dfbecbd9a563dba43be2d6139d9b3f90, type: 3}
       propertyPath: m_LocalPosition.x
@@ -229,23 +269,31 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 5661344207849762652, guid: dfbecbd9a563dba43be2d6139d9b3f90, type: 3}
       propertyPath: m_LocalRotation.w
-      value: 0.9705022
+      value: 0.5333047
       objectReference: {fileID: 0}
     - target: {fileID: 5661344207849762652, guid: dfbecbd9a563dba43be2d6139d9b3f90, type: 3}
       propertyPath: m_LocalRotation.x
-      value: -0.13541612
+      value: 0.059062183
       objectReference: {fileID: 0}
     - target: {fileID: 5661344207849762652, guid: dfbecbd9a563dba43be2d6139d9b3f90, type: 3}
       propertyPath: m_LocalRotation.y
-      value: 0.19838297
+      value: 0.7917243
       objectReference: {fileID: 0}
     - target: {fileID: 5661344207849762652, guid: dfbecbd9a563dba43be2d6139d9b3f90, type: 3}
       propertyPath: m_LocalRotation.z
-      value: -0.020789675
+      value: -0.29201087
       objectReference: {fileID: 0}
     - target: {fileID: 5661344208280186838, guid: dfbecbd9a563dba43be2d6139d9b3f90, type: 3}
       propertyPath: m_XAxis.Value
-      value: -89.63728
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 5661344208280186838, guid: dfbecbd9a563dba43be2d6139d9b3f90, type: 3}
+      propertyPath: m_FollowOffset.z
+      value: -2
+      objectReference: {fileID: 0}
+    - target: {fileID: 5661344208280186838, guid: dfbecbd9a563dba43be2d6139d9b3f90, type: 3}
+      propertyPath: m_Heading.m_VelocityFilterStrength
+      value: 1
       objectReference: {fileID: 0}
     - target: {fileID: 8137033370021049976, guid: dfbecbd9a563dba43be2d6139d9b3f90, type: 3}
       propertyPath: m_Enabled

game/Assets/Prefabs/UI/Canvas.prefab

@@ -155,6 +155,7 @@ MonoBehaviour:
   dialogue: {fileID: 11400000, guid: 56369c4e83cc59e44bf55cd16fafc4e8, type: 2}
   artefacts: {fileID: 11400000, guid: f523ac0d77530064b8b41c627b13fae0, type: 2}
   _preview: {fileID: 0}
+  _continueButton: {fileID: 3941142919679305063}
   _uiOpen: {fileID: 11400000, guid: 0fc36e00903fc7047b48bb1844e6f12b, type: 2}
   _uiClose: {fileID: 11400000, guid: d8c4272694282b64e9cd1d4a42477262, type: 2}
 --- !u!225 &225077497674743764
@@ -360,6 +361,17 @@ GameObject:
   m_CorrespondingSourceObject: {fileID: 3868137226220198580, guid: c2de9a6eb50967e4cbd6d654a8ecbcf1, type: 3}
   m_PrefabInstance: {fileID: 225077497674743761}
   m_PrefabAsset: {fileID: 0}
+--- !u!114 &3941142919679305063 stripped
+MonoBehaviour:
+  m_CorrespondingSourceObject: {fileID: 3868137226220198582, guid: c2de9a6eb50967e4cbd6d654a8ecbcf1, type: 3}
+  m_PrefabInstance: {fileID: 225077497674743761}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3941142919679305061}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
 --- !u!1001 &6808448286065587779
 PrefabInstance:
   m_ObjectHideFlags: 0

game/Assets/Scripts/Artefacts/PickUpDisplay.cs

@@ -47,6 +47,9 @@ public class PickUpDisplay : MonoBehaviour
     [SerializeField] private ArtefactSystem artefacts;
     [SerializeField] private ArtefactPreview _preview;
 
+    [SerializeField]
+    private Button _continueButton;
+
     [SerializeField]
     private GameEvent _uiOpen;
     
@@ -60,6 +63,7 @@ public class PickUpDisplay : MonoBehaviour
     private void Start()
     {
         EventHandler.current.onArtefactUI += PopUpOn;
+        _continueButton.enabled = false;
     }
 
     private IEnumerator AnimateIn()
@@ -127,6 +131,9 @@ public class PickUpDisplay : MonoBehaviour
 
             yield return null;
         }
+
+        _continueButton.enabled = true;
+        _continueButton.Select();
     }
 
     private IEnumerator AnimateOut()
@@ -134,6 +141,8 @@ public class PickUpDisplay : MonoBehaviour
         yield return null;
         bool isComplete = false;
         
+        _continueButton.enabled = false;
+
         foreach ( var fader in _fadeInElements )
         {
             fader.Renderer.alpha = 1f;

game/Assets/Scripts/Camera/TargetRecentering.cs

@@ -0,0 +1,31 @@
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using Cinemachine;
+using UnityEngine;
+using UnityEngine.InputSystem;
+
+[RequireComponent(typeof(CinemachineFreeLook))]
+public class TargetRecentering : MonoBehaviour
+{
+    [SerializeField] [Range(0, 1)] private float _inputMagnitude = 0.1f;
+    
+    [SerializeField] private InputActionReference _moveInput;
+    
+    private CinemachineFreeLook _freeLook;
+
+    private void Start()
+    {
+        _freeLook = GetComponent<CinemachineFreeLook>();
+    }
+
+    private void Update()
+    {
+        // if there is any horizontal movement input...
+        var input = _moveInput.action.ReadValue<Vector2>();
+        var result = Mathf.Abs(input.x) > Mathf.Abs(input.y) && input.magnitude > _inputMagnitude;
+        
+        // ...enable target recentering in order to turn the camera with the player
+        _freeLook.m_RecenterToTargetHeading.m_enabled = result;
+    }
+}

game/Assets/Scripts/Camera/TargetRecentering.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: c825c87a182e76448880f374c3ef9b73
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: