Merge branch 'main' into damianContentFreeze

Assets/AddressableAssetsData/AddressableAssetSettings.asset

@@ -15,7 +15,7 @@ MonoBehaviour:
   m_DefaultGroup: 6f3207429a65b3e4b83935ac19791077
   m_currentHash:
     serializedVersion: 2
-    Hash: 8453796ea514a8db40e72d511ee4981c
+    Hash: 58bff643ea54adc47e3181c09b68468c
   m_OptimizeCatalogSize: 0
   m_BuildRemoteCatalog: 0
   m_CatalogRequestsTimeout: 0

Assets/Scripts/Animation/BirdEyesBehavior.cs

@@ -14,12 +14,6 @@ public class BirdEyesBehavior : MonoBehaviour
         animator = GetComponentInChildren<Animator>();
     }
 
-    // Update is called once per frame
-    void Update()
-    {
-
-    }
-
     public void CorrectItem()
     {
         correctItemIsIn = true;

Assets/Scripts/Animation/GardenerChaseBehavior.cs

@@ -33,18 +33,4 @@ public class GardenerChaseBehavior : MonoBehaviour
         //Debug.Log ("Tween started!");
         animator.SetBool("IsIdle?", false);
     }
-
-    void Awake()
-    {
-           
-    }
-
-    // Update is called once per frame
-    void Update()
-    {
-        
-    }
-    
-
-
 }

Assets/Scripts/DamianExperiments/AnnaLiseAnd Lurespots/LureSpot.cs

@@ -4,15 +4,4 @@ public class LureSpot : MonoBehaviour
 {
     [SerializeField] public GameObject luredBird;
     [SerializeField] public GameObject annaLiseSpot;
-    // Start is called once before the first execution of Update after the MonoBehaviour is created
-    void Start()
-    {
-        
-    }
-
-    // Update is called once per frame
-    void Update()
-    {
-        
-    }
 }

Assets/Scripts/DamianExperiments/LawnMowerPuzzle/GardenerBehaviour.cs

@@ -13,12 +13,6 @@ public class GardenerBehaviour : MonoBehaviour
         stateMachineRef = GetComponent<StateMachine>();
     }
 
-    // Update is called once per frame
-    void Update()
-    {
-        
-    }
-
     public void stateSwitch (string StateName)
     {
         Logging.Debug("State Switch to: " + StateName);

Assets/Scripts/DamianExperiments/LawnMowerPuzzle/LawnMowerBehaviour.cs

@@ -12,11 +12,6 @@ public class LawnMowerBehaviour : MonoBehaviour
         stateMachineRef = GetComponent<StateMachine>();
     }
     
-    // Update is called once per frame
-    void Update()
-    {
-        
-    }
     public void mowerTouched()
     {
         Logging.Debug("Mower Touched");

Assets/Scripts/DamianExperiments/Minigame/TrashSpawner.cs

@@ -30,10 +30,4 @@ public class TrashSpawner : MonoBehaviour
             sr.sprite = spritePool[Random.Range(0, spritePool.Length)];
         }
     }
-
-    // Update is called once per frame
-    void Update()
-    {
-        
-    }
 }

Assets/Scripts/DamianExperiments/Picnic/PicnicBehaviour.cs

@@ -29,12 +29,6 @@ public class PicnicBehaviour : MonoBehaviour
         animator = GetComponent<Animator>();    
     }
 
-    // Update is called once per frame
-    void Update()
-    {
-        
-    }
-
     private IEnumerator StateCycleRoutine()
     {
         while (true)

Assets/Scripts/DamianExperiments/SoundBirdPuzzleSection/soundBird_TakeOffBehaviour.cs

@@ -44,12 +44,4 @@ public class soundBird_TakeOffBehaviour : MonoBehaviour
             stateMachine.ChangeState("SoundBirdFlyAround"); // Change to the desired state name
         }
     }
-
-    
-
-    // Update is called once per frame
-    void Update()
-    {
-        
-    }
 }

Assets/Scripts/DamianExperiments/WolterSpawn/WolterStateMachine.cs

@@ -39,10 +39,4 @@ public class WolterStateMachine : MonoBehaviour
         }
         
     }
-
-    // Update is called once per frame
-    void Update()
-    {
-        
-    }
 }

Assets/Scripts/StateMachines/Quarry/AnneLise/AnneLiseBushBehaviour.cs

@@ -11,12 +11,6 @@ public class AnneLiseBushBehaviour : MonoBehaviour
         anneLiseBushStateMachine = GetComponent<StateMachine>();
     }
 
-    // Update is called once per frame
-    void Update()
-    {
-
-    }
-
     public void TakePhoto()
     {
         anneLiseBushStateMachine.ChangeState("TakePhoto");

Assets/Scripts/StateMachines/Quarry/AnneLise/TakePhotoState.cs

@@ -13,20 +13,6 @@ public class TakePhotoState : State
     private PlayerTouchController playerTouchController;
     private Vector3 newPlayerPosition;
     
-    private
-
-    // Start is called once before the first execution of Update after the MonoBehaviour is created
-    void Start()
-    {
-
-    }
-
-    // Update is called once per frame
-    void Update()
-    {
-
-    }
-
     void OnEnable()
     {
         playerCharacter = GameObject.FindWithTag("Player");

Assets/Scripts/UI/IntroCinematicsPlayer.cs

@@ -50,10 +50,5 @@ public class IntroCinematicsPlayer : MonoBehaviour
         // Disable the introsequence gameobject when intro is finished playing
         _introRenderer.enabled = false;
 
-    }
-    // Update is called once per frame
-    void Update()
-    {
-        
     }
 }

Assets/Scripts/UI/TestIndicator.cs

@@ -2,18 +2,6 @@ using UnityEngine;
 
 public class TestIndicator : MonoBehaviour, PuzzleS.IPuzzlePrompt
 {
-    // Start is called once before the first execution of Update after the MonoBehaviour is created
-    void Start()
-    {
-        
-    }
-
-    // Update is called once per frame
-    void Update()
-    {
-        
-    }
-
     public void OnShow()
     {
         gameObject.SetActive(true);

Assets/Settings/DivingMinigameSettings.asset

@@ -31,7 +31,7 @@ MonoBehaviour:
   surfacingSpawnDelay: 5
   referenceScreenHeight: 1920
   initialTileCount: 3
-  tileSpawnBuffer: 1
+  tileSpawnBuffer: 2
   normalizedTileMoveSpeed: 2
   speedUpFactor: 0
   speedUpInterval: 10