1
0
mirror of https://projects.caleb-brown.dev/UDRI-XRT/UDRIGEEKCup2024.git synced 2025-01-22 07:08:51 -05:00
UDRIGEEKCup2024/Assets/PolygonDungeon
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
..
Materials Added Dungeon content and reference scans 2024-04-16 13:20:50 -04:00
Models Added Dungeon content and reference scans 2024-04-16 13:20:50 -04:00
Prefabs Added Dungeon content and reference scans 2024-04-16 13:20:50 -04:00
Scenes Added Dungeon content and reference scans 2024-04-16 13:20:50 -04:00
Textures Added Dungeon content and reference scans 2024-04-16 13:20:50 -04:00
Materials.meta Added Dungeon content and reference scans 2024-04-16 13:20:50 -04:00
Models.meta Added Dungeon content and reference scans 2024-04-16 13:20:50 -04:00
Prefabs.meta Added Dungeon content and reference scans 2024-04-16 13:20:50 -04:00
Scenes.meta Added Dungeon content and reference scans 2024-04-16 13:20:50 -04:00
Textures.meta Added Dungeon content and reference scans 2024-04-16 13:20:50 -04:00