Skip to content

feat: add roll #62

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Kalamari2002 wants to merge 4 commits into
base: main
Choose a base branch
from
Open

feat: add roll #62

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
e3f80c2
fix: adjust wallrun camera bound
Kalamari2002 Jul 26, 2026
be42de4
feat: add roll animation
Kalamari2002 Jul 26, 2026
327289a
feat: add roll state and functionality
Kalamari2002 Jul 26, 2026
2b0e1b6
chore: make roll duration longer, add transition time from roll to st…
Kalamari2002 Jul 26, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
425 changes: 0 additions & 425 deletions Assets/Animations/Player/Orientation/GroundStandUp.anim
View file
Open in desktop

This file was deleted.

8 changes: 0 additions & 8 deletions Assets/Animations/Player/Orientation/GroundStandUp.anim.meta
View file
Open in desktop

This file was deleted.

154 changes: 112 additions & 42 deletions Assets/Animations/Player/Orientation/PlayerOrientation.controller
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,6 +127,9 @@ AnimatorStateTransition:
- m_ConditionMode: 1
m_ConditionEvent: Grounded
m_EventTreshold: 0
- m_ConditionMode: 2
m_ConditionEvent: Rolling
m_EventTreshold: 0
m_DstStateMachine: {fileID: 0}
m_DstState: {fileID: -2465076779379803191}
m_Solo: 0
Expand Down Expand Up @@ -156,18 +159,15 @@ AnimatorStateMachine:
- serializedVersion: 1
m_State: {fileID: 8266268976970671112}
m_Position: {x: 50, y: 590, z: 0}
- serializedVersion: 1
m_State: {fileID: 912697715850440543}
m_Position: {x: 150, y: 30, z: 0}
- serializedVersion: 1
m_State: {fileID: 3997618425405177691}
m_Position: {x: 430, y: 280, z: 0}
- serializedVersion: 1
m_State: {fileID: -3668854303707722321}
m_Position: {x: 330, y: -20, z: 0}
m_Position: {x: 680, y: 490, z: 0}
- serializedVersion: 1
m_State: {fileID: -2465076779379803191}
m_Position: {x: 370, y: 590, z: 0}
- serializedVersion: 1
m_State: {fileID: -839922899556779156}
m_Position: {x: 720, y: 240, z: 0}
m_ChildStateMachines: []
m_AnyStateTransitions: []
m_EntryTransitions: []
Expand All @@ -178,17 +178,19 @@ AnimatorStateMachine:
m_ExitPosition: {x: 800, y: 120, z: 0}
m_ParentStateMachinePosition: {x: 800, y: 20, z: 0}
m_DefaultState: {fileID: -6959265476885965635}
--- !u!1102 &-3668854303707722321
--- !u!1102 &-2465076779379803191
AnimatorState:
serializedVersion: 6
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: AirStandUp
m_Name: GroundSlide
m_Speed: 1
m_CycleOffset: 0
m_Transitions: []
m_Transitions:
- {fileID: 8869372357425199926}
- {fileID: 960849644707303155}
m_StateMachineBehaviours: []
m_Position: {x: 50, y: 50, z: 0}
m_IKOnFeet: 0
Expand All @@ -198,25 +200,25 @@ AnimatorState:
m_MirrorParameterActive: 0
m_CycleOffsetParameterActive: 0
m_TimeParameterActive: 0
m_Motion: {fileID: 7400000, guid: f071f11c5d2957a49b02edcb646f9f89, type: 2}
m_Motion: {fileID: 7400000, guid: 3be7011ef2688db43a836a2ae26af94d, type: 2}
m_Tag:
m_SpeedParameter:
m_MirrorParameter:
m_CycleOffsetParameter:
m_TimeParameter:
--- !u!1102 &-2465076779379803191
--- !u!1102 &-839922899556779156
AnimatorState:
serializedVersion: 6
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: GroundSlide
m_Name: Roll
m_Speed: 1
m_CycleOffset: 0
m_Transitions:
- {fileID: 8869372357425199926}
- {fileID: 960849644707303155}
- {fileID: 2101414185491879145}
- {fileID: 5441160079636676230}
m_StateMachineBehaviours: []
m_Position: {x: 50, y: 50, z: 0}
m_IKOnFeet: 0
Expand All @@ -226,7 +228,7 @@ AnimatorState:
m_MirrorParameterActive: 0
m_CycleOffsetParameterActive: 0
m_TimeParameterActive: 0
m_Motion: {fileID: 7400000, guid: 3be7011ef2688db43a836a2ae26af94d, type: 2}
m_Motion: {fileID: 7400000, guid: ab09cca703b69c146acfbb69647b846f, type: 2}
m_Tag:
m_SpeedParameter:
m_MirrorParameter:
Expand Down Expand Up @@ -259,6 +261,12 @@ AnimatorController:
m_DefaultInt: 0
m_DefaultBool: 0
m_Controller: {fileID: 9100000}
- m_Name: Rolling
m_Type: 4
m_DefaultFloat: 0
m_DefaultInt: 0
m_DefaultBool: 0
m_Controller: {fileID: 9100000}
m_AnimatorLayers:
- serializedVersion: 5
m_Name: Base Layer
Expand All @@ -272,32 +280,6 @@ AnimatorController:
m_IKPass: 0
m_SyncedLayerAffectsTiming: 0
m_Controller: {fileID: 9100000}
--- !u!1102 &912697715850440543
AnimatorState:
serializedVersion: 6
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: GroundStandUp
m_Speed: 1
m_CycleOffset: 0
m_Transitions: []
m_StateMachineBehaviours: []
m_Position: {x: 50, y: 50, z: 0}
m_IKOnFeet: 0
m_WriteDefaultValues: 1
m_Mirror: 0
m_SpeedParameterActive: 0
m_MirrorParameterActive: 0
m_CycleOffsetParameterActive: 0
m_TimeParameterActive: 0
m_Motion: {fileID: 7400000, guid: ce3130571860da541911017ea755470b, type: 2}
m_Tag:
m_SpeedParameter:
m_MirrorParameter:
m_CycleOffsetParameter:
m_TimeParameter:
--- !u!1101 &960849644707303155
AnimatorStateTransition:
m_ObjectHideFlags: 1
Expand Down Expand Up @@ -326,6 +308,37 @@ AnimatorStateTransition:
m_InterruptionSource: 0
m_OrderedInterruption: 1
m_CanTransitionToSelf: 1
--- !u!1101 &2101414185491879145
AnimatorStateTransition:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name:
m_Conditions:
- m_ConditionMode: 2
m_ConditionEvent: CrouchPressed
m_EventTreshold: 0
- m_ConditionMode: 1
m_ConditionEvent: Grounded
m_EventTreshold: 0
- m_ConditionMode: 2
m_ConditionEvent: Rolling
m_EventTreshold: 0
m_DstStateMachine: {fileID: 0}
m_DstState: {fileID: -6959265476885965635}
m_Solo: 0
m_Mute: 0
m_IsExit: 0
serializedVersion: 3
m_TransitionDuration: 0.1
m_TransitionOffset: 0
m_ExitTime: 0
m_HasExitTime: 0
m_HasFixedDuration: 1
m_InterruptionSource: 0
m_OrderedInterruption: 1
m_CanTransitionToSelf: 1
--- !u!1102 &3997618425405177691
AnimatorState:
serializedVersion: 6
Expand All @@ -339,6 +352,7 @@ AnimatorState:
m_Transitions:
- {fileID: -4648518239752711752}
- {fileID: -4408986984054651228}
- {fileID: 7699341573661604819}
m_StateMachineBehaviours: []
m_Position: {x: 50, y: 50, z: 0}
m_IKOnFeet: 0
Expand All @@ -354,6 +368,31 @@ AnimatorState:
m_MirrorParameter:
m_CycleOffsetParameter:
m_TimeParameter:
--- !u!1101 &5441160079636676230
AnimatorStateTransition:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name:
m_Conditions:
- m_ConditionMode: 2
m_ConditionEvent: Grounded
m_EventTreshold: 0
m_DstStateMachine: {fileID: 0}
m_DstState: {fileID: -6959265476885965635}
m_Solo: 0
m_Mute: 0
m_IsExit: 0
serializedVersion: 3
m_TransitionDuration: 0.1
m_TransitionOffset: 0
m_ExitTime: 0
m_HasExitTime: 0
m_HasFixedDuration: 1
m_InterruptionSource: 0
m_OrderedInterruption: 1
m_CanTransitionToSelf: 1
--- !u!1101 &5665668721513457468
AnimatorStateTransition:
m_ObjectHideFlags: 1
Expand Down Expand Up @@ -382,6 +421,37 @@ AnimatorStateTransition:
m_InterruptionSource: 0
m_OrderedInterruption: 1
m_CanTransitionToSelf: 1
--- !u!1101 &7699341573661604819
AnimatorStateTransition:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name:
m_Conditions:
- m_ConditionMode: 1
m_ConditionEvent: Grounded
m_EventTreshold: 0
- m_ConditionMode: 1
m_ConditionEvent: CrouchPressed
m_EventTreshold: 0
- m_ConditionMode: 1
m_ConditionEvent: Rolling
m_EventTreshold: 0
m_DstStateMachine: {fileID: 0}
m_DstState: {fileID: -839922899556779156}
m_Solo: 0
m_Mute: 0
m_IsExit: 0
serializedVersion: 3
m_TransitionDuration: 0.1
m_TransitionOffset: 0
m_ExitTime: 0
m_HasExitTime: 1
m_HasFixedDuration: 1
m_InterruptionSource: 0
m_OrderedInterruption: 1
m_CanTransitionToSelf: 1
--- !u!1102 &8266268976970671112
AnimatorState:
serializedVersion: 6
Expand Down
Loading