1
0
mirror of https://projects.caleb-brown.dev/UDRI-XRT/UDRIGEEKCup2024.git synced 2025-01-22 15:18:25 -05:00
UDRIGEEKCup2024/Assets/Obstacles/Animations
Ktaylor 89b9912466 Merge branch 'development' into feature/FloorRamp
# Conflicts:
#	Assets/CoursePrefabs/Animations.meta
#	Assets/Obstacles.meta
#	Assets/PolygonDungeon/URP_ExtractMe.unitypackage.meta
#	Assets/Scenes/TestControls.unity
2024-04-19 11:58:43 -04:00
..
Skeleton_Ramp_Animation_Controller.controller Merge branch 'development' into feature/FloorRamp 2024-04-19 11:58:43 -04:00
Skeleton_Ramp_Animation_Controller.controller.meta Merge branch 'development' into feature/FloorRamp 2024-04-19 11:58:43 -04:00
SM_Prop_Tech_Chamber_Skeleton_01@Rumba Dancing (1).fbx Merge branch 'development' into feature/FloorRamp 2024-04-19 11:58:43 -04:00
SM_Prop_Tech_Chamber_Skeleton_01@Rumba Dancing (1).fbx.meta Merge branch 'development' into feature/FloorRamp 2024-04-19 11:58:43 -04:00
SM_Prop_Tech_Chamber_Skeleton_01@Rumba Dancing.fbx Merge branch 'development' into feature/FloorRamp 2024-04-19 11:58:43 -04:00
SM_Prop_Tech_Chamber_Skeleton_01@Rumba Dancing.fbx.meta Merge branch 'development' into feature/FloorRamp 2024-04-19 11:58:43 -04:00