Merge branch 'main' of https://git.joshuareason.com/Jam/GGJ_2023

Assets/Art Assets/IsRaining/RAIN.prefab (Stored with Git LFS)

+size 24397

Assets/Scenes/Main.unity (Stored with Git LFS)

+size 84015

Assets/Scenes/Menu.unity (Stored with Git LFS)

+size 701565

Assets/Scripts/BoatController.cs

@@ -101,7 +101,7 @@ public class BoatController : MonoBehaviour
 
     public void OnCollisionEnter(Collision collision)
     {
-        if (collision.gameObject.CompareTag("Obstacle"))
+        if (collision.gameObject.isTagInParent("Obstacle"))
         {
 
             Debug.Log($"Hitting: {collision.gameObject} Foce: {collision.impulse * ObstacleBounce}");

Assets/Scripts/Utility/DontDestroyOnLoad.cs

@@ -0,0 +1,68 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+using NaughtyAttributes;
+
+
+/// <summary>
+/// 
+/// </summary>
+public class DontDestroyOnLoad : MonoBehaviour
+{
+
+    #region Inspector Fields
+	
+    #endregion Inspector Fields
+
+    #region Private Fields
+	
+    #endregion Private Fields
+
+	#region Getters
+	
+    #endregion Getters
+
+
+
+    #region MonoBehaviour Functions
+    /// <summary>
+	/// OnEnable is called when the object becomes enabled and active.
+    /// </summary>
+    private void OnEnable()
+    {
+    DontDestroyOnLoad(transform.root.gameObject);
+    }
+
+    /// <summary>
+	/// OnDisable is called when the behaviour becomes disabled.
+    /// </summary>
+    private void OnDisable()
+    {
+    
+    }
+
+    /// <summary>
+    /// Update is called once per frame
+    /// </summary>
+    private void Update()
+    {
+    
+    }
+
+    #endregion MonoBehaviour Functions
+
+    #region Class Functionality
+    
+    #endregion Class Functionality
+
+    #region Editor Functions
+    /// <summary>
+    /// Called when the Component is created or Reset from the Inspector
+    /// </summary>
+    private void Reset()
+    {
+        //useful for finding components on creation
+    } 
+    #endregion Editor Functions
+
+}

Assets/Scripts/Utility/DontDestroyOnLoad.cs.meta

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

Assets/Scripts/Utility/GameObjectExtension.cs

@@ -0,0 +1,29 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+using NaughtyAttributes;
+
+
+/// <summary>
+/// 
+/// </summary>
+public static class GameObjectExtension
+{
+
+    public static bool isTagInParent(this GameObject go, string tag)
+    {
+        Transform current = go.transform;
+        while (current != null)
+        {
+            if (current.gameObject.CompareTag(tag))
+                return true;
+
+            current = current.parent;
+        }
+
+        return false;
+    }
+
+
+
+}

Assets/Scripts/Utility/GameObjectExtension.cs.meta

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

Assets/TextMesh Pro/Resources/Fonts & Materials/LiberationSans SDF - Fallback.asset (Stored with Git LFS)

+size 537679

Assets/spin.cs

@@ -5,9 +5,28 @@ using UnityEngine;
 public class spin : MonoBehaviour
 {
     public float turnFactor = 1f;
+    public Transform m_camera;
+    public float ZoomAmount = 10;
 
     private void Update()
     {
         transform.rotation = Quaternion.Euler(0f, Time.time * turnFactor, 0f); 
     }
+
+    public void Zoom()
+    {
+        m_camera.transform.position += m_camera.forward * ZoomAmount;
+    }
+
+    public void UnZoom()
+    {
+        m_camera.transform.position -= m_camera.forward * ZoomAmount;
+    }
+
+
+
+
+
+
+
 }

ProjectSettings/EditorBuildSettings.asset (Stored with Git LFS)

+size 455