Skip to content

Commit a762ed6

Browse files
bas-boopbas-boop
committed
Merge branch 'main' into feature/main-menu
2 parents f1d0d26 + 24575ea commit a762ed6

File tree

73 files changed

+14046
-62
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

73 files changed

+14046
-62
lines changed

‎Assets/Art/Animations/CatWalk.anim‎

Lines changed: 84 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,84 @@
1+
%YAML 1.1
2+
%TAG !u! tag:unity3d.com,2011:
3+
--- !u!74 &7400000
4+
AnimationClip:
5+
m_ObjectHideFlags: 0
6+
m_CorrespondingSourceObject: {fileID: 0}
7+
m_PrefabInstance: {fileID: 0}
8+
m_PrefabAsset: {fileID: 0}
9+
m_Name: CatWalk
10+
serializedVersion: 7
11+
m_Legacy: 0
12+
m_Compressed: 0
13+
m_UseHighQualityCurve: 1
14+
m_RotationCurves: []
15+
m_CompressedRotationCurves: []
16+
m_EulerCurves: []
17+
m_PositionCurves: []
18+
m_ScaleCurves: []
19+
m_FloatCurves: []
20+
m_PPtrCurves:
21+
- serializedVersion: 2
22+
curve:
23+
- time: 0
24+
value: {fileID: 1424314107, guid: ec094955668bcbe4fb8f2d34e7e37adc, type: 3}
25+
- time: 0.18333334
26+
value: {fileID: 1254103282, guid: ec094955668bcbe4fb8f2d34e7e37adc, type: 3}
27+
- time: 0.38333333
28+
value: {fileID: 2043275013, guid: ec094955668bcbe4fb8f2d34e7e37adc, type: 3}
29+
- time: 0.56666666
30+
value: {fileID: -2134024429, guid: ec094955668bcbe4fb8f2d34e7e37adc, type: 3}
31+
- time: 0.75
32+
value: {fileID: 1424314107, guid: ec094955668bcbe4fb8f2d34e7e37adc, type: 3}
33+
attribute: m_Sprite
34+
path:
35+
classID: 212
36+
script: {fileID: 0}
37+
flags: 2
38+
m_SampleRate: 60
39+
m_WrapMode: 0
40+
m_Bounds:
41+
m_Center: {x: 0, y: 0, z: 0}
42+
m_Extent: {x: 0, y: 0, z: 0}
43+
m_ClipBindingConstant:
44+
genericBindings:
45+
- serializedVersion: 2
46+
path: 0
47+
attribute: 0
48+
script: {fileID: 0}
49+
typeID: 212
50+
customType: 23
51+
isPPtrCurve: 1
52+
isIntCurve: 0
53+
isSerializeReferenceCurve: 0
54+
pptrCurveMapping:
55+
- {fileID: 1424314107, guid: ec094955668bcbe4fb8f2d34e7e37adc, type: 3}
56+
- {fileID: 1254103282, guid: ec094955668bcbe4fb8f2d34e7e37adc, type: 3}
57+
- {fileID: 2043275013, guid: ec094955668bcbe4fb8f2d34e7e37adc, type: 3}
58+
- {fileID: -2134024429, guid: ec094955668bcbe4fb8f2d34e7e37adc, type: 3}
59+
- {fileID: 1424314107, guid: ec094955668bcbe4fb8f2d34e7e37adc, type: 3}
60+
m_AnimationClipSettings:
61+
serializedVersion: 2
62+
m_AdditiveReferencePoseClip: {fileID: 0}
63+
m_AdditiveReferencePoseTime: 0
64+
m_StartTime: 0
65+
m_StopTime: 0.76666665
66+
m_OrientationOffsetY: 0
67+
m_Level: 0
68+
m_CycleOffset: 0
69+
m_HasAdditiveReferencePose: 0
70+
m_LoopTime: 1
71+
m_LoopBlend: 0
72+
m_LoopBlendOrientation: 0
73+
m_LoopBlendPositionY: 0
74+
m_LoopBlendPositionXZ: 0
75+
m_KeepOriginalOrientation: 0
76+
m_KeepOriginalPositionY: 1
77+
m_KeepOriginalPositionXZ: 0
78+
m_HeightFromFeet: 0
79+
m_Mirror: 0
80+
m_EditorCurves: []
81+
m_EulerEditorCurves: []
82+
m_HasGenericRootTransform: 0
83+
m_HasMotionFloatCurves: 0
84+
m_Events: []

