Skip to content

Commit 671c19f

Browse files
committed
Version 1.6.0
Using coherence 1.0, updated UI, no gameplay changes
1 parent e751a06 commit 671c19f

295 files changed

Lines changed: 14316 additions & 20467 deletions

File tree

Some content is hidden

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

Assets/Art/Characters/Player/Animation/PlayerAnimator.controller

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -157,7 +157,7 @@ AnimatorStateTransition:
157157
m_Name:
158158
m_Conditions:
159159
- m_ConditionMode: 1
160-
m_ConditionEvent: Hail
160+
m_ConditionEvent: Wave
161161
m_EventTreshold: 0
162162
m_DstStateMachine: {fileID: 0}
163163
m_DstState: {fileID: -7694343950556850898}
@@ -332,7 +332,7 @@ AnimatorStateTransition:
332332
m_Name:
333333
m_Conditions:
334334
- m_ConditionMode: 1
335-
m_ConditionEvent: Hail
335+
m_ConditionEvent: Wave
336336
m_EventTreshold: 0
337337
m_DstStateMachine: {fileID: 0}
338338
m_DstState: {fileID: -7694343950556850898}
@@ -512,43 +512,43 @@ AnimatorController:
512512
m_DefaultFloat: 0
513513
m_DefaultInt: 0
514514
m_DefaultBool: 0
515-
m_Controller: {fileID: 9100000}
515+
m_Controller: {fileID: 0}
516516
- m_Name: MoveSpeed
517517
m_Type: 1
518518
m_DefaultFloat: 0
519519
m_DefaultInt: 0
520520
m_DefaultBool: 0
521-
m_Controller: {fileID: 9100000}
521+
m_Controller: {fileID: 0}
522522
- m_Name: Grounded
523523
m_Type: 4
524524
m_DefaultFloat: 0
525525
m_DefaultInt: 0
526526
m_DefaultBool: 0
527-
m_Controller: {fileID: 9100000}
527+
m_Controller: {fileID: 0}
528528
- m_Name: CarryingSmall
529529
m_Type: 4
530530
m_DefaultFloat: 0
531531
m_DefaultInt: 0
532532
m_DefaultBool: 0
533-
m_Controller: {fileID: 9100000}
533+
m_Controller: {fileID: 0}
534534
- m_Name: CarryingBig
535535
m_Type: 4
536536
m_DefaultFloat: 0
537537
m_DefaultInt: 0
538538
m_DefaultBool: 0
539-
m_Controller: {fileID: 9100000}
540-
- m_Name: Hail
539+
m_Controller: {fileID: 0}
540+
- m_Name: Wave
541541
m_Type: 9
542542
m_DefaultFloat: 0
543543
m_DefaultInt: 0
544544
m_DefaultBool: 0
545-
m_Controller: {fileID: 9100000}
545+
m_Controller: {fileID: 0}
546546
- m_Name: Plant
547547
m_Type: 9
548548
m_DefaultFloat: 0
549549
m_DefaultInt: 0
550550
m_DefaultBool: 0
551-
m_Controller: {fileID: 9100000}
551+
m_Controller: {fileID: 0}
552552
m_AnimatorLayers:
553553
- serializedVersion: 5
554554
m_Name: Base Layer

0 commit comments

Comments
 (0)