Skip to content

Commit 291b097

Browse files
committed
Updates from Build 2017
Adding teleport features and the teleport marker. Updating to MRTP8
1 parent 544fdf6 commit 291b097

Some content is hidden

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

48 files changed

+2037
-172
lines changed
Lines changed: 67 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,67 @@
1+
%YAML 1.1
2+
%TAG !u! tag:unity3d.com,2011:
3+
--- !u!91 &9100000
4+
AnimatorController:
5+
m_ObjectHideFlags: 0
6+
m_PrefabParentObject: {fileID: 0}
7+
m_PrefabInternal: {fileID: 0}
8+
m_Name: TeleportMarker
9+
serializedVersion: 5
10+
m_AnimatorParameters: []
11+
m_AnimatorLayers:
12+
- serializedVersion: 5
13+
m_Name: Base Layer
14+
m_StateMachine: {fileID: 1107320886440274984}
15+
m_Mask: {fileID: 0}
16+
m_Motions: []
17+
m_Behaviours: []
18+
m_BlendingMode: 0
19+
m_SyncedLayerIndex: -1
20+
m_DefaultWeight: 0
21+
m_IKPass: 0
22+
m_SyncedLayerAffectsTiming: 0
23+
m_Controller: {fileID: 9100000}
24+
--- !u!1102 &1102302651459350322
25+
AnimatorState:
26+
serializedVersion: 5
27+
m_ObjectHideFlags: 1
28+
m_PrefabParentObject: {fileID: 0}
29+
m_PrefabInternal: {fileID: 0}
30+
m_Name: teleportMarker_ani
31+
m_Speed: 1
32+
m_CycleOffset: 0
33+
m_Transitions: []
34+
m_StateMachineBehaviours: []
35+
m_Position: {x: 50, y: 50, z: 0}
36+
m_IKOnFeet: 0
37+
m_WriteDefaultValues: 1
38+
m_Mirror: 0
39+
m_SpeedParameterActive: 0
40+
m_MirrorParameterActive: 0
41+
m_CycleOffsetParameterActive: 0
42+
m_Motion: {fileID: 7400000, guid: 313822d830beadd46b4f6ef658cbd3cf, type: 2}
43+
m_Tag:
44+
m_SpeedParameter:
45+
m_MirrorParameter:
46+
m_CycleOffsetParameter:
47+
--- !u!1107 &1107320886440274984
48+
AnimatorStateMachine:
49+
serializedVersion: 5
50+
m_ObjectHideFlags: 1
51+
m_PrefabParentObject: {fileID: 0}
52+
m_PrefabInternal: {fileID: 0}
53+
m_Name: Base Layer
54+
m_ChildStates:
55+
- serializedVersion: 1
56+
m_State: {fileID: 1102302651459350322}
57+
m_Position: {x: 200, y: 0, z: 0}
58+
m_ChildStateMachines: []
59+
m_AnyStateTransitions: []
60+
m_EntryTransitions: []
61+
m_StateMachineTransitions: {}
62+
m_StateMachineBehaviours: []
63+
m_AnyStatePosition: {x: 50, y: 20, z: 0}
64+
m_EntryPosition: {x: 50, y: 120, z: 0}
65+
m_ExitPosition: {x: 800, y: 120, z: 0}
66+
m_ParentStateMachinePosition: {x: 800, y: 20, z: 0}
67+
m_DefaultState: {fileID: 1102302651459350322}

Assets/HoloToolkit/Input/Animations/TeleportMarker.controller.meta

Lines changed: 9 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)