diff --git a/Assets/Fish-Networking-Discovery-main/NetworkDiscovery.cs b/Assets/Fish-Networking-Discovery-main/NetworkDiscovery.cs index 979aab11..509cb04a 100644 --- a/Assets/Fish-Networking-Discovery-main/NetworkDiscovery.cs +++ b/Assets/Fish-Networking-Discovery-main/NetworkDiscovery.cs @@ -242,8 +242,12 @@ namespace FishNet.Discovery // // return; // } +<<<<<<< HEAD <<<<<<< HEAD Debug.Log("NetworkDiscovery is searching"); +======= + // Debug.Log("NetworkDiscovery is searching on port " + port); +>>>>>>> master ======= // Debug.Log("NetworkDiscovery is searching on port " + port); >>>>>>> master diff --git a/Assets/XR/Settings/OpenXR Package Settings.asset b/Assets/XR/Settings/OpenXR Package Settings.asset new file mode 100644 index 00000000..4bfad9a1 --- /dev/null +++ b/Assets/XR/Settings/OpenXR Package Settings.asset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c4dfd870243f7478ecd0558d9b6821d6952a0367b38a5c3e225896d287b4c07b +size 26638 diff --git a/Assets/_PROJECT/Components/Bolt/Intercation Logic/Car Driving Routine.cs b/Assets/_PROJECT/Components/Bolt/Intercation Logic/Car Driving Routine.cs index 9715bc88..1e3229f3 100644 --- a/Assets/_PROJECT/Components/Bolt/Intercation Logic/Car Driving Routine.cs +++ b/Assets/_PROJECT/Components/Bolt/Intercation Logic/Car Driving Routine.cs @@ -1,8 +1,12 @@ using System.Collections; using System.Collections.Generic; +<<<<<<< HEAD using Unity.XR.CoreUtils; using UnityEngine; using static MouseLook; +======= +using UnityEngine; +>>>>>>> master public class CarDrivingRoutine : MonoBehaviour { @@ -10,6 +14,7 @@ public class CarDrivingRoutine : MonoBehaviour public AudioSource _tireSound; public Waypoint _waypoint; +<<<<<<< HEAD public float StraightSpeed = 5f; // Movement speed public float rotationSpeed = 5f; // Rotation speed public float waypointProximityThreshold = 0.5f; // Distance to consider "close enough" to a waypoint @@ -28,16 +33,29 @@ public class CarDrivingRoutine : MonoBehaviour targetSpeed = StraightSpeed; targetRotationSpeed = rotationSpeed; } +======= + public float speed = 5f; // Movement speed + public float rotationSpeed = 5f; // Rotation speed + public float waypointProximityThreshold = 0.5f; // Distance to consider "close enough" to a waypoint +>>>>>>> master // Update is called once per frame void Update() { +<<<<<<< HEAD //if (hasPedestrianInFront) return; if (_waypoint == null) return; // Just in case. // Move towards the waypoint Vector3 targetPosition = _waypoint.transform.position; float step = StraightSpeed * Time.deltaTime; +======= + if (_waypoint == null) return; + + // Move towards the waypoint + Vector3 targetPosition = _waypoint.transform.position; + float step = speed * Time.deltaTime; +>>>>>>> master transform.position = Vector3.MoveTowards(transform.position, targetPosition, step); // Rotate towards the desired rotation @@ -45,6 +63,7 @@ public class CarDrivingRoutine : MonoBehaviour Quaternion desiredRotation = Quaternion.Euler(0, targetRotation, 0); transform.rotation = Quaternion.RotateTowards(transform.rotation, desiredRotation, rotationSpeed * Time.deltaTime); +<<<<<<< HEAD rollTires(); // Just an aesthetic improvement. if (Quaternion.Angle(transform.rotation, desiredRotation) > 1f) // If the car is turning. @@ -66,12 +85,15 @@ public class CarDrivingRoutine : MonoBehaviour isTurning = false; } +======= +>>>>>>> master // Check if close enough to the waypoint if (Vector3.Distance(transform.position, targetPosition) <= waypointProximityThreshold && Quaternion.Angle(transform.rotation, desiredRotation) <= 1f) { // Proceed to the next waypoint _waypoint = _waypoint.Next; +<<<<<<< HEAD } } @@ -138,4 +160,18 @@ public class CarDrivingRoutine : MonoBehaviour StraightSpeed = targetStraightSpeed; rotationSpeed = targetRotationSpeed; } +======= + if (_waypoint == null) + { + // Optional: Play stop sound when no more waypoints + _stopSound?.Play(); + } + else + { + // Optional: Play tire sound when moving to the next waypoint + _tireSound?.Play(); + } + } + } +>>>>>>> master } diff --git a/Assets/_PROJECT/Multiplayer/CustomNetworkManager.prefab b/Assets/_PROJECT/Multiplayer/CustomNetworkManager.prefab index 5ea6fb2f..6801705d 100644 --- a/Assets/_PROJECT/Multiplayer/CustomNetworkManager.prefab +++ b/Assets/_PROJECT/Multiplayer/CustomNetworkManager.prefab @@ -65,6 +65,7 @@ MonoBehaviour: m_GameObject: {fileID: 876842842715561968} m_Enabled: 1 m_EditorHideFlags: 0 +<<<<<<< HEAD m_Script: {fileID: 11500000, guid: 98cc0a7a6d6d7314c8e390e45a9e1483, type: 3} m_Name: m_EditorClassIdentifier: @@ -72,6 +73,12 @@ MonoBehaviour: port: 1 discoveryInterval: 0 automatic: 0 +======= + m_Script: {fileID: 11500000, guid: 2883099670a13fa4397b2335c51bc792, type: 3} + m_Name: + m_EditorClassIdentifier: + networkDiscovery: {fileID: 3580593382982171501} +>>>>>>> master --- !u!114 &3580593382982171501 MonoBehaviour: m_ObjectHideFlags: 0 @@ -81,10 +88,17 @@ MonoBehaviour: m_GameObject: {fileID: 876842842715561968} m_Enabled: 1 m_EditorHideFlags: 0 +<<<<<<< HEAD m_Script: {fileID: 11500000, guid: 846c98250226ef949b5c0c499e9334da, type: 3} +======= + m_Script: {fileID: 11500000, guid: 81d12db8c9730a74a923496476cfbf80, type: 3} +>>>>>>> master m_Name: m_EditorClassIdentifier: - networkDiscovery: {fileID: 4784684551416650039} + secret: deltavr + port: 0 + discoveryInterval: 0 + automatic: 0 --- !u!114 &3642215892935434233 MonoBehaviour: m_ObjectHideFlags: 0 diff --git a/Assets/_PROJECT/Other/Delta Hoone/Ground Levelled.fbx b/Assets/_PROJECT/Other/Delta Hoone/Ground Levelled.fbx index ff999623..b26e4969 100644 --- a/Assets/_PROJECT/Other/Delta Hoone/Ground Levelled.fbx +++ b/Assets/_PROJECT/Other/Delta Hoone/Ground Levelled.fbx @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c3b2836c119fff40ee96f461fda0d39d8f81b614e6d9d384cd562cebd5249c20 -size 340956 +oid sha256:4ffc253e0d82a4e320f2b527c20f7e327fa9a899ebaf7d936b78b7983f1c8692 +size 255 diff --git a/Assets/_PROJECT/Other/Delta Hoone/Ground.fbx b/Assets/_PROJECT/Other/Delta Hoone/Ground.fbx index fcefa925..cbb9f050 100644 --- a/Assets/_PROJECT/Other/Delta Hoone/Ground.fbx +++ b/Assets/_PROJECT/Other/Delta Hoone/Ground.fbx @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:63aef16cbbf145a90e4100ab16d45dbda0fb3e4d3641a7f1851f2aa789b66795 -size 364572 +oid sha256:86a67bce63bede96cd44aaddd315a7be38905d068103aa3cd4f444c93b21ba36 +size 243 diff --git a/Assets/_PROJECT/Scenes/DeltaBuilding_base.unity b/Assets/_PROJECT/Scenes/DeltaBuilding_base.unity index 8260e2bb..df4efbf0 100644 --- a/Assets/_PROJECT/Scenes/DeltaBuilding_base.unity +++ b/Assets/_PROJECT/Scenes/DeltaBuilding_base.unity @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:0dff8127711e7c650309456688598dbe034237d5c3df89d079ca328a883ac343 -size 59204101 +oid sha256:9588d9141a3bb2b278169cfa924989aba7e6ec4afb994b3316c9916fb7b47b96 +size 127192979 diff --git a/ProjectSettings/AudioManager.asset b/ProjectSettings/AudioManager.asset index bc6abbd7..57d53ab5 100644 --- a/ProjectSettings/AudioManager.asset +++ b/ProjectSettings/AudioManager.asset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:7105b1e15f990334af69cbdcfaa594a4a4987ca2525675bc70e807344831d95d -size 446 +oid sha256:c6ef2f02ba992d21061dd8ef7f3e86e4ff3bc84dfe4967218edf2f7a15a75363 +size 610