caleb-brown/UDRIGEEKCup2024
1
0
Fork 0
mirror of https://projects.caleb-brown.dev/UDRI-XRT/UDRIGEEKCup2024.git synced 2025-01-21 22:58:50 -05:00
Code Releases Activity

Merge branch 'development' into feature/RoomAlignment

Browse Source
This commit is contained in:
Noah 2024-04-23 14:07:55 -04:00
commit df3c487807
2 changed files with 41 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
Assets/Obstacles/Animations/Mavrik_Swining_Axe.anim
View File

@ -19,7 +19,7 @@ AnimationClip:
m_Curve:
- serializedVersion: 3
time: 0
value: {x: -60, y: 0, z: 0}
value: {x: 0, y: 90, z: 60}
inSlope: {x: 0, y: 0, z: 0}
outSlope: {x: 0, y: 0, z: 0}
tangentMode: 0
@ -27,8 +27,8 @@ AnimationClip:
inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
- serializedVersion: 3
time: 0.5
value: {x: 60, y: 0, z: 0}
time: 0.56666666
value: {x: 0, y: 90, z: -60}
inSlope: {x: 0, y: 0, z: 0}
outSlope: {x: 0, y: 0, z: 0}
tangentMode: 0
@ -37,7 +37,7 @@ AnimationClip:
outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
- serializedVersion: 3
time: 1
value: {x: -60, y: 0, z: 0}
value: {x: 0, y: 90, z: 60}
inSlope: {x: 0, y: 0, z: 0}
outSlope: {x: 0, y: 0, z: 0}
tangentMode: 0
@ -96,7 +96,7 @@ AnimationClip:
m_Curve:
- serializedVersion: 3
time: 0
value: -60
value: 0
inSlope: 0
outSlope: 0
tangentMode: 136
@ -104,8 +104,8 @@ AnimationClip:
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 0.5
value: 60
time: 0.56666666
value: 0
inSlope: 0
outSlope: 0
tangentMode: 136
@ -114,7 +114,7 @@ AnimationClip:
outWeight: 0.33333334
- serializedVersion: 3
time: 1
value: -60
value: 0
inSlope: 0
outSlope: 0
tangentMode: 136
@ -135,7 +135,7 @@ AnimationClip:
m_Curve:
- serializedVersion: 3
time: 0
value: 0
value: 90
inSlope: 0
outSlope: 0
tangentMode: 136
@ -143,8 +143,8 @@ AnimationClip:
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 0.5
value: 0
time: 0.56666666
value: 90
inSlope: 0
outSlope: 0
tangentMode: 136
@ -153,7 +153,7 @@ AnimationClip:
outWeight: 0.33333334
- serializedVersion: 3
time: 1
value: 0
value: 90
inSlope: 0
outSlope: 0
tangentMode: 136
@ -174,7 +174,7 @@ AnimationClip:
m_Curve:
- serializedVersion: 3
time: 0
value: 0
value: 60
inSlope: 0
outSlope: 0
tangentMode: 136
@ -182,8 +182,8 @@ AnimationClip:
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 0.5
value: 0
time: 0.56666666
value: -60
inSlope: 0
outSlope: 0
tangentMode: 136
@ -192,7 +192,7 @@ AnimationClip:
outWeight: 0.33333334
- serializedVersion: 3
time: 1
value: 0
value: 60
inSlope: 0
outSlope: 0
tangentMode: 136

59
Assets/Obstacles/Mavrik_Swinging_Axe.prefab
View File

@ -9,6 +9,7 @@ GameObject:
serializedVersion: 6
m_Component:
- component: {fileID: 2282981482360933419}
- component: {fileID: 5739147614449010991}
m_Layer: 0
m_Name: Mavrik_Swinging_Axe
m_TagString: Untagged
@ -24,14 +25,35 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4698206158612809156}
serializedVersion: 2
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalRotation: {x: 0, y: 0, z: 0.5, w: 0.8660254}
m_LocalPosition: {x: 0, y: 4.16, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children:
- {fileID: 8703011543340469622}
m_Father: {fileID: 0}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 60}
--- !u!95 &5739147614449010991
Animator:
serializedVersion: 5
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4698206158612809156}
m_Enabled: 1
m_Avatar: {fileID: 0}
m_Controller: {fileID: 9100000, guid: 3f54689f1280ee9459c2ef403a44557d, type: 2}
m_CullingMode: 0
m_UpdateMode: 0
m_ApplyRootMotion: 0
m_LinearVelocityBlending: 0
m_StabilizeFeet: 0
m_WarningMessage:
m_HasTransformHierarchy: 1
m_AllowConstantClipSamplingOptimization: 1
m_KeepAnimatorStateOnDisable: 0
m_WriteDefaultValuesOnDisable: 0
--- !u!1001 &8703011543340126084
PrefabInstance:
m_ObjectHideFlags: 0
@ -87,39 +109,8 @@ PrefabInstance:
m_RemovedComponents: []
m_RemovedGameObjects: []
m_AddedGameObjects: []
m_AddedComponents:
- targetCorrespondingSourceObject: {fileID: 149168, guid: bbc2c53a30a8f5c4981c071296e51c5f,
type: 3}
insertIndex: -1
addedObject: {fileID: 6323729413950520660}
m_AddedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: bbc2c53a30a8f5c4981c071296e51c5f, type: 3}
--- !u!1 &8703011543340271924 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 149168, guid: bbc2c53a30a8f5c4981c071296e51c5f,
type: 3}
m_PrefabInstance: {fileID: 8703011543340126084}
m_PrefabAsset: {fileID: 0}
--- !u!95 &6323729413950520660
Animator:
serializedVersion: 5
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8703011543340271924}
m_Enabled: 1
m_Avatar: {fileID: 0}
m_Controller: {fileID: 9100000, guid: 3f54689f1280ee9459c2ef403a44557d, type: 2}
m_CullingMode: 0
m_UpdateMode: 0
m_ApplyRootMotion: 0
m_LinearVelocityBlending: 0
m_StabilizeFeet: 0
m_WarningMessage:
m_HasTransformHierarchy: 1
m_AllowConstantClipSamplingOptimization: 1
m_KeepAnimatorStateOnDisable: 0
m_WriteDefaultValuesOnDisable: 0
--- !u!4 &8703011543340469622 stripped
Transform:
m_CorrespondingSourceObject: {fileID: 475890, guid: bbc2c53a30a8f5c4981c071296e51c5f,