Skip to content

Commit 27bcf1d

Browse files
committed
Merge branch 'worldbuilding'
2 parents 6b2f9d4 + a2f2eff commit 27bcf1d

File tree

55 files changed

+223764
-3986
lines changed

Some content is hidden

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

55 files changed

+223764
-3986
lines changed

UOP1_Project/Assets/Cutscenes/BeachCandyCutscene.playable

Lines changed: 240 additions & 240 deletions
Large diffs are not rendered by default.

UOP1_Project/Assets/Cutscenes/ExampleCutscene.playable

Lines changed: 3 additions & 57 deletions
Original file line numberDiff line numberDiff line change
@@ -757,49 +757,13 @@ MonoBehaviour:
757757
m_BlendOutDuration: 0.4499999999999993
758758
m_MixInCurve:
759759
serializedVersion: 2
760-
m_Curve:
761-
- serializedVersion: 3
762-
time: 0
763-
value: 0
764-
inSlope: 0
765-
outSlope: 0
766-
tangentMode: 0
767-
weightedMode: 0
768-
inWeight: 0
769-
outWeight: 0
770-
- serializedVersion: 3
771-
time: 1
772-
value: 1
773-
inSlope: 0
774-
outSlope: 0
775-
tangentMode: 0
776-
weightedMode: 0
777-
inWeight: 0
778-
outWeight: 0
760+
m_Curve: []
779761
m_PreInfinity: 2
780762
m_PostInfinity: 2
781763
m_RotationOrder: 4
782764
m_MixOutCurve:
783765
serializedVersion: 2
784-
m_Curve:
785-
- serializedVersion: 3
786-
time: 0
787-
value: 1
788-
inSlope: 0
789-
outSlope: 0
790-
tangentMode: 0
791-
weightedMode: 0
792-
inWeight: 0
793-
outWeight: 0
794-
- serializedVersion: 3
795-
time: 1
796-
value: 0
797-
inSlope: 0
798-
outSlope: 0
799-
tangentMode: 0
800-
weightedMode: 0
801-
inWeight: 0
802-
outWeight: 0
766+
m_Curve: []
803767
m_PreInfinity: 2
804768
m_PostInfinity: 2
805769
m_RotationOrder: 4
@@ -826,25 +790,7 @@ MonoBehaviour:
826790
m_BlendOutDuration: -1
827791
m_MixInCurve:
828792
serializedVersion: 2
829-
m_Curve:
830-
- serializedVersion: 3
831-
time: 0
832-
value: 0
833-
inSlope: 0
834-
outSlope: 0
835-
tangentMode: 0
836-
weightedMode: 0
837-
inWeight: 0
838-
outWeight: 0
839-
- serializedVersion: 3
840-
time: 1
841-
value: 1
842-
inSlope: 0
843-
outSlope: 0
844-
tangentMode: 0
845-
weightedMode: 0
846-
inWeight: 0
847-
outWeight: 0
793+
m_Curve: []
848794
m_PreInfinity: 2
849795
m_PostInfinity: 2
850796
m_RotationOrder: 4

0 commit comments

Comments
 (0)