Skip to content

Commit

Permalink
Merge pull request #2118 from ExtendRealityLtd/feat/more-tilia-features
Browse files Browse the repository at this point in the history
Feat/more tilia features
  • Loading branch information
thestonefox authored Jun 17, 2021
2 parents 16b44a3 + d698bb3 commit 82d9b9b
Show file tree
Hide file tree
Showing 12 changed files with 13,250 additions and 1,413 deletions.
26 changes: 13 additions & 13 deletions Assets/Samples/Farm/Animations/ZipWire.anim
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ AnimationClip:
m_Curve:
- serializedVersion: 3
time: 0
value: {x: 0, y: 0, z: -11.1}
value: {x: 0, y: 0, z: -17.3}
inSlope: {x: 0, y: 0, z: 0}
outSlope: {x: 0, y: 0, z: 0}
tangentMode: 0
Expand All @@ -29,7 +29,7 @@ AnimationClip:
outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
- serializedVersion: 3
time: 0.27916667
value: {x: 0, y: 0, z: 12.4}
value: {x: 0, y: 0, z: 17.385}
inSlope: {x: 0, y: 0, z: 0}
outSlope: {x: 0, y: 0, z: 0}
tangentMode: 0
Expand All @@ -38,16 +38,16 @@ AnimationClip:
outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
- serializedVersion: 3
time: 0.30416667
value: {x: 0, y: 0, z: 12.4}
inSlope: {x: 0, y: 0, z: 0}
outSlope: {x: 0, y: 0, z: 0}
value: {x: 0, y: 0, z: 17}
inSlope: {x: 0, y: 0, z: -2.5607405}
outSlope: {x: 0, y: 0, z: -2.5607405}
tangentMode: 0
weightedMode: 0
inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
- serializedVersion: 3
time: 0.88055557
value: {x: 0, y: 0, z: -11.1}
value: {x: 0, y: 0, z: -17.3}
inSlope: {x: 0, y: 0, z: 1.45463}
outSlope: {x: 0, y: 0, z: 0}
tangentMode: 0
Expand All @@ -56,7 +56,7 @@ AnimationClip:
outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
- serializedVersion: 3
time: 1
value: {x: 0, y: 0, z: -11.1}
value: {x: 0, y: 0, z: -17.3}
inSlope: {x: 0, y: 0, z: 0}
outSlope: {x: 0, y: 0, z: 0}
tangentMode: 0
Expand Down Expand Up @@ -203,7 +203,7 @@ AnimationClip:
m_Curve:
- serializedVersion: 3
time: 0
value: -11.1
value: -17.3
inSlope: 0
outSlope: 0
tangentMode: 136
Expand All @@ -212,7 +212,7 @@ AnimationClip:
outWeight: 0.33333334
- serializedVersion: 3
time: 0.27916667
value: 12.4
value: 17.385
inSlope: 0
outSlope: 0
tangentMode: 136
Expand All @@ -221,16 +221,16 @@ AnimationClip:
outWeight: 0.33333334
- serializedVersion: 3
time: 0.30416667
value: 12.4
inSlope: 0
outSlope: 0
value: 17
inSlope: -2.5607405
outSlope: -2.5607405
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 0.88055557
value: -11.1
value: -17.3
inSlope: 1.45463
outSlope: 1.45463
tangentMode: 0
Expand Down
8 changes: 8 additions & 0 deletions Assets/Samples/Farm/Materials/Scarecrow.meta

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

77 changes: 77 additions & 0 deletions Assets/Samples/Farm/Materials/Scarecrow/ArmHighlight.mat

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 8 additions & 0 deletions Assets/Samples/Farm/Materials/Scarecrow/ArmHighlight.mat.meta

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

77 changes: 77 additions & 0 deletions Assets/Samples/Farm/Materials/Scarecrow/HeadHighlight.mat

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit 82d9b9b

Please sign in to comment.