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

9 Commits

Author SHA1 Message Date
cbrown
a65c3e4947 Updated courses sample scene to use the same 2 qr codes (just in a different reference library asset)
Also added Unity.Logging package and a very simple controller script
2024-04-17 15:30:37 -04:00
cbrown
687aca50c1 Moved Atoms assets 2024-04-17 12:29:39 -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
be12f171f8 Control room course first draft. 2024-04-16 18:10:27 -04:00
cbrown
6b34f941fb WIP 2024-04-16 15:39:29 -04:00
Abraham
2a436692f4 added probuilder to fix merge conflict 2024-04-16 12:27:41 -04:00
Abraham
5f918e6879 Refactored code to split up responsibilities 2024-04-15 21:45:10 -04:00
Abraham Blain
6937e6a0e0 Improved visual of arrow and power bar 2024-04-11 13:32:28 -04:00
Calderon, Noah
a6758c4726 add base project 2024-04-05 11:33:14 -04:00