caleb-brown/UDRIGEEKCup2024
1
0
Fork 0
mirror of https://projects.caleb-brown.dev/UDRI-XRT/UDRIGEEKCup2024.git synced 2025-01-22 07:08:51 -05:00
Code Releases Activity

Fixed Merge conflict

Browse Source
This commit is contained in:
cbrown 2024-04-17 12:00:54 -04:00
parent 177cfc1906
commit 5ce0af8bd1
1 changed files with 0 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Assets/Scripts/OnColliderTrigger.cs
View File

@ -3,16 +3,10 @@ using UnityEngine.Events;
namespace MAVRIC.GEEKCup namespace MAVRIC.GEEKCup
{ {
<<<<<<<< HEAD:Assets/Scripts/OnTrigger.cs
[RequireComponent(typeof(Collider))] [RequireComponent(typeof(Collider))]
public class OnTrigger : MonoBehaviour
{
[SerializeField] private bool invertResult = false;
========
public class OnColliderTrigger : MonoBehaviour public class OnColliderTrigger : MonoBehaviour
{ {
public bool invertResult = false; public bool invertResult = false;
>>>>>>>> development:Assets/Scripts/OnColliderTrigger.cs
// TODO: Update this to use a UnityAtoms BoolReference // TODO: Update this to use a UnityAtoms BoolReference
[SerializeField] private UnityEvent<bool> onTrigger; [SerializeField] private UnityEvent<bool> onTrigger;