Skip to content

Commit 7b12346

Browse files
committed
Merge branch 'release/v1.0.0'
2 parents 8eb506f + 29c0d1d commit 7b12346

File tree

302 files changed

+37600
-277
lines changed

Some content is hidden

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

302 files changed

+37600
-277
lines changed

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,3 +58,4 @@ sysinfo.txt
5858
# Crashlytics generated file
5959
crashlytics-build.properties
6060

61+
.idea

Assets/Animations.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/Animations/Logo.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.
Lines changed: 165 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,165 @@
1+
%YAML 1.1
2+
%TAG !u! tag:unity3d.com,2011:
3+
--- !u!91 &9100000
4+
AnimatorController:
5+
m_ObjectHideFlags: 0
6+
m_CorrespondingSourceObject: {fileID: 0}
7+
m_PrefabInstance: {fileID: 0}
8+
m_PrefabAsset: {fileID: 0}
9+
m_Name: Adrian Miasik Logo
10+
serializedVersion: 5
11+
m_AnimatorParameters:
12+
- m_Name: HoverEnter
13+
m_Type: 9
14+
m_DefaultFloat: 0
15+
m_DefaultInt: 0
16+
m_DefaultBool: 0
17+
m_Controller: {fileID: 9100000}
18+
- m_Name: HoverExit
19+
m_Type: 9
20+
m_DefaultFloat: 0
21+
m_DefaultInt: 0
22+
m_DefaultBool: 0
23+
m_Controller: {fileID: 9100000}
24+
m_AnimatorLayers:
25+
- serializedVersion: 5
26+
m_Name: Base Layer
27+
m_StateMachine: {fileID: 1107143449453106532}
28+
m_Mask: {fileID: 0}
29+
m_Motions: []
30+
m_Behaviours: []
31+
m_BlendingMode: 0
32+
m_SyncedLayerIndex: -1
33+
m_DefaultWeight: 0
34+
m_IKPass: 0
35+
m_SyncedLayerAffectsTiming: 0
36+
m_Controller: {fileID: 9100000}
37+
--- !u!1101 &1101689921003897924
38+
AnimatorStateTransition:
39+
m_ObjectHideFlags: 1
40+
m_CorrespondingSourceObject: {fileID: 0}
41+
m_PrefabInstance: {fileID: 0}
42+
m_PrefabAsset: {fileID: 0}
43+
m_Name:
44+
m_Conditions:
45+
- m_ConditionMode: 1
46+
m_ConditionEvent: HoverEnter
47+
m_EventTreshold: 0
48+
m_DstStateMachine: {fileID: 0}
49+
m_DstState: {fileID: 1102491961784731776}
50+
m_Solo: 0
51+
m_Mute: 0
52+
m_IsExit: 0
53+
serializedVersion: 3
54+
m_TransitionDuration: 0
55+
m_TransitionOffset: 0
56+
m_ExitTime: 0.75
57+
m_HasExitTime: 0
58+
m_HasFixedDuration: 1
59+
m_InterruptionSource: 0
60+
m_OrderedInterruption: 1
61+
m_CanTransitionToSelf: 1
62+
--- !u!1101 &1101828496024948822
63+
AnimatorStateTransition:
64+
m_ObjectHideFlags: 1
65+
m_CorrespondingSourceObject: {fileID: 0}
66+
m_PrefabInstance: {fileID: 0}
67+
m_PrefabAsset: {fileID: 0}
68+
m_Name:
69+
m_Conditions:
70+
- m_ConditionMode: 1
71+
m_ConditionEvent: HoverExit
72+
m_EventTreshold: 0
73+
m_DstStateMachine: {fileID: 0}
74+
m_DstState: {fileID: 1102363938864242956}
75+
m_Solo: 0
76+
m_Mute: 0
77+
m_IsExit: 0
78+
serializedVersion: 3
79+
m_TransitionDuration: 0.1
80+
m_TransitionOffset: 0
81+
m_ExitTime: 0.1
82+
m_HasExitTime: 1
83+
m_HasFixedDuration: 1
84+
m_InterruptionSource: 0
85+
m_OrderedInterruption: 1
86+
m_CanTransitionToSelf: 1
87+
--- !u!1102 &1102363938864242956
88+
AnimatorState:
89+
serializedVersion: 5
90+
m_ObjectHideFlags: 1
91+
m_CorrespondingSourceObject: {fileID: 0}
92+
m_PrefabInstance: {fileID: 0}
93+
m_PrefabAsset: {fileID: 0}
94+
m_Name: Idle
95+
m_Speed: 1
96+
m_CycleOffset: 0
97+
m_Transitions:
98+
- {fileID: 1101689921003897924}
99+
m_StateMachineBehaviours: []
100+
m_Position: {x: 50, y: 50, z: 0}
101+
m_IKOnFeet: 0
102+
m_WriteDefaultValues: 1
103+
m_Mirror: 0
104+
m_SpeedParameterActive: 0
105+
m_MirrorParameterActive: 0
106+
m_CycleOffsetParameterActive: 0
107+
m_TimeParameterActive: 0
108+
m_Motion: {fileID: 7400000, guid: aff7d16ee0c2143438804dfc80fb82fd, type: 2}
109+
m_Tag:
110+
m_SpeedParameter:
111+
m_MirrorParameter:
112+
m_CycleOffsetParameter:
113+
m_TimeParameter:
114+
--- !u!1102 &1102491961784731776
115+
AnimatorState:
116+
serializedVersion: 5
117+
m_ObjectHideFlags: 1
118+
m_CorrespondingSourceObject: {fileID: 0}
119+
m_PrefabInstance: {fileID: 0}
120+
m_PrefabAsset: {fileID: 0}
121+
m_Name: Hover
122+
m_Speed: 1
123+
m_CycleOffset: 0
124+
m_Transitions:
125+
- {fileID: 1101828496024948822}
126+
m_StateMachineBehaviours: []
127+
m_Position: {x: 50, y: 50, z: 0}
128+
m_IKOnFeet: 0
129+
m_WriteDefaultValues: 1
130+
m_Mirror: 0
131+
m_SpeedParameterActive: 0
132+
m_MirrorParameterActive: 0
133+
m_CycleOffsetParameterActive: 0
134+
m_TimeParameterActive: 0
135+
m_Motion: {fileID: 7400000, guid: 6f2e92b6e77165e4794985e99e08aa2f, type: 2}
136+
m_Tag:
137+
m_SpeedParameter:
138+
m_MirrorParameter:
139+
m_CycleOffsetParameter:
140+
m_TimeParameter:
141+
--- !u!1107 &1107143449453106532
142+
AnimatorStateMachine:
143+
serializedVersion: 5
144+
m_ObjectHideFlags: 1
145+
m_CorrespondingSourceObject: {fileID: 0}
146+
m_PrefabInstance: {fileID: 0}
147+
m_PrefabAsset: {fileID: 0}
148+
m_Name: Base Layer
149+
m_ChildStates:
150+
- serializedVersion: 1
151+
m_State: {fileID: 1102363938864242956}
152+
m_Position: {x: 168, y: 216, z: 0}
153+
- serializedVersion: 1
154+
m_State: {fileID: 1102491961784731776}
155+
m_Position: {x: 168, y: 120, z: 0}
156+
m_ChildStateMachines: []
157+
m_AnyStateTransitions: []
158+
m_EntryTransitions: []
159+
m_StateMachineTransitions: {}
160+
m_StateMachineBehaviours: []
161+
m_AnyStatePosition: {x: 192, y: 60, z: 0}
162+
m_EntryPosition: {x: 192, y: 276, z: 0}
163+
m_ExitPosition: {x: 396, y: 168, z: 0}
164+
m_ParentStateMachinePosition: {x: 800, y: 20, z: 0}
165+
m_DefaultState: {fileID: 1102363938864242956}

Assets/Animations/Logo/Adrian Miasik Logo.controller.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)