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

3 Commits

Author SHA1 Message Date
Joshua Latham
961d177a2e Added colliders to Control and Green rooms. Main still WIP. 2024-04-18 00:59:55 -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
Joshua Latham
6102279e90 Added Dungeon content and reference scans 2024-04-16 13:20:50 -04:00