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 remote-tracking branch 'origin/development' into feature/Portraits

Browse Source
This commit is contained in:
Abraham Blain 2024-04-23 14:16:37 -04:00
commit a3db22de46
5 changed files with 78 additions and 57 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,

9
Assets/Samples/MAVRIC.GEEKCup/QRCode/Prefabs/course-01.prefab
View File

@ -25,7 +25,7 @@ Transform:
m_GameObject: {fileID: 713620919343188744}
serializedVersion: 2
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalPosition: {x: 0, y: 0, z: 2.33}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 1
m_Children:
@ -115,7 +115,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 1273508384157506, guid: 22b5884c8772b654489e4ed1d6987802, type: 3}
propertyPath: m_IsActive
value: 0
value: 1
objectReference: {fileID: 0}
- target: {fileID: 1298767457708356, guid: 22b5884c8772b654489e4ed1d6987802, type: 3}
propertyPath: m_Layer
@ -251,6 +251,11 @@ PrefabInstance:
propertyPath: m_LocalEulerAnglesHint.z
value: -90
objectReference: {fileID: 0}
- target: {fileID: 6770967778482584083, guid: 7fadbf24dc7c14173a60e008099ea15f,
type: 3}
propertyPath: m_Enabled
value: 0
objectReference: {fileID: 0}
m_RemovedComponents: []
m_RemovedGameObjects: []
m_AddedGameObjects: []

24
Assets/Samples/MAVRIC.GEEKCup/QRCode/Prefabs/course-02.prefab
View File

@ -25,7 +25,7 @@ Transform:
m_GameObject: {fileID: 1134376618909689890}
serializedVersion: 2
m_LocalRotation: {x: 0, y: 1, z: 0, w: 0}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalPosition: {x: 0.25, y: 0, z: 1.41}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 1
m_Children:
@ -115,7 +115,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 1273508384157506, guid: 22b5884c8772b654489e4ed1d6987802, type: 3}
propertyPath: m_IsActive
value: 0
value: 1
objectReference: {fileID: 0}
- target: {fileID: 1298767457708356, guid: 22b5884c8772b654489e4ed1d6987802, type: 3}
propertyPath: m_Layer
@ -196,11 +196,31 @@ PrefabInstance:
serializedVersion: 3
m_TransformParent: {fileID: 497128392619825818}
m_Modifications:
- target: {fileID: 2422903280073362139, guid: 23df27f8eab164f53a62e09b8b7c7325,
type: 3}
propertyPath: m_IsActive
value: 1
objectReference: {fileID: 0}
- target: {fileID: 2529697415610420776, guid: 23df27f8eab164f53a62e09b8b7c7325,
type: 3}
propertyPath: m_Name
value: Main_Room
objectReference: {fileID: 0}
- target: {fileID: 2624569838257048262, guid: 23df27f8eab164f53a62e09b8b7c7325,
type: 3}
propertyPath: m_Enabled
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6864179191514092418, guid: 23df27f8eab164f53a62e09b8b7c7325,
type: 3}
propertyPath: m_Enabled
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6864179191514092418, guid: 23df27f8eab164f53a62e09b8b7c7325,
type: 3}
propertyPath: m_Enabled
value: 1
objectReference: {fileID: 0}
- target: {fileID: 8622549130173790273, guid: 23df27f8eab164f53a62e09b8b7c7325,
type: 3}
propertyPath: m_LocalPosition.x

11
Assets/Samples/MAVRIC.GEEKCup/QRCode/Prefabs/course-03.prefab
View File

@ -98,7 +98,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 0
m_IsActive: 1
--- !u!4 &5326566115739564864
Transform:
m_ObjectHideFlags: 0
@ -143,7 +143,7 @@ Transform:
m_GameObject: {fileID: 3622802909112921052}
serializedVersion: 2
m_LocalRotation: {x: 0, y: 1, z: 0, w: 0}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalPosition: {x: -0.607, y: 0, z: 2.064}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 1
m_Children:
@ -458,7 +458,7 @@ Transform:
m_GameObject: {fileID: 9029269653538476387}
serializedVersion: 2
m_LocalRotation: {x: -0, y: -1, z: -0, w: 0}
m_LocalPosition: {x: 0, y: 0.2, z: 0}
m_LocalPosition: {x: -0.1, y: 0.2, z: 0.58}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
@ -522,6 +522,11 @@ PrefabInstance:
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3974055811102851262, guid: 0c2d73280f95e463cb0a553c52a488a7,
type: 3}
propertyPath: m_IsActive
value: 1
objectReference: {fileID: 0}
- target: {fileID: 4908809923922535070, guid: 0c2d73280f95e463cb0a553c52a488a7,
type: 3}
propertyPath: m_Name