‎Assets/Art/Animations/CatWalk.anim.meta‎

Lines changed: 8 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Assets/Art/Animations/CatWalkIntro.anim‎

Lines changed: 84 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,84 @@
1+
%YAML 1.1
2+
%TAG !u! tag:unity3d.com,2011:
3+
--- !u!74 &7400000
4+
AnimationClip:
5+
m_ObjectHideFlags: 0
6+
m_CorrespondingSourceObject: {fileID: 0}
7+
m_PrefabInstance: {fileID: 0}
8+
m_PrefabAsset: {fileID: 0}
9+
m_Name: CatWalkIntro
10+
serializedVersion: 7
11+
m_Legacy: 0
12+
m_Compressed: 0
13+
m_UseHighQualityCurve: 1
14+
m_RotationCurves: []
15+
m_CompressedRotationCurves: []
16+
m_EulerCurves: []
17+
m_PositionCurves: []
18+
m_ScaleCurves: []
19+
m_FloatCurves: []
20+
m_PPtrCurves:
21+
- serializedVersion: 2
22+
curve:
23+
- time: 0
24+
value: {fileID: -293956927, guid: 64d2264df4f168c4196ea3bc6626eef0, type: 3}
25+
- time: 0.16666667
26+
value: {fileID: -708159714, guid: 64d2264df4f168c4196ea3bc6626eef0, type: 3}
27+
- time: 0.38333333
28+
value: {fileID: 192037376, guid: 64d2264df4f168c4196ea3bc6626eef0, type: 3}
29+
- time: 0.5833333
30+
value: {fileID: -347694867, guid: 64d2264df4f168c4196ea3bc6626eef0, type: 3}
31+
- time: 0.75
32+
value: {fileID: -293956927, guid: 64d2264df4f168c4196ea3bc6626eef0, type: 3}
33+
attribute: m_Sprite
34+
path:
35+
classID: 212
36+
script: {fileID: 0}
37+
flags: 2
38+
m_SampleRate: 60
39+
m_WrapMode: 0
40+
m_Bounds:
41+
m_Center: {x: 0, y: 0, z: 0}
42+
m_Extent: {x: 0, y: 0, z: 0}
43+
m_ClipBindingConstant:
44+
genericBindings:
45+
- serializedVersion: 2
46+
path: 0
47+
attribute: 0
48+
script: {fileID: 0}
49+
typeID: 212
50+
customType: 23
51+
isPPtrCurve: 1
52+
isIntCurve: 0
53+
isSerializeReferenceCurve: 0
54+
pptrCurveMapping:
55+
- {fileID: -293956927, guid: 64d2264df4f168c4196ea3bc6626eef0, type: 3}
56+
- {fileID: -708159714, guid: 64d2264df4f168c4196ea3bc6626eef0, type: 3}
57+
- {fileID: 192037376, guid: 64d2264df4f168c4196ea3bc6626eef0, type: 3}
58+
- {fileID: -347694867, guid: 64d2264df4f168c4196ea3bc6626eef0, type: 3}
59+
- {fileID: -293956927, guid: 64d2264df4f168c4196ea3bc6626eef0, type: 3}
60+
m_AnimationClipSettings:
61+
serializedVersion: 2
62+
m_AdditiveReferencePoseClip: {fileID: 0}
63+
m_AdditiveReferencePoseTime: 0
64+
m_StartTime: 0
65+
m_StopTime: 0.76666665
66+
m_OrientationOffsetY: 0
67+
m_Level: 0
68+
m_CycleOffset: 0
69+
m_HasAdditiveReferencePose: 0
70+
m_LoopTime: 1
71+
m_LoopBlend: 1
72+
m_LoopBlendOrientation: 0
73+
m_LoopBlendPositionY: 0
74+
m_LoopBlendPositionXZ: 0
75+
m_KeepOriginalOrientation: 0
76+
m_KeepOriginalPositionY: 1
77+
m_KeepOriginalPositionXZ: 0
78+
m_HeightFromFeet: 0
79+
m_Mirror: 0
80+
m_EditorCurves: []
81+
m_EulerEditorCurves: []
82+
m_HasGenericRootTransform: 0
83+
m_HasMotionFloatCurves: 0
84+
m_Events: []

‎Assets/Art/Animations/CatWalkIntro.anim.meta‎

Lines changed: 8 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Assets/Art/Animations/Idle.anim‎

Lines changed: 75 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,75 @@
1+
%YAML 1.1
2+
%TAG !u! tag:unity3d.com,2011:
3+
--- !u!74 &7400000
4+
AnimationClip:
5+
m_ObjectHideFlags: 0
6+
m_CorrespondingSourceObject: {fileID: 0}
7+
m_PrefabInstance: {fileID: 0}
8+
m_PrefabAsset: {fileID: 0}
9+
m_Name: Idle
10+
serializedVersion: 7
11+
m_Legacy: 0
12+
m_Compressed: 0
13+
m_UseHighQualityCurve: 1
14+
m_RotationCurves: []
15+
m_CompressedRotationCurves: []
16+
m_EulerCurves: []
17+
m_PositionCurves: []
18+
m_ScaleCurves: []
19+
m_FloatCurves: []
20+
m_PPtrCurves:
21+
- serializedVersion: 2
22+
curve:
23+
- time: 0
24+
value: {fileID: 1424314107, guid: ec094955668bcbe4fb8f2d34e7e37adc, type: 3}
25+
- time: 1
26+
value: {fileID: 1424314107, guid: ec094955668bcbe4fb8f2d34e7e37adc, type: 3}
27+
attribute: m_Sprite
28+
path:
29+
classID: 212
30+
script: {fileID: 0}
31+
flags: 2
32+
m_SampleRate: 60
33+
m_WrapMode: 0
34+
m_Bounds:
35+
m_Center: {x: 0, y: 0, z: 0}
36+
m_Extent: {x: 0, y: 0, z: 0}
37+
m_ClipBindingConstant:
38+
genericBindings:
39+
- serializedVersion: 2
40+
path: 0
41+
attribute: 0
42+
script: {fileID: 0}
43+
typeID: 212
44+
customType: 23
45+
isPPtrCurve: 1
46+
isIntCurve: 0
47+
isSerializeReferenceCurve: 0
48+
pptrCurveMapping:
49+
- {fileID: 1424314107, guid: ec094955668bcbe4fb8f2d34e7e37adc, type: 3}
50+
- {fileID: 1424314107, guid: ec094955668bcbe4fb8f2d34e7e37adc, type: 3}
51+
m_AnimationClipSettings:
52+
serializedVersion: 2
53+
m_AdditiveReferencePoseClip: {fileID: 0}
54+
m_AdditiveReferencePoseTime: 0
55+
m_StartTime: 0
56+
m_StopTime: 1.0166667
57+
m_OrientationOffsetY: 0
58+
m_Level: 0
59+
m_CycleOffset: 0
60+
m_HasAdditiveReferencePose: 0
61+
m_LoopTime: 1
62+
m_LoopBlend: 0
63+
m_LoopBlendOrientation: 0
64+
m_LoopBlendPositionY: 0
65+
m_LoopBlendPositionXZ: 0
66+
m_KeepOriginalOrientation: 0
67+
m_KeepOriginalPositionY: 1
68+
m_KeepOriginalPositionXZ: 0
69+
m_HeightFromFeet: 0
70+
m_Mirror: 0
71+
m_EditorCurves: []
72+
m_EulerEditorCurves: []
73+
m_HasGenericRootTransform: 0
74+
m_HasMotionFloatCurves: 0
75+
m_Events: []

‎Assets/Art/Animations/Idle.anim.meta‎

Lines changed: 8 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)