1
0
mirror of https://projects.caleb-brown.dev/UDRI-XRT/UDRIGEEKCup2024.git synced 2025-01-22 15:18:25 -05:00
Commit Graph

5 Commits

Author SHA1 Message Date
cbrown
cd7f9b740e Updated Stencil sample scene 2024-04-17 12:30:02 -04:00
cbrown
5ce0af8bd1 Fixed Merge conflict 2024-04-17 12:00:54 -04:00
cbrown
177cfc1906 Merge branch 'development' into feature/QR-Code
# Conflicts:
#	Assets/Prefabs/Hole/Hole.prefab
#	Assets/Scenes/TestControls.unity
#	Assets/Scripts/DeactivateColliderOnTrigger.cs
#	Assets/Scripts/DeactivateColliderOnTrigger.cs.meta
#	Assets/Scripts/OnColliderTrigger.cs
#	Assets/Scripts/OnColliderTrigger.cs.meta
#	Assets/Scripts/OnTrigger.cs
#	Assets/Scripts/OnTrigger.cs.meta
2024-04-17 11:53:48 -04:00
cbrown
0f16bba9af HOTFIX: Fixed through hole collisions 2024-04-16 16:23:46 -04:00
cbrown
1db33f4af1 Hotfix: exported fbx for kickout_hole 2024-04-16 15:49:32 -04:00