From 3957886ff84f363757e02a3f9d4e2aca1d71ffd4 Mon Sep 17 00:00:00 2001 From: Kevin Poretti Date: Wed, 23 Mar 2022 22:30:47 -0400 Subject: [PATCH] Beginnings of a better dash --- .../Animations/NEW/Aim_Walk_BS.uasset | 3 - .../NEW/BS_Common_WalkRunStart.uasset | 3 - .../NEW/BS_Common_WalkRunStop.uasset | 3 - .../NEW/BS_Common_WalkRun_Loop.uasset | 3 - .../Animations/NEW/Common_Run_Loop.uasset | 3 - .../Animations/NEW/Dash/Dash_Step_B.uasset | 3 + .../NEW/Dash/Dash_Step_B_Montage.uasset | 3 + .../Animations/NEW/Dash/Dash_Step_F.uasset | 3 + .../NEW/Dash/Dash_Step_F_Montage.uasset | 3 + .../Animations/NEW/Dash/Dash_Step_L.uasset | 3 + .../NEW/Dash/Dash_Step_L_Montage.uasset | 3 + .../Animations/NEW/Dash/Dash_Step_R.uasset | 3 + .../NEW/Dash/Dash_Step_R_Montage.uasset | 3 + .../NEW/Fighter_Jump_B_Montage.uasset | 3 - .../NEW/Fighter_Jump_B_start.uasset | 3 - .../NEW/Fighter_Jump_F_Montage.uasset | 3 - .../Animations/NEW/Fighter_Jump_F_loop.uasset | 3 - .../NEW/Fighter_Jump_F_start.uasset | 3 - .../NEW/Fighter_Jump_Montage.uasset | 3 - .../Animations/NEW/Fighter_Jump_loop.uasset | 3 - .../Animations/NEW/Fighter_Jump_loop1.uasset | 3 - .../Animations/NEW/Fighter_Jump_start.uasset | 3 - .../Animations/NEW/GhostLady_AnimBP.uasset | 3 - .../NEW/HandGun_Aim_F_Walk_BL_Loop.uasset | 3 - .../NEW/HandGun_Aim_F_Walk_BR_Loop.uasset | 3 - .../NEW/HandGun_Aim_F_Walk_B_Loop.uasset | 3 - .../NEW/HandGun_Aim_F_Walk_FL_Loop.uasset | 3 - .../NEW/HandGun_Aim_F_Walk_FR_Loop.uasset | 3 - .../NEW/HandGun_Aim_F_Walk_F_Loop.uasset | 3 - .../NEW/HandGun_Aim_F_Walk_L_Loop.uasset | 3 - .../NEW/HandGun_Aim_F_Walk_R_Loop.uasset | 3 - .../Animations/NEW/HandGun_Common_Idle.uasset | 3 - .../NEW/HandGun_Common_Jump_End.uasset | 3 - .../NEW/HandGun_Common_Run_End.uasset | 3 - .../NEW/HandGun_Common_Run_Loop.uasset | 3 - .../NEW/HandGun_Common_Run_Start.uasset | 3 - .../NEW/HandGun_Common_Sprint.uasset | 3 - .../NEW/HandGun_Common_Walk_End.uasset | 3 - .../NEW/HandGun_Common_Walk_Loop.uasset | 3 - .../NEW/HandGun_Common_Walk_Start.uasset | 3 - .../NEW/Locomotion/Aim_Walk_BS.uasset | 3 + .../Locomotion/BS_Common_WalkRunStart.uasset | 3 + .../Locomotion/BS_Common_WalkRunStop.uasset | 3 + .../Locomotion/BS_Common_WalkRun_Loop.uasset | 3 + .../NEW/Locomotion/Common_Run_Loop.uasset | 3 + .../Locomotion/Fighter_Jump_B_Montage.uasset | 3 + .../Locomotion/Fighter_Jump_B_start.uasset | 3 + .../Locomotion/Fighter_Jump_F_Montage.uasset | 3 + .../NEW/Locomotion/Fighter_Jump_F_loop.uasset | 3 + .../Locomotion/Fighter_Jump_F_start.uasset | 3 + .../Locomotion/Fighter_Jump_Montage.uasset | 3 + .../NEW/Locomotion/Fighter_Jump_loop.uasset | 3 + .../NEW/Locomotion/Fighter_Jump_loop1.uasset | 3 + .../NEW/Locomotion/Fighter_Jump_start.uasset | 3 + .../NEW/Locomotion/GhostLady_AnimBP.uasset | 3 + .../HandGun_Aim_F_Walk_BL_Loop.uasset | 3 + .../HandGun_Aim_F_Walk_BR_Loop.uasset | 3 + .../HandGun_Aim_F_Walk_B_Loop.uasset | 3 + .../HandGun_Aim_F_Walk_FL_Loop.uasset | 3 + .../HandGun_Aim_F_Walk_FR_Loop.uasset | 3 + .../HandGun_Aim_F_Walk_F_Loop.uasset | 3 + .../HandGun_Aim_F_Walk_L_Loop.uasset | 3 + .../HandGun_Aim_F_Walk_R_Loop.uasset | 3 + .../NEW/Locomotion/HandGun_Common_Idle.uasset | 3 + .../Locomotion/HandGun_Common_Jump_End.uasset | 3 + .../Locomotion/HandGun_Common_Run_End.uasset | 3 + .../Locomotion/HandGun_Common_Run_Loop.uasset | 3 + .../HandGun_Common_Run_Start.uasset | 3 + .../Locomotion/HandGun_Common_Sprint.uasset | 3 + .../Locomotion/HandGun_Common_Walk_End.uasset | 3 + .../HandGun_Common_Walk_Loop.uasset | 3 + .../HandGun_Common_Walk_Start.uasset | 3 + .../Protagonist/BP_NewProtag.uasset | 4 +- .../Combines/SK_FemaleBase_Skeleton.uasset | 4 +- .../OLD/Mesh/UE4_Mannequin_Skeleton.uasset | 2 +- SwordNGun/Content/Maps/MovementTest.umap | 2 +- .../SNGCharacterMovementComponent.cpp | 109 ++++++++++++---- .../Public/Characters/SNGCharacterBase.h | 7 +- .../SNGCharacterMovementComponent.h | 117 ++++++++++++++---- 79 files changed, 310 insertions(+), 151 deletions(-) delete mode 100644 SwordNGun/Content/Characters/Protagonist/Animations/NEW/Aim_Walk_BS.uasset delete mode 100644 SwordNGun/Content/Characters/Protagonist/Animations/NEW/BS_Common_WalkRunStart.uasset delete mode 100644 SwordNGun/Content/Characters/Protagonist/Animations/NEW/BS_Common_WalkRunStop.uasset delete mode 100644 SwordNGun/Content/Characters/Protagonist/Animations/NEW/BS_Common_WalkRun_Loop.uasset delete mode 100644 SwordNGun/Content/Characters/Protagonist/Animations/NEW/Common_Run_Loop.uasset create mode 100644 SwordNGun/Content/Characters/Protagonist/Animations/NEW/Dash/Dash_Step_B.uasset create mode 100644 SwordNGun/Content/Characters/Protagonist/Animations/NEW/Dash/Dash_Step_B_Montage.uasset create mode 100644 SwordNGun/Content/Characters/Protagonist/Animations/NEW/Dash/Dash_Step_F.uasset create mode 100644 SwordNGun/Content/Characters/Protagonist/Animations/NEW/Dash/Dash_Step_F_Montage.uasset create mode 100644 SwordNGun/Content/Characters/Protagonist/Animations/NEW/Dash/Dash_Step_L.uasset create mode 100644 SwordNGun/Content/Characters/Protagonist/Animations/NEW/Dash/Dash_Step_L_Montage.uasset create mode 100644 SwordNGun/Content/Characters/Protagonist/Animations/NEW/Dash/Dash_Step_R.uasset create mode 100644 SwordNGun/Content/Characters/Protagonist/Animations/NEW/Dash/Dash_Step_R_Montage.uasset delete mode 100644 SwordNGun/Content/Characters/Protagonist/Animations/NEW/Fighter_Jump_B_Montage.uasset delete mode 100644 SwordNGun/Content/Characters/Protagonist/Animations/NEW/Fighter_Jump_B_start.uasset delete mode 100644 SwordNGun/Content/Characters/Protagonist/Animations/NEW/Fighter_Jump_F_Montage.uasset delete mode 100644 SwordNGun/Content/Characters/Protagonist/Animations/NEW/Fighter_Jump_F_loop.uasset delete mode 100644 SwordNGun/Content/Characters/Protagonist/Animations/NEW/Fighter_Jump_F_start.uasset delete mode 100644 SwordNGun/Content/Characters/Protagonist/Animations/NEW/Fighter_Jump_Montage.uasset delete mode 100644 SwordNGun/Content/Characters/Protagonist/Animations/NEW/Fighter_Jump_loop.uasset delete mode 100644 SwordNGun/Content/Characters/Protagonist/Animations/NEW/Fighter_Jump_loop1.uasset delete mode 100644 SwordNGun/Content/Characters/Protagonist/Animations/NEW/Fighter_Jump_start.uasset delete mode 100644 SwordNGun/Content/Characters/Protagonist/Animations/NEW/GhostLady_AnimBP.uasset delete mode 100644 SwordNGun/Content/Characters/Protagonist/Animations/NEW/HandGun_Aim_F_Walk_BL_Loop.uasset delete mode 100644 SwordNGun/Content/Characters/Protagonist/Animations/NEW/HandGun_Aim_F_Walk_BR_Loop.uasset delete mode 100644 SwordNGun/Content/Characters/Protagonist/Animations/NEW/HandGun_Aim_F_Walk_B_Loop.uasset delete mode 100644 SwordNGun/Content/Characters/Protagonist/Animations/NEW/HandGun_Aim_F_Walk_FL_Loop.uasset delete mode 100644 SwordNGun/Content/Characters/Protagonist/Animations/NEW/HandGun_Aim_F_Walk_FR_Loop.uasset delete mode 100644 SwordNGun/Content/Characters/Protagonist/Animations/NEW/HandGun_Aim_F_Walk_F_Loop.uasset delete mode 100644 SwordNGun/Content/Characters/Protagonist/Animations/NEW/HandGun_Aim_F_Walk_L_Loop.uasset delete mode 100644 SwordNGun/Content/Characters/Protagonist/Animations/NEW/HandGun_Aim_F_Walk_R_Loop.uasset delete mode 100644 SwordNGun/Content/Characters/Protagonist/Animations/NEW/HandGun_Common_Idle.uasset delete mode 100644 SwordNGun/Content/Characters/Protagonist/Animations/NEW/HandGun_Common_Jump_End.uasset delete mode 100644 SwordNGun/Content/Characters/Protagonist/Animations/NEW/HandGun_Common_Run_End.uasset delete mode 100644 SwordNGun/Content/Characters/Protagonist/Animations/NEW/HandGun_Common_Run_Loop.uasset delete mode 100644 SwordNGun/Content/Characters/Protagonist/Animations/NEW/HandGun_Common_Run_Start.uasset delete mode 100644 SwordNGun/Content/Characters/Protagonist/Animations/NEW/HandGun_Common_Sprint.uasset delete mode 100644 SwordNGun/Content/Characters/Protagonist/Animations/NEW/HandGun_Common_Walk_End.uasset delete mode 100644 SwordNGun/Content/Characters/Protagonist/Animations/NEW/HandGun_Common_Walk_Loop.uasset delete mode 100644 SwordNGun/Content/Characters/Protagonist/Animations/NEW/HandGun_Common_Walk_Start.uasset create mode 100644 SwordNGun/Content/Characters/Protagonist/Animations/NEW/Locomotion/Aim_Walk_BS.uasset create mode 100644 SwordNGun/Content/Characters/Protagonist/Animations/NEW/Locomotion/BS_Common_WalkRunStart.uasset create mode 100644 SwordNGun/Content/Characters/Protagonist/Animations/NEW/Locomotion/BS_Common_WalkRunStop.uasset create mode 100644 SwordNGun/Content/Characters/Protagonist/Animations/NEW/Locomotion/BS_Common_WalkRun_Loop.uasset create mode 100644 SwordNGun/Content/Characters/Protagonist/Animations/NEW/Locomotion/Common_Run_Loop.uasset create mode 100644 SwordNGun/Content/Characters/Protagonist/Animations/NEW/Locomotion/Fighter_Jump_B_Montage.uasset create mode 100644 SwordNGun/Content/Characters/Protagonist/Animations/NEW/Locomotion/Fighter_Jump_B_start.uasset create mode 100644 SwordNGun/Content/Characters/Protagonist/Animations/NEW/Locomotion/Fighter_Jump_F_Montage.uasset create mode 100644 SwordNGun/Content/Characters/Protagonist/Animations/NEW/Locomotion/Fighter_Jump_F_loop.uasset create mode 100644 SwordNGun/Content/Characters/Protagonist/Animations/NEW/Locomotion/Fighter_Jump_F_start.uasset create mode 100644 SwordNGun/Content/Characters/Protagonist/Animations/NEW/Locomotion/Fighter_Jump_Montage.uasset create mode 100644 SwordNGun/Content/Characters/Protagonist/Animations/NEW/Locomotion/Fighter_Jump_loop.uasset create mode 100644 SwordNGun/Content/Characters/Protagonist/Animations/NEW/Locomotion/Fighter_Jump_loop1.uasset create mode 100644 SwordNGun/Content/Characters/Protagonist/Animations/NEW/Locomotion/Fighter_Jump_start.uasset create mode 100644 SwordNGun/Content/Characters/Protagonist/Animations/NEW/Locomotion/GhostLady_AnimBP.uasset create mode 100644 SwordNGun/Content/Characters/Protagonist/Animations/NEW/Locomotion/HandGun_Aim_F_Walk_BL_Loop.uasset create mode 100644 SwordNGun/Content/Characters/Protagonist/Animations/NEW/Locomotion/HandGun_Aim_F_Walk_BR_Loop.uasset create mode 100644 SwordNGun/Content/Characters/Protagonist/Animations/NEW/Locomotion/HandGun_Aim_F_Walk_B_Loop.uasset create mode 100644 SwordNGun/Content/Characters/Protagonist/Animations/NEW/Locomotion/HandGun_Aim_F_Walk_FL_Loop.uasset create mode 100644 SwordNGun/Content/Characters/Protagonist/Animations/NEW/Locomotion/HandGun_Aim_F_Walk_FR_Loop.uasset create mode 100644 SwordNGun/Content/Characters/Protagonist/Animations/NEW/Locomotion/HandGun_Aim_F_Walk_F_Loop.uasset create mode 100644 SwordNGun/Content/Characters/Protagonist/Animations/NEW/Locomotion/HandGun_Aim_F_Walk_L_Loop.uasset create mode 100644 SwordNGun/Content/Characters/Protagonist/Animations/NEW/Locomotion/HandGun_Aim_F_Walk_R_Loop.uasset create mode 100644 SwordNGun/Content/Characters/Protagonist/Animations/NEW/Locomotion/HandGun_Common_Idle.uasset create mode 100644 SwordNGun/Content/Characters/Protagonist/Animations/NEW/Locomotion/HandGun_Common_Jump_End.uasset create mode 100644 SwordNGun/Content/Characters/Protagonist/Animations/NEW/Locomotion/HandGun_Common_Run_End.uasset create mode 100644 SwordNGun/Content/Characters/Protagonist/Animations/NEW/Locomotion/HandGun_Common_Run_Loop.uasset create mode 100644 SwordNGun/Content/Characters/Protagonist/Animations/NEW/Locomotion/HandGun_Common_Run_Start.uasset create mode 100644 SwordNGun/Content/Characters/Protagonist/Animations/NEW/Locomotion/HandGun_Common_Sprint.uasset create mode 100644 SwordNGun/Content/Characters/Protagonist/Animations/NEW/Locomotion/HandGun_Common_Walk_End.uasset create mode 100644 SwordNGun/Content/Characters/Protagonist/Animations/NEW/Locomotion/HandGun_Common_Walk_Loop.uasset create mode 100644 SwordNGun/Content/Characters/Protagonist/Animations/NEW/Locomotion/HandGun_Common_Walk_Start.uasset diff --git a/SwordNGun/Content/Characters/Protagonist/Animations/NEW/Aim_Walk_BS.uasset b/SwordNGun/Content/Characters/Protagonist/Animations/NEW/Aim_Walk_BS.uasset deleted file mode 100644 index 89eaa16..0000000 --- a/SwordNGun/Content/Characters/Protagonist/Animations/NEW/Aim_Walk_BS.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:d0c5b1466cd47a5ea57e3038953ae19e304912431b7cb41ef1d25371e158d4ed -size 100787 diff --git a/SwordNGun/Content/Characters/Protagonist/Animations/NEW/BS_Common_WalkRunStart.uasset b/SwordNGun/Content/Characters/Protagonist/Animations/NEW/BS_Common_WalkRunStart.uasset deleted file mode 100644 index e6037fc..0000000 --- a/SwordNGun/Content/Characters/Protagonist/Animations/NEW/BS_Common_WalkRunStart.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:2ad4edac04d8a025a125bb8422f75898b7f983e2cbc82f4757da86b2e4458445 -size 97519 diff --git a/SwordNGun/Content/Characters/Protagonist/Animations/NEW/BS_Common_WalkRunStop.uasset b/SwordNGun/Content/Characters/Protagonist/Animations/NEW/BS_Common_WalkRunStop.uasset deleted file mode 100644 index 340ab19..0000000 --- a/SwordNGun/Content/Characters/Protagonist/Animations/NEW/BS_Common_WalkRunStop.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:3d793171e0c309e4ec3c7ad23b6804d7e4a3c4c7f94bddb13f0025ddc1193dad -size 97507 diff --git a/SwordNGun/Content/Characters/Protagonist/Animations/NEW/BS_Common_WalkRun_Loop.uasset b/SwordNGun/Content/Characters/Protagonist/Animations/NEW/BS_Common_WalkRun_Loop.uasset deleted file mode 100644 index 78b0685..0000000 --- a/SwordNGun/Content/Characters/Protagonist/Animations/NEW/BS_Common_WalkRun_Loop.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:29ecfc3685d637f2d097b0e74b63fc30b8e1b5da20f82b28c6037f2a1bb5f720 -size 98196 diff --git a/SwordNGun/Content/Characters/Protagonist/Animations/NEW/Common_Run_Loop.uasset b/SwordNGun/Content/Characters/Protagonist/Animations/NEW/Common_Run_Loop.uasset deleted file mode 100644 index 913ed94..0000000 --- a/SwordNGun/Content/Characters/Protagonist/Animations/NEW/Common_Run_Loop.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:ab4c3fdb19b17ed2687e089591a111eec004472bfe92618a425e5c3c802626f5 -size 129111 diff --git a/SwordNGun/Content/Characters/Protagonist/Animations/NEW/Dash/Dash_Step_B.uasset b/SwordNGun/Content/Characters/Protagonist/Animations/NEW/Dash/Dash_Step_B.uasset new file mode 100644 index 0000000..910ff99 --- /dev/null +++ b/SwordNGun/Content/Characters/Protagonist/Animations/NEW/Dash/Dash_Step_B.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d5b670f6ca40496376b2a9e41d4051d4801c81e7c8fb5c7fba195b2db73d6c60 +size 173776 diff --git a/SwordNGun/Content/Characters/Protagonist/Animations/NEW/Dash/Dash_Step_B_Montage.uasset b/SwordNGun/Content/Characters/Protagonist/Animations/NEW/Dash/Dash_Step_B_Montage.uasset new file mode 100644 index 0000000..0f95dc3 --- /dev/null +++ b/SwordNGun/Content/Characters/Protagonist/Animations/NEW/Dash/Dash_Step_B_Montage.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:087abb836bf20d8e74b735e415b027a4eb3ecbfb4c0ab46529e89f65aae91644 +size 96184 diff --git a/SwordNGun/Content/Characters/Protagonist/Animations/NEW/Dash/Dash_Step_F.uasset b/SwordNGun/Content/Characters/Protagonist/Animations/NEW/Dash/Dash_Step_F.uasset new file mode 100644 index 0000000..59ee59c --- /dev/null +++ b/SwordNGun/Content/Characters/Protagonist/Animations/NEW/Dash/Dash_Step_F.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:72a37ee70843b4c4958d50389426a61707e640ddd279bd37ea0e1fccb44a0d19 +size 156351 diff --git a/SwordNGun/Content/Characters/Protagonist/Animations/NEW/Dash/Dash_Step_F_Montage.uasset b/SwordNGun/Content/Characters/Protagonist/Animations/NEW/Dash/Dash_Step_F_Montage.uasset new file mode 100644 index 0000000..8338975 --- /dev/null +++ b/SwordNGun/Content/Characters/Protagonist/Animations/NEW/Dash/Dash_Step_F_Montage.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:4b4192666f769d3ab6668304682615c4e9094f66d97282c1c2f4cb5f69d4863f +size 94759 diff --git a/SwordNGun/Content/Characters/Protagonist/Animations/NEW/Dash/Dash_Step_L.uasset b/SwordNGun/Content/Characters/Protagonist/Animations/NEW/Dash/Dash_Step_L.uasset new file mode 100644 index 0000000..5a80d48 --- /dev/null +++ b/SwordNGun/Content/Characters/Protagonist/Animations/NEW/Dash/Dash_Step_L.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a92b71da428e82ff61421de139f8b9d971f3eef1821412bff41f2f6a00bed52a +size 173020 diff --git a/SwordNGun/Content/Characters/Protagonist/Animations/NEW/Dash/Dash_Step_L_Montage.uasset b/SwordNGun/Content/Characters/Protagonist/Animations/NEW/Dash/Dash_Step_L_Montage.uasset new file mode 100644 index 0000000..fe01137 --- /dev/null +++ b/SwordNGun/Content/Characters/Protagonist/Animations/NEW/Dash/Dash_Step_L_Montage.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:5808507ebe203db589896e69b275fed1fad145f98f647c8edbab1ec4aa23a574 +size 97348 diff --git a/SwordNGun/Content/Characters/Protagonist/Animations/NEW/Dash/Dash_Step_R.uasset b/SwordNGun/Content/Characters/Protagonist/Animations/NEW/Dash/Dash_Step_R.uasset new file mode 100644 index 0000000..1417dd6 --- /dev/null +++ b/SwordNGun/Content/Characters/Protagonist/Animations/NEW/Dash/Dash_Step_R.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:5951e49bd3b924d8a23d9532e23f0f9beed27151dd8339827ca00e05baecebec +size 163364 diff --git a/SwordNGun/Content/Characters/Protagonist/Animations/NEW/Dash/Dash_Step_R_Montage.uasset b/SwordNGun/Content/Characters/Protagonist/Animations/NEW/Dash/Dash_Step_R_Montage.uasset new file mode 100644 index 0000000..a07151f --- /dev/null +++ b/SwordNGun/Content/Characters/Protagonist/Animations/NEW/Dash/Dash_Step_R_Montage.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:2659a534c3a8d503a56028a015208d9705efdb8f22461fd9743f3302b619319d +size 97932 diff --git a/SwordNGun/Content/Characters/Protagonist/Animations/NEW/Fighter_Jump_B_Montage.uasset b/SwordNGun/Content/Characters/Protagonist/Animations/NEW/Fighter_Jump_B_Montage.uasset deleted file mode 100644 index 89c5729..0000000 --- a/SwordNGun/Content/Characters/Protagonist/Animations/NEW/Fighter_Jump_B_Montage.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:ff4e65476082600120a6846c9c893c9fbe7ce7ae78277d5aab7dc8015f18b3ee -size 103082 diff --git a/SwordNGun/Content/Characters/Protagonist/Animations/NEW/Fighter_Jump_B_start.uasset b/SwordNGun/Content/Characters/Protagonist/Animations/NEW/Fighter_Jump_B_start.uasset deleted file mode 100644 index 6870725..0000000 --- a/SwordNGun/Content/Characters/Protagonist/Animations/NEW/Fighter_Jump_B_start.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:e7e6c0fff80462ed98d474f97486ac2b3f7a73def7b5615f771fc2b7d58e0fef -size 124935 diff --git a/SwordNGun/Content/Characters/Protagonist/Animations/NEW/Fighter_Jump_F_Montage.uasset b/SwordNGun/Content/Characters/Protagonist/Animations/NEW/Fighter_Jump_F_Montage.uasset deleted file mode 100644 index 8add026..0000000 --- a/SwordNGun/Content/Characters/Protagonist/Animations/NEW/Fighter_Jump_F_Montage.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:9287b72ad691256db77f1f11be8a79d0fdc6e349f01aa06c61ebbe55caf00bc4 -size 103082 diff --git a/SwordNGun/Content/Characters/Protagonist/Animations/NEW/Fighter_Jump_F_loop.uasset b/SwordNGun/Content/Characters/Protagonist/Animations/NEW/Fighter_Jump_F_loop.uasset deleted file mode 100644 index bb1b6d6..0000000 --- a/SwordNGun/Content/Characters/Protagonist/Animations/NEW/Fighter_Jump_F_loop.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:4d8a5df4beecef7e56f2bae78147e7b78f2824e63c985607f56f09ebe219a188 -size 122544 diff --git a/SwordNGun/Content/Characters/Protagonist/Animations/NEW/Fighter_Jump_F_start.uasset b/SwordNGun/Content/Characters/Protagonist/Animations/NEW/Fighter_Jump_F_start.uasset deleted file mode 100644 index 7c55518..0000000 --- a/SwordNGun/Content/Characters/Protagonist/Animations/NEW/Fighter_Jump_F_start.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:58679a3fa93697747e069609d170194975cf04b4c5f38d2620c72850b3fbf731 -size 120022 diff --git a/SwordNGun/Content/Characters/Protagonist/Animations/NEW/Fighter_Jump_Montage.uasset b/SwordNGun/Content/Characters/Protagonist/Animations/NEW/Fighter_Jump_Montage.uasset deleted file mode 100644 index b07594d..0000000 --- a/SwordNGun/Content/Characters/Protagonist/Animations/NEW/Fighter_Jump_Montage.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:e85ef070211aa72a98b22f15b68bb75b6cdb17d624b7517b2985d2e14a5c3df0 -size 102424 diff --git a/SwordNGun/Content/Characters/Protagonist/Animations/NEW/Fighter_Jump_loop.uasset b/SwordNGun/Content/Characters/Protagonist/Animations/NEW/Fighter_Jump_loop.uasset deleted file mode 100644 index be4db82..0000000 --- a/SwordNGun/Content/Characters/Protagonist/Animations/NEW/Fighter_Jump_loop.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:d4f44713d61346315cf5e1cd20854d11af08d397f1f944ab43536bc1bb7016c4 -size 120856 diff --git a/SwordNGun/Content/Characters/Protagonist/Animations/NEW/Fighter_Jump_loop1.uasset b/SwordNGun/Content/Characters/Protagonist/Animations/NEW/Fighter_Jump_loop1.uasset deleted file mode 100644 index 9c5501e..0000000 --- a/SwordNGun/Content/Characters/Protagonist/Animations/NEW/Fighter_Jump_loop1.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:9524cb1466246d204cff6f2f8474abfc62779e4b359a1e499ff8cc292e4cc067 -size 117372 diff --git a/SwordNGun/Content/Characters/Protagonist/Animations/NEW/Fighter_Jump_start.uasset b/SwordNGun/Content/Characters/Protagonist/Animations/NEW/Fighter_Jump_start.uasset deleted file mode 100644 index 93ffd93..0000000 --- a/SwordNGun/Content/Characters/Protagonist/Animations/NEW/Fighter_Jump_start.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:487e7e55d0d0479dc5775dcdb74b0cd0c53f765c4c98ba40806d7b72d0dc0b52 -size 124271 diff --git a/SwordNGun/Content/Characters/Protagonist/Animations/NEW/GhostLady_AnimBP.uasset b/SwordNGun/Content/Characters/Protagonist/Animations/NEW/GhostLady_AnimBP.uasset deleted file mode 100644 index 191b72c..0000000 --- a/SwordNGun/Content/Characters/Protagonist/Animations/NEW/GhostLady_AnimBP.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:e561206daed162c8af4b1dee85fc0fcb38b88d5d5268c9ce8f533a9a943f0217 -size 342068 diff --git a/SwordNGun/Content/Characters/Protagonist/Animations/NEW/HandGun_Aim_F_Walk_BL_Loop.uasset b/SwordNGun/Content/Characters/Protagonist/Animations/NEW/HandGun_Aim_F_Walk_BL_Loop.uasset deleted file mode 100644 index d7a3cf3..0000000 --- a/SwordNGun/Content/Characters/Protagonist/Animations/NEW/HandGun_Aim_F_Walk_BL_Loop.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:2d7eb9b072c166bab21995505ca23f77c41e16ce6e5e32975b6cf07f95bed7cc -size 210107 diff --git a/SwordNGun/Content/Characters/Protagonist/Animations/NEW/HandGun_Aim_F_Walk_BR_Loop.uasset b/SwordNGun/Content/Characters/Protagonist/Animations/NEW/HandGun_Aim_F_Walk_BR_Loop.uasset deleted file mode 100644 index 317d9df..0000000 --- a/SwordNGun/Content/Characters/Protagonist/Animations/NEW/HandGun_Aim_F_Walk_BR_Loop.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:da46fe12336dc75b533a569990654b3933ec9b924b49cde58406238fd57428fa -size 192253 diff --git a/SwordNGun/Content/Characters/Protagonist/Animations/NEW/HandGun_Aim_F_Walk_B_Loop.uasset b/SwordNGun/Content/Characters/Protagonist/Animations/NEW/HandGun_Aim_F_Walk_B_Loop.uasset deleted file mode 100644 index 8ff9f36..0000000 --- a/SwordNGun/Content/Characters/Protagonist/Animations/NEW/HandGun_Aim_F_Walk_B_Loop.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:ca99061470cd992169fc153e32b117c66bee838a0a068d9b32cc4e85f58ef1cf -size 207212 diff --git a/SwordNGun/Content/Characters/Protagonist/Animations/NEW/HandGun_Aim_F_Walk_FL_Loop.uasset b/SwordNGun/Content/Characters/Protagonist/Animations/NEW/HandGun_Aim_F_Walk_FL_Loop.uasset deleted file mode 100644 index 4331fd7..0000000 --- a/SwordNGun/Content/Characters/Protagonist/Animations/NEW/HandGun_Aim_F_Walk_FL_Loop.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:0b8a5dc98a7b0a9944da4eea93c21ee3e557bafeb97c498de9c61926304abe7c -size 178468 diff --git a/SwordNGun/Content/Characters/Protagonist/Animations/NEW/HandGun_Aim_F_Walk_FR_Loop.uasset b/SwordNGun/Content/Characters/Protagonist/Animations/NEW/HandGun_Aim_F_Walk_FR_Loop.uasset deleted file mode 100644 index bfaace4..0000000 --- a/SwordNGun/Content/Characters/Protagonist/Animations/NEW/HandGun_Aim_F_Walk_FR_Loop.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:a590189a2408d9c9640a87a08514dd4070a858653548f16cf5da7bbd5c7a1b11 -size 204161 diff --git a/SwordNGun/Content/Characters/Protagonist/Animations/NEW/HandGun_Aim_F_Walk_F_Loop.uasset b/SwordNGun/Content/Characters/Protagonist/Animations/NEW/HandGun_Aim_F_Walk_F_Loop.uasset deleted file mode 100644 index 4bd30b3..0000000 --- a/SwordNGun/Content/Characters/Protagonist/Animations/NEW/HandGun_Aim_F_Walk_F_Loop.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:0cb9c0a49fb9940f42431ce30d642c6266fd9630fee1760e478aa582c167908c -size 211743 diff --git a/SwordNGun/Content/Characters/Protagonist/Animations/NEW/HandGun_Aim_F_Walk_L_Loop.uasset b/SwordNGun/Content/Characters/Protagonist/Animations/NEW/HandGun_Aim_F_Walk_L_Loop.uasset deleted file mode 100644 index 1aee478..0000000 --- a/SwordNGun/Content/Characters/Protagonist/Animations/NEW/HandGun_Aim_F_Walk_L_Loop.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:1ed7873cdcbc59893b2b48117e1c6229f95d8dce09e6d625d17c35641776eab4 -size 208021 diff --git a/SwordNGun/Content/Characters/Protagonist/Animations/NEW/HandGun_Aim_F_Walk_R_Loop.uasset b/SwordNGun/Content/Characters/Protagonist/Animations/NEW/HandGun_Aim_F_Walk_R_Loop.uasset deleted file mode 100644 index 93a9ee9..0000000 --- a/SwordNGun/Content/Characters/Protagonist/Animations/NEW/HandGun_Aim_F_Walk_R_Loop.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:7a10497430b71f8ec9eac5f56646ede4d791af59b28571ece8c292c1f132deac -size 212749 diff --git a/SwordNGun/Content/Characters/Protagonist/Animations/NEW/HandGun_Common_Idle.uasset b/SwordNGun/Content/Characters/Protagonist/Animations/NEW/HandGun_Common_Idle.uasset deleted file mode 100644 index 8a939ab..0000000 --- a/SwordNGun/Content/Characters/Protagonist/Animations/NEW/HandGun_Common_Idle.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:2360e4be99c042cfd907988ed4fd955a86586be070961ccabac6cbaedb4aff55 -size 297994 diff --git a/SwordNGun/Content/Characters/Protagonist/Animations/NEW/HandGun_Common_Jump_End.uasset b/SwordNGun/Content/Characters/Protagonist/Animations/NEW/HandGun_Common_Jump_End.uasset deleted file mode 100644 index 640a724..0000000 --- a/SwordNGun/Content/Characters/Protagonist/Animations/NEW/HandGun_Common_Jump_End.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:d71f3f97df148af7add727658c0a26f0ac59ad265ce0477cc5bf6a4c83ccec22 -size 149886 diff --git a/SwordNGun/Content/Characters/Protagonist/Animations/NEW/HandGun_Common_Run_End.uasset b/SwordNGun/Content/Characters/Protagonist/Animations/NEW/HandGun_Common_Run_End.uasset deleted file mode 100644 index e8b2013..0000000 --- a/SwordNGun/Content/Characters/Protagonist/Animations/NEW/HandGun_Common_Run_End.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:0960a3fb412c41a813d570ce74d4fb514a489e6aee316ef66fce493e0b2ef912 -size 249808 diff --git a/SwordNGun/Content/Characters/Protagonist/Animations/NEW/HandGun_Common_Run_Loop.uasset b/SwordNGun/Content/Characters/Protagonist/Animations/NEW/HandGun_Common_Run_Loop.uasset deleted file mode 100644 index 3569c0a..0000000 --- a/SwordNGun/Content/Characters/Protagonist/Animations/NEW/HandGun_Common_Run_Loop.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:227da9672aded00192794ac7c0543c75b8af6778e93806de37ecc3618da78ac2 -size 187254 diff --git a/SwordNGun/Content/Characters/Protagonist/Animations/NEW/HandGun_Common_Run_Start.uasset b/SwordNGun/Content/Characters/Protagonist/Animations/NEW/HandGun_Common_Run_Start.uasset deleted file mode 100644 index 4213567..0000000 --- a/SwordNGun/Content/Characters/Protagonist/Animations/NEW/HandGun_Common_Run_Start.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:94d4dd2d64a8c0a75860823ae911a78b5de8508b52f8d3c1a2710743243f9cc0 -size 148930 diff --git a/SwordNGun/Content/Characters/Protagonist/Animations/NEW/HandGun_Common_Sprint.uasset b/SwordNGun/Content/Characters/Protagonist/Animations/NEW/HandGun_Common_Sprint.uasset deleted file mode 100644 index 34e3b1b..0000000 --- a/SwordNGun/Content/Characters/Protagonist/Animations/NEW/HandGun_Common_Sprint.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:9b974843c1874473856ed3f638cce57994efa5270962cbb4e4b456b609febf07 -size 158064 diff --git a/SwordNGun/Content/Characters/Protagonist/Animations/NEW/HandGun_Common_Walk_End.uasset b/SwordNGun/Content/Characters/Protagonist/Animations/NEW/HandGun_Common_Walk_End.uasset deleted file mode 100644 index d474209..0000000 --- a/SwordNGun/Content/Characters/Protagonist/Animations/NEW/HandGun_Common_Walk_End.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:55d297f64d9ac25d797d9adc58f45bde02f83e6e0d306c6b2ca93b4588d6acab -size 172054 diff --git a/SwordNGun/Content/Characters/Protagonist/Animations/NEW/HandGun_Common_Walk_Loop.uasset b/SwordNGun/Content/Characters/Protagonist/Animations/NEW/HandGun_Common_Walk_Loop.uasset deleted file mode 100644 index a42cc32..0000000 --- a/SwordNGun/Content/Characters/Protagonist/Animations/NEW/HandGun_Common_Walk_Loop.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:8b4e725904edf524acbe6b087d7d066423e26a971e3de6c97badd33a3977bb8d -size 203599 diff --git a/SwordNGun/Content/Characters/Protagonist/Animations/NEW/HandGun_Common_Walk_Start.uasset b/SwordNGun/Content/Characters/Protagonist/Animations/NEW/HandGun_Common_Walk_Start.uasset deleted file mode 100644 index 05cb1bc..0000000 --- a/SwordNGun/Content/Characters/Protagonist/Animations/NEW/HandGun_Common_Walk_Start.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:329bce99e244498fc819005a7a81d264d5f8448e9183dc873e6edb88ee656387 -size 185373 diff --git a/SwordNGun/Content/Characters/Protagonist/Animations/NEW/Locomotion/Aim_Walk_BS.uasset b/SwordNGun/Content/Characters/Protagonist/Animations/NEW/Locomotion/Aim_Walk_BS.uasset new file mode 100644 index 0000000..73e4958 --- /dev/null +++ b/SwordNGun/Content/Characters/Protagonist/Animations/NEW/Locomotion/Aim_Walk_BS.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c5db0188465fa0b4aa3a67669f42e4a066fde80b52d3cb9bf8513e851a6b1fd3 +size 100707 diff --git a/SwordNGun/Content/Characters/Protagonist/Animations/NEW/Locomotion/BS_Common_WalkRunStart.uasset b/SwordNGun/Content/Characters/Protagonist/Animations/NEW/Locomotion/BS_Common_WalkRunStart.uasset new file mode 100644 index 0000000..fb133c2 --- /dev/null +++ b/SwordNGun/Content/Characters/Protagonist/Animations/NEW/Locomotion/BS_Common_WalkRunStart.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c8765db50aa2a6e8bcbd99b8d7507d13073bea63ea67ad732e32c6576481ea9f +size 97459 diff --git a/SwordNGun/Content/Characters/Protagonist/Animations/NEW/Locomotion/BS_Common_WalkRunStop.uasset b/SwordNGun/Content/Characters/Protagonist/Animations/NEW/Locomotion/BS_Common_WalkRunStop.uasset new file mode 100644 index 0000000..68b7f9e --- /dev/null +++ b/SwordNGun/Content/Characters/Protagonist/Animations/NEW/Locomotion/BS_Common_WalkRunStop.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ea66aa36dd3bf7d3c6f6b51576dc128a2725dcd8be6802ba16fdf291ccab5bb4 +size 97447 diff --git a/SwordNGun/Content/Characters/Protagonist/Animations/NEW/Locomotion/BS_Common_WalkRun_Loop.uasset b/SwordNGun/Content/Characters/Protagonist/Animations/NEW/Locomotion/BS_Common_WalkRun_Loop.uasset new file mode 100644 index 0000000..0b1a9d2 --- /dev/null +++ b/SwordNGun/Content/Characters/Protagonist/Animations/NEW/Locomotion/BS_Common_WalkRun_Loop.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:04a220cc67ee801a812aa58440d07e7497548739b69869f1a39c5bf9158bcf36 +size 98147 diff --git a/SwordNGun/Content/Characters/Protagonist/Animations/NEW/Locomotion/Common_Run_Loop.uasset b/SwordNGun/Content/Characters/Protagonist/Animations/NEW/Locomotion/Common_Run_Loop.uasset new file mode 100644 index 0000000..aab93b5 --- /dev/null +++ b/SwordNGun/Content/Characters/Protagonist/Animations/NEW/Locomotion/Common_Run_Loop.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:efb37ff4ae15ec5e277a4727f3dc97bc6fb34dda4e29b32be3e4d12d2fce7a3c +size 128799 diff --git a/SwordNGun/Content/Characters/Protagonist/Animations/NEW/Locomotion/Fighter_Jump_B_Montage.uasset b/SwordNGun/Content/Characters/Protagonist/Animations/NEW/Locomotion/Fighter_Jump_B_Montage.uasset new file mode 100644 index 0000000..d727772 --- /dev/null +++ b/SwordNGun/Content/Characters/Protagonist/Animations/NEW/Locomotion/Fighter_Jump_B_Montage.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:872d751ab0275c9f23ac9c13b8b4d6956694bdae602a6ec2716607d488561f76 +size 101677 diff --git a/SwordNGun/Content/Characters/Protagonist/Animations/NEW/Locomotion/Fighter_Jump_B_start.uasset b/SwordNGun/Content/Characters/Protagonist/Animations/NEW/Locomotion/Fighter_Jump_B_start.uasset new file mode 100644 index 0000000..a492c93 --- /dev/null +++ b/SwordNGun/Content/Characters/Protagonist/Animations/NEW/Locomotion/Fighter_Jump_B_start.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:01cf9540e25aecd8add10c82dc598a41ca5bac78d249bc09a0a3e99fdfcdb6f0 +size 124761 diff --git a/SwordNGun/Content/Characters/Protagonist/Animations/NEW/Locomotion/Fighter_Jump_F_Montage.uasset b/SwordNGun/Content/Characters/Protagonist/Animations/NEW/Locomotion/Fighter_Jump_F_Montage.uasset new file mode 100644 index 0000000..bf70538 --- /dev/null +++ b/SwordNGun/Content/Characters/Protagonist/Animations/NEW/Locomotion/Fighter_Jump_F_Montage.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:25eedcc2e12e6a9a131779b57f23b5f82b2107bf05b83d906e1505a82dcf5473 +size 101677 diff --git a/SwordNGun/Content/Characters/Protagonist/Animations/NEW/Locomotion/Fighter_Jump_F_loop.uasset b/SwordNGun/Content/Characters/Protagonist/Animations/NEW/Locomotion/Fighter_Jump_F_loop.uasset new file mode 100644 index 0000000..b9bdf05 --- /dev/null +++ b/SwordNGun/Content/Characters/Protagonist/Animations/NEW/Locomotion/Fighter_Jump_F_loop.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:cf14fe452780117e7bb60ef812f3831970ace5a8cacabba63ae972ef3a404ecc +size 121415 diff --git a/SwordNGun/Content/Characters/Protagonist/Animations/NEW/Locomotion/Fighter_Jump_F_start.uasset b/SwordNGun/Content/Characters/Protagonist/Animations/NEW/Locomotion/Fighter_Jump_F_start.uasset new file mode 100644 index 0000000..527206e --- /dev/null +++ b/SwordNGun/Content/Characters/Protagonist/Animations/NEW/Locomotion/Fighter_Jump_F_start.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:fdee43fd0d089d490d2e5057bb1b21f14cd9a6bd0d88ecec66cca600338fad09 +size 120101 diff --git a/SwordNGun/Content/Characters/Protagonist/Animations/NEW/Locomotion/Fighter_Jump_Montage.uasset b/SwordNGun/Content/Characters/Protagonist/Animations/NEW/Locomotion/Fighter_Jump_Montage.uasset new file mode 100644 index 0000000..5f4b515 --- /dev/null +++ b/SwordNGun/Content/Characters/Protagonist/Animations/NEW/Locomotion/Fighter_Jump_Montage.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:7417a7c36a1e1e3ed36bcd8ec3c92b6377ae0b2b03499d9f7c541e818e62718c +size 101572 diff --git a/SwordNGun/Content/Characters/Protagonist/Animations/NEW/Locomotion/Fighter_Jump_loop.uasset b/SwordNGun/Content/Characters/Protagonist/Animations/NEW/Locomotion/Fighter_Jump_loop.uasset new file mode 100644 index 0000000..dd89bd8 --- /dev/null +++ b/SwordNGun/Content/Characters/Protagonist/Animations/NEW/Locomotion/Fighter_Jump_loop.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:31d9613fd49579571c951a2f1e41bb263b540ae350422cbd6f83e1b44c9ba0c6 +size 120721 diff --git a/SwordNGun/Content/Characters/Protagonist/Animations/NEW/Locomotion/Fighter_Jump_loop1.uasset b/SwordNGun/Content/Characters/Protagonist/Animations/NEW/Locomotion/Fighter_Jump_loop1.uasset new file mode 100644 index 0000000..e70955e --- /dev/null +++ b/SwordNGun/Content/Characters/Protagonist/Animations/NEW/Locomotion/Fighter_Jump_loop1.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:cb69e2fcb665d88d6c75db28b502f7745726617bd038a6219a88851cf4bcff6b +size 117201 diff --git a/SwordNGun/Content/Characters/Protagonist/Animations/NEW/Locomotion/Fighter_Jump_start.uasset b/SwordNGun/Content/Characters/Protagonist/Animations/NEW/Locomotion/Fighter_Jump_start.uasset new file mode 100644 index 0000000..2c82c09 --- /dev/null +++ b/SwordNGun/Content/Characters/Protagonist/Animations/NEW/Locomotion/Fighter_Jump_start.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:5a80eefaf78ae1334b509e5f49aeb2a1b6d7604c7f0b5cfd87761a2489fd6244 +size 123659 diff --git a/SwordNGun/Content/Characters/Protagonist/Animations/NEW/Locomotion/GhostLady_AnimBP.uasset b/SwordNGun/Content/Characters/Protagonist/Animations/NEW/Locomotion/GhostLady_AnimBP.uasset new file mode 100644 index 0000000..dabf5f6 --- /dev/null +++ b/SwordNGun/Content/Characters/Protagonist/Animations/NEW/Locomotion/GhostLady_AnimBP.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e0ffd5d329f788165a40c7b24bdf91ab31a1d5831c23ff4c42e94e7c25aa6d24 +size 351062 diff --git a/SwordNGun/Content/Characters/Protagonist/Animations/NEW/Locomotion/HandGun_Aim_F_Walk_BL_Loop.uasset b/SwordNGun/Content/Characters/Protagonist/Animations/NEW/Locomotion/HandGun_Aim_F_Walk_BL_Loop.uasset new file mode 100644 index 0000000..9c8c4fc --- /dev/null +++ b/SwordNGun/Content/Characters/Protagonist/Animations/NEW/Locomotion/HandGun_Aim_F_Walk_BL_Loop.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b12ab6cf08119b648a98b47b56ccf2b2819f203b4902c1c45f1dec12d4c25f0b +size 209751 diff --git a/SwordNGun/Content/Characters/Protagonist/Animations/NEW/Locomotion/HandGun_Aim_F_Walk_BR_Loop.uasset b/SwordNGun/Content/Characters/Protagonist/Animations/NEW/Locomotion/HandGun_Aim_F_Walk_BR_Loop.uasset new file mode 100644 index 0000000..a6a4c42 --- /dev/null +++ b/SwordNGun/Content/Characters/Protagonist/Animations/NEW/Locomotion/HandGun_Aim_F_Walk_BR_Loop.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:4b88eda04028e13be790f7ef3c161fb0e76efc6640fc37197d1af334fa40e524 +size 192083 diff --git a/SwordNGun/Content/Characters/Protagonist/Animations/NEW/Locomotion/HandGun_Aim_F_Walk_B_Loop.uasset b/SwordNGun/Content/Characters/Protagonist/Animations/NEW/Locomotion/HandGun_Aim_F_Walk_B_Loop.uasset new file mode 100644 index 0000000..6838acc --- /dev/null +++ b/SwordNGun/Content/Characters/Protagonist/Animations/NEW/Locomotion/HandGun_Aim_F_Walk_B_Loop.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:5430b8a64ed88578c8815376a2091d7c077b6a216050e4c4eabeea8f80bc846b +size 206935 diff --git a/SwordNGun/Content/Characters/Protagonist/Animations/NEW/Locomotion/HandGun_Aim_F_Walk_FL_Loop.uasset b/SwordNGun/Content/Characters/Protagonist/Animations/NEW/Locomotion/HandGun_Aim_F_Walk_FL_Loop.uasset new file mode 100644 index 0000000..1ffea2e --- /dev/null +++ b/SwordNGun/Content/Characters/Protagonist/Animations/NEW/Locomotion/HandGun_Aim_F_Walk_FL_Loop.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:23c03cb0ef834432d31df55c71470279ede48fd149447c13868a69802003c2e8 +size 178312 diff --git a/SwordNGun/Content/Characters/Protagonist/Animations/NEW/Locomotion/HandGun_Aim_F_Walk_FR_Loop.uasset b/SwordNGun/Content/Characters/Protagonist/Animations/NEW/Locomotion/HandGun_Aim_F_Walk_FR_Loop.uasset new file mode 100644 index 0000000..426f048 --- /dev/null +++ b/SwordNGun/Content/Characters/Protagonist/Animations/NEW/Locomotion/HandGun_Aim_F_Walk_FR_Loop.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:1e253be77b6e8b5127e8bd7fc111b46c8bc7e5ad5575d5bedf2784033187f746 +size 204004 diff --git a/SwordNGun/Content/Characters/Protagonist/Animations/NEW/Locomotion/HandGun_Aim_F_Walk_F_Loop.uasset b/SwordNGun/Content/Characters/Protagonist/Animations/NEW/Locomotion/HandGun_Aim_F_Walk_F_Loop.uasset new file mode 100644 index 0000000..811e65a --- /dev/null +++ b/SwordNGun/Content/Characters/Protagonist/Animations/NEW/Locomotion/HandGun_Aim_F_Walk_F_Loop.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:264d81501a697a6e44ec3f9a96498a30b8060dc356355faf9ad3182097e8de08 +size 211616 diff --git a/SwordNGun/Content/Characters/Protagonist/Animations/NEW/Locomotion/HandGun_Aim_F_Walk_L_Loop.uasset b/SwordNGun/Content/Characters/Protagonist/Animations/NEW/Locomotion/HandGun_Aim_F_Walk_L_Loop.uasset new file mode 100644 index 0000000..d4c62b4 --- /dev/null +++ b/SwordNGun/Content/Characters/Protagonist/Animations/NEW/Locomotion/HandGun_Aim_F_Walk_L_Loop.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c6de46f6721f0c1564325b737e8c5f57a294b65686ffc5b681b0ea7b065dee10 +size 208227 diff --git a/SwordNGun/Content/Characters/Protagonist/Animations/NEW/Locomotion/HandGun_Aim_F_Walk_R_Loop.uasset b/SwordNGun/Content/Characters/Protagonist/Animations/NEW/Locomotion/HandGun_Aim_F_Walk_R_Loop.uasset new file mode 100644 index 0000000..7ca1c1a --- /dev/null +++ b/SwordNGun/Content/Characters/Protagonist/Animations/NEW/Locomotion/HandGun_Aim_F_Walk_R_Loop.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:54b52f2e6a86de272f1c977fa1e837fd736542ff247a8ae43b08de776835dd8e +size 212680 diff --git a/SwordNGun/Content/Characters/Protagonist/Animations/NEW/Locomotion/HandGun_Common_Idle.uasset b/SwordNGun/Content/Characters/Protagonist/Animations/NEW/Locomotion/HandGun_Common_Idle.uasset new file mode 100644 index 0000000..af08b20 --- /dev/null +++ b/SwordNGun/Content/Characters/Protagonist/Animations/NEW/Locomotion/HandGun_Common_Idle.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:0ea1709951ce949bbde0f62b0f08a6e093da11af64e5455ef81f17320c394f9a +size 298101 diff --git a/SwordNGun/Content/Characters/Protagonist/Animations/NEW/Locomotion/HandGun_Common_Jump_End.uasset b/SwordNGun/Content/Characters/Protagonist/Animations/NEW/Locomotion/HandGun_Common_Jump_End.uasset new file mode 100644 index 0000000..293d1d0 --- /dev/null +++ b/SwordNGun/Content/Characters/Protagonist/Animations/NEW/Locomotion/HandGun_Common_Jump_End.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a71f2075acfde4e0e73fe76c50873c2e7ced3e9d63a3c8a3db9d6774b5bc09ae +size 150207 diff --git a/SwordNGun/Content/Characters/Protagonist/Animations/NEW/Locomotion/HandGun_Common_Run_End.uasset b/SwordNGun/Content/Characters/Protagonist/Animations/NEW/Locomotion/HandGun_Common_Run_End.uasset new file mode 100644 index 0000000..f6dcc0d --- /dev/null +++ b/SwordNGun/Content/Characters/Protagonist/Animations/NEW/Locomotion/HandGun_Common_Run_End.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:40f26c0c06f61e2d70825e60e2d0f403546790b96f86261b5c7e841842f028f4 +size 249840 diff --git a/SwordNGun/Content/Characters/Protagonist/Animations/NEW/Locomotion/HandGun_Common_Run_Loop.uasset b/SwordNGun/Content/Characters/Protagonist/Animations/NEW/Locomotion/HandGun_Common_Run_Loop.uasset new file mode 100644 index 0000000..add1a3a --- /dev/null +++ b/SwordNGun/Content/Characters/Protagonist/Animations/NEW/Locomotion/HandGun_Common_Run_Loop.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:3dd4c83fc523e89dcd578dbc567611001fb38b0e3a30f6c700ef3d2e03b4d89f +size 187784 diff --git a/SwordNGun/Content/Characters/Protagonist/Animations/NEW/Locomotion/HandGun_Common_Run_Start.uasset b/SwordNGun/Content/Characters/Protagonist/Animations/NEW/Locomotion/HandGun_Common_Run_Start.uasset new file mode 100644 index 0000000..4d682e2 --- /dev/null +++ b/SwordNGun/Content/Characters/Protagonist/Animations/NEW/Locomotion/HandGun_Common_Run_Start.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:fec3eb794ccb8a3fd8ccda6336ce36552134c5a32c0254e57fc5b639bce0733c +size 149128 diff --git a/SwordNGun/Content/Characters/Protagonist/Animations/NEW/Locomotion/HandGun_Common_Sprint.uasset b/SwordNGun/Content/Characters/Protagonist/Animations/NEW/Locomotion/HandGun_Common_Sprint.uasset new file mode 100644 index 0000000..0047c02 --- /dev/null +++ b/SwordNGun/Content/Characters/Protagonist/Animations/NEW/Locomotion/HandGun_Common_Sprint.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ae470b907dcd1e159ac2514896c9c855329f3d7411feadaa1baa4f0d9d9fbbe7 +size 158580 diff --git a/SwordNGun/Content/Characters/Protagonist/Animations/NEW/Locomotion/HandGun_Common_Walk_End.uasset b/SwordNGun/Content/Characters/Protagonist/Animations/NEW/Locomotion/HandGun_Common_Walk_End.uasset new file mode 100644 index 0000000..9528969 --- /dev/null +++ b/SwordNGun/Content/Characters/Protagonist/Animations/NEW/Locomotion/HandGun_Common_Walk_End.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:79e5a93f7d64a2799b2e9f02563dea840e503354f5f7ba2bb42fa051ed2767ee +size 172219 diff --git a/SwordNGun/Content/Characters/Protagonist/Animations/NEW/Locomotion/HandGun_Common_Walk_Loop.uasset b/SwordNGun/Content/Characters/Protagonist/Animations/NEW/Locomotion/HandGun_Common_Walk_Loop.uasset new file mode 100644 index 0000000..ba25636 --- /dev/null +++ b/SwordNGun/Content/Characters/Protagonist/Animations/NEW/Locomotion/HandGun_Common_Walk_Loop.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:9283e48bb0f2b9f94cb5757f47a7e5450cdafd8d8b9a53bdb7a77dc15621992f +size 203989 diff --git a/SwordNGun/Content/Characters/Protagonist/Animations/NEW/Locomotion/HandGun_Common_Walk_Start.uasset b/SwordNGun/Content/Characters/Protagonist/Animations/NEW/Locomotion/HandGun_Common_Walk_Start.uasset new file mode 100644 index 0000000..e21186f --- /dev/null +++ b/SwordNGun/Content/Characters/Protagonist/Animations/NEW/Locomotion/HandGun_Common_Walk_Start.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:167dd9f8a98c99fbb87e7208459d78e72664702ca668d709e9f54623404b7903 +size 185186 diff --git a/SwordNGun/Content/Characters/Protagonist/BP_NewProtag.uasset b/SwordNGun/Content/Characters/Protagonist/BP_NewProtag.uasset index 6e46ccf..5526fc7 100644 --- a/SwordNGun/Content/Characters/Protagonist/BP_NewProtag.uasset +++ b/SwordNGun/Content/Characters/Protagonist/BP_NewProtag.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ab322a144057368f70ad379ee2d87223157c3c3f26cb1568421810af1caeb4fb -size 158247 +oid sha256:d3e49b072c77e63690e9b740842034ecb1122e96deb84f3dc0cd32efb494a2c1 +size 183241 diff --git a/SwordNGun/Content/Characters/Protagonist/Character/Meshes/Combines/SK_FemaleBase_Skeleton.uasset b/SwordNGun/Content/Characters/Protagonist/Character/Meshes/Combines/SK_FemaleBase_Skeleton.uasset index 5bd9c62..8ad0b66 100644 --- a/SwordNGun/Content/Characters/Protagonist/Character/Meshes/Combines/SK_FemaleBase_Skeleton.uasset +++ b/SwordNGun/Content/Characters/Protagonist/Character/Meshes/Combines/SK_FemaleBase_Skeleton.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:67f95417d16ef99902cbfdd8b1ed6f2a1709cf1a4e38a53dc85897854593517e -size 30254 +oid sha256:b0464988b0a980abd3a5e9b0137d2865128e2a630b13e5fe9dd87813f1d9750a +size 30307 diff --git a/SwordNGun/Content/Characters/Protagonist/Character/OLD/Mesh/UE4_Mannequin_Skeleton.uasset b/SwordNGun/Content/Characters/Protagonist/Character/OLD/Mesh/UE4_Mannequin_Skeleton.uasset index b5396f7..c350de6 100644 --- a/SwordNGun/Content/Characters/Protagonist/Character/OLD/Mesh/UE4_Mannequin_Skeleton.uasset +++ b/SwordNGun/Content/Characters/Protagonist/Character/OLD/Mesh/UE4_Mannequin_Skeleton.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c85eb9acccdbcf9c7b6e5521b23de11df24cd4a9aa0ae7fa837d9cd1e881170a +oid sha256:abe99721461b0fbce2576ec2fef40187a4dbdbe98d2651908d48d9c3f98e4dae size 31538 diff --git a/SwordNGun/Content/Maps/MovementTest.umap b/SwordNGun/Content/Maps/MovementTest.umap index 51bac59..a7f5820 100644 --- a/SwordNGun/Content/Maps/MovementTest.umap +++ b/SwordNGun/Content/Maps/MovementTest.umap @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:648e3d439ffcd3e0dd0650512a2a99641ee7e7b02c6a85dcdccbf2f3713a99b9 +oid sha256:8bb1a583282267238055f588c1a28565eadb3d28076172a28dadc13bf0981190 size 949560 diff --git a/SwordNGun/Source/SwordNGun/Private/Components/SNGCharacterMovementComponent.cpp b/SwordNGun/Source/SwordNGun/Private/Components/SNGCharacterMovementComponent.cpp index 5ce7bd2..2bca96a 100644 --- a/SwordNGun/Source/SwordNGun/Private/Components/SNGCharacterMovementComponent.cpp +++ b/SwordNGun/Source/SwordNGun/Private/Components/SNGCharacterMovementComponent.cpp @@ -3,6 +3,7 @@ #include "Components/SNGCharacterMovementComponent.h" +#include "GameFramework/Character.h" #include "Kismet/KismetMathLibrary.h" #include "PhysicsEngine/PhysicsSettings.h" @@ -32,8 +33,17 @@ USNGCharacterMovementComponent::USNGCharacterMovementComponent() // jump MaxJumpHeight = 250.0f; DesiredJumpDuration = 0.75f; - ComputerGravityScaleAndJumpZVelocity(); + ComputeGravityScaleAndJumpZVelocity(); + // dash + DashVelocity = 1000.0f; + DashGroundFriction = 0.0f; + DashGravityScale = 0.1f; + DashFloatTime = 0.2f; + DashSlideTime = 0.5f; + DashGravityToDefaultSpeed = 5.0f; + DashGroundFrictionToDefaultSpeed = 5.0f; + /* // not used...yet MinJumpHeight = 200.0f; @@ -58,14 +68,33 @@ USNGCharacterMovementComponent::USNGCharacterMovementComponent() */ void USNGCharacterMovementComponent::RestoreMovementDefaults() { - GroundFriction = DefaultGroundFriction; - GravityScale = DefaultGravityScale; + GroundFriction = TargetGroundFriction = DefaultGroundFriction; + GravityScale = TargetGravityScale = DefaultGravityScale; RotationRate = DefaultRotationRate; - MaxWalkSpeed = DefaultMaxWalkSpeed; + MaxWalkSpeed = TargetMaxWalkSpeed = DefaultMaxWalkSpeed; AirControl = DefaultAirControl; JumpZVelocity = DefaultJumpZVelocity; } +void USNGCharacterMovementComponent::Dash() +{ + GroundFriction = DashGroundFriction; + GravityScale = DashGravityScale; + FloatTime = DashFloatTime; + SlideTime = DashSlideTime; + + // sets gravity and friction targets which will start interpolating after float time and slide time elapse respectively + TargetGravityScale = DefaultGravityScale; + TargetGroundFriction = DefaultGroundFriction; + GravityScaleInterpSpeed = DashGravityToDefaultSpeed; + GroundFrictionInterpSpeed = DashGroundFrictionToDefaultSpeed; + + FRotator CharacterRot = FRotator(0.0f, GetCharacterOwner()->GetActorRotation().Yaw, 0.0f); + FVector LaunchDir = FVector(UKismetMathLibrary::GetForwardVector(CharacterRot)); + LaunchDir.Normalize(); + Launch(LaunchDir * DashVelocity); +} + #if WITH_EDITOR void USNGCharacterMovementComponent::PostEditChangeProperty(FPropertyChangedEvent& PropertyChangedEvent) { @@ -76,7 +105,7 @@ void USNGCharacterMovementComponent::PostEditChangeProperty(FPropertyChangedEven PropertyThatChanged && PropertyThatChanged->GetFName() == GET_MEMBER_NAME_CHECKED(USNGCharacterMovementComponent, DesiredJumpDuration)) { // Compute WalkableFloorZ from the Angle. - ComputerGravityScaleAndJumpZVelocity(); + ComputeGravityScaleAndJumpZVelocity(); } } @@ -85,16 +114,17 @@ void USNGCharacterMovementComponent::PostLoad() Super::PostLoad(); // Compute gravity scale and jump z velocity for first time - ComputerGravityScaleAndJumpZVelocity(); + ComputeGravityScaleAndJumpZVelocity(); } #endif // WITH_EDITOR void USNGCharacterMovementComponent::OnSprintTimer() { bIsSprinting = true; + TargetMaxWalkSpeed = SprintingMaxWalkSpeed; } -void USNGCharacterMovementComponent::ComputerGravityScaleAndJumpZVelocity() +void USNGCharacterMovementComponent::ComputeGravityScaleAndJumpZVelocity() { float HalfJumpDuration = DesiredJumpDuration / 2.0f; DefaultJumpZVelocity = (2 * MaxJumpHeight) / HalfJumpDuration; @@ -125,6 +155,44 @@ void USNGCharacterMovementComponent::AddJumpForce() */ } +void USNGCharacterMovementComponent::InterpolateMovementParameters(float DeltaTime) +{ + // set walk speed + MaxWalkSpeed = FMath::FInterpTo(MaxWalkSpeed, TargetMaxWalkSpeed, DeltaTime, MaxWalkSpeedInterpSpeed); + + // ground friction + if(SlideTime > 0.0f) + { + SlideTime = FMath::Max(SlideTime - DeltaTime * GetCharacterOwner()->CustomTimeDilation, 0.0f); + } + else + { + GroundFriction = FMath::FInterpTo(GroundFriction, TargetGroundFriction, DeltaTime, GroundFrictionInterpSpeed); + } + + // gravity scale + if(FloatTime > 0.0f) + { + FloatTime = FMath::Max(FloatTime - DeltaTime * GetCharacterOwner()->CustomTimeDilation, 0.0f); + } + else + { + GravityScale = FMath::FInterpTo(GravityScale, TargetGravityScale, DeltaTime, GravityScaleInterpSpeed); + } + + // set rotation rate + // NOTE(kevin): since default rotate rate is 360 RInterpTo will go from 0 to 180 instead of 360 to 180 + // need to think of a way to prevent this + // might just need to do my own interp manually + /* + FRotator TargetRotationRate = bIsSprinting ? SprintingRotationRate : DefaultRotationRate; + FRotator NewRotationRate = FMath::RInterpTo(RotationRate, TargetRotationRate, DeltaTime, WalkToSprintInterpSpeed); + RotationRate = NewRotationRate; + */ + + // gravity +} + void USNGCharacterMovementComponent::BeginPlay() { Super::BeginPlay(); @@ -139,30 +207,23 @@ void USNGCharacterMovementComponent::TickComponent(float DeltaTime, ELevelTick T Super::TickComponent(DeltaTime, Tick, ThisTickFunction); float LateralSpeed = Velocity.Size2D(); - if(LateralSpeed >= SprintLateralSpeedThreshold && !GetWorld()->GetTimerManager().IsTimerActive(TimerHandle_SprintTimer) ) + if(LateralSpeed >= SprintLateralSpeedThreshold && !GetWorld()->GetTimerManager().IsTimerActive(TimerHandle_SprintTimer)) { GetWorld()->GetTimerManager().SetTimer(TimerHandle_SprintTimer, this, &USNGCharacterMovementComponent::OnSprintTimer, TimeToInitiateSprint, false); } - - if(LateralSpeed < SprintLateralSpeedThreshold && GetWorld()->GetTimerManager().IsTimerActive(TimerHandle_SprintTimer)) + + if(LateralSpeed < SprintLateralSpeedThreshold) { - GetWorld()->GetTimerManager().ClearTimer(TimerHandle_SprintTimer); + if(GetWorld()->GetTimerManager().IsTimerActive(TimerHandle_SprintTimer)) + { + GetWorld()->GetTimerManager().ClearTimer(TimerHandle_SprintTimer); + } bIsSprinting = false; + TargetMaxWalkSpeed = DefaultMaxWalkSpeed; + MaxWalkSpeedInterpSpeed = WalkToSprintInterpSpeed; } - // set walk speed and rotation rate depending on whether player is sprinting or not - float TargetMaxWalkSpeed = bIsSprinting ? SprintingMaxWalkSpeed : DefaultMaxWalkSpeed; - float NewMaxWalkSpeed = FMath::FInterpTo(MaxWalkSpeed, TargetMaxWalkSpeed, DeltaTime, WalkToSprintInterpSpeed); - MaxWalkSpeed = NewMaxWalkSpeed; - - // NOTE(kevin): since default rotate rate is 360 RInterpTo will go from 0 to 180 instead of 360 to 180 - // need to think of a way to prevent this - // might just need to do my own interp manually - /* - FRotator TargetRotationRate = bIsSprinting ? SprintingRotationRate : DefaultRotationRate; - FRotator NewRotationRate = FMath::RInterpTo(RotationRate, TargetRotationRate, DeltaTime, WalkToSprintInterpSpeed); - RotationRate = NewRotationRate; - */ + InterpolateMovementParameters(DeltaTime); } diff --git a/SwordNGun/Source/SwordNGun/Public/Characters/SNGCharacterBase.h b/SwordNGun/Source/SwordNGun/Public/Characters/SNGCharacterBase.h index 85360d0..fac43d9 100644 --- a/SwordNGun/Source/SwordNGun/Public/Characters/SNGCharacterBase.h +++ b/SwordNGun/Source/SwordNGun/Public/Characters/SNGCharacterBase.h @@ -36,7 +36,10 @@ protected: UPROPERTY(EditAnywhere, BlueprintReadOnly, Category="Animations") UAnimMontage* JumpBackMontage; - + + UPROPERTY(EditAnywhere, BlueprintReadOnly, Category="Animations") + UAnimMontage* DashMontage; + UPROPERTY(BlueprintReadWrite) bool CanMove; @@ -64,7 +67,7 @@ protected: void LookUpRate(float Value); void StartJump(); - + virtual void Landed(const FHitResult& Hit) override; // Called when the game starts or when spawned diff --git a/SwordNGun/Source/SwordNGun/Public/Components/SNGCharacterMovementComponent.h b/SwordNGun/Source/SwordNGun/Public/Components/SNGCharacterMovementComponent.h index 44b272f..566dbba 100644 --- a/SwordNGun/Source/SwordNGun/Public/Components/SNGCharacterMovementComponent.h +++ b/SwordNGun/Source/SwordNGun/Public/Components/SNGCharacterMovementComponent.h @@ -28,6 +28,9 @@ public: */ UFUNCTION(BlueprintCallable) void RestoreMovementDefaults(); + + UFUNCTION(BlueprintCallable) + void Dash(); /** * Gets bool whether the character is currently in the sprinting state @@ -39,48 +42,66 @@ public: virtual void PostEditChangeProperty(FPropertyChangedEvent& PropertyChangedEvent) override; #endif // WITH_EDITOR - - protected: // default ground /** Default friction when not performing any special actions and on the ground */ - UPROPERTY(EditDefaultsOnly, BlueprintReadOnly, Category="SNG Character Movement|Ground|Defaults", meta=(ClampMin="0", UIMin="0")) + UPROPERTY(EditDefaultsOnly, BlueprintReadOnly, Category="SNG Character Movement|Defaults|Ground", meta=(ClampMin="0", UIMin="0")) float DefaultGroundFriction; + + /** Ground friction we want character to interpolate to. Interpolated based on GroundFrictionInterpSpeed. */ + UPROPERTY(BlueprintReadWrite) + float TargetGroundFriction; + + /** How fast current GroundFriction will be interpolated to TargetGroundFriction */ + UPROPERTY(BlueprintReadWrite) + float GroundFrictionInterpSpeed; + + /** Timer used to determine when to start interpolating GroundFriction back to TargetGroundFriction */ + UPROPERTY(BlueprintReadWrite) + float SlideTime; /** Default ground walk speed when not performing any special actions */ - UPROPERTY(EditDefaultsOnly, BlueprintReadOnly, Category="SNG Character Movement|Ground|Defaults", meta=(ClampMin="0", UIMin="0")) + UPROPERTY(EditDefaultsOnly, BlueprintReadOnly, Category="SNG Character Movement|Defaults|Ground", meta=(ClampMin="0", UIMin="0")) float DefaultMaxWalkSpeed; + /** Current MaxWalkSpeed we want to character to walk at. Interpolated based on MaxWalkSpeedInterpSpeed. */ + UPROPERTY(BlueprintReadWrite) + float TargetMaxWalkSpeed; + + UPROPERTY(BlueprintReadWrite) + /** How fast current MaxWalkSpeed will be interpolated to TargetMaxWalkSpeed */ + float MaxWalkSpeedInterpSpeed; + /** Default ground walk speed when not performing any special actions */ - UPROPERTY(EditDefaultsOnly, BlueprintReadOnly, Category="SNG Character Movement|Ground|Defaults", meta=(ClampMin="0", UIMin="0")) + UPROPERTY(EditDefaultsOnly, BlueprintReadOnly, Category="SNG Character Movement|Defaults|Ground", meta=(ClampMin="0", UIMin="0")) FRotator DefaultRotationRate; // sprinting /** Ground walk speed when sprinting */ - UPROPERTY(EditDefaultsOnly, BlueprintReadOnly, Category="SNG Character Movement|Ground|Sprint", meta=(ClampMin="0", UIMin="0")) + UPROPERTY(EditDefaultsOnly, BlueprintReadOnly, Category="SNG Character Movement|Sprint", meta=(ClampMin="0", UIMin="0")) float SprintingMaxWalkSpeed; /** Lateral speed the player needs to maintain to stay in the sprinting state */ - UPROPERTY(EditDefaultsOnly, BlueprintReadOnly, Category="SNG Character Movement|Ground|Sprint", meta=(ClampMin="0", UIMin="0")) + UPROPERTY(EditDefaultsOnly, BlueprintReadOnly, Category="SNG Character Movement|Sprint", meta=(ClampMin="0", UIMin="0")) float SprintLateralSpeedThreshold; /** Default ground walk speed when not performing any special actions */ - UPROPERTY(EditDefaultsOnly, BlueprintReadOnly, Category="SNG Character Movement|Ground|Sprint", meta=(ClampMin="0", UIMin="0")) + UPROPERTY(EditDefaultsOnly, BlueprintReadOnly, Category="SNG Character Movement|Sprint", meta=(ClampMin="0", UIMin="0")) FRotator SprintingRotationRate; /** How long after applying movement input should the character start sprinting? */ - UPROPERTY(EditDefaultsOnly, BlueprintReadOnly, Category="SNG Character Movement|Ground|Sprint", meta=(ClampMin="0", UIMin="0")) + UPROPERTY(EditDefaultsOnly, BlueprintReadOnly, Category="SNG Character Movement|Sprint", meta=(ClampMin="0", UIMin="0")) float TimeToInitiateSprint; /** The speed in which the max walk speed to interpolated to the max sprint speed when a sprint has been initiated */ - UPROPERTY(EditDefaultsOnly, BlueprintReadOnly, Category="SNG Character Movement|Ground|Sprint", meta=(ClampMin="0", UIMin="0")) + UPROPERTY(EditDefaultsOnly, BlueprintReadOnly, Category="SNG Character Movement|Sprint", meta=(ClampMin="0", UIMin="0")) float WalkToSprintInterpSpeed; FTimerHandle TimerHandle_SprintTimer; - + UPROPERTY(BlueprintReadOnly) bool bIsSprinting; - + void OnSprintTimer(); // firing @@ -95,19 +116,31 @@ protected: // airborne /** Gravity scale when not performing any special actions */ - UPROPERTY(VisibleAnywhere, BlueprintReadOnly, Category="SNG Character Movement|Air|Defaults", meta=(ClampMin="0", UIMin="0")) + UPROPERTY(VisibleAnywhere, BlueprintReadOnly, Category="SNG Character Movement|Defaults|Air", meta=(ClampMin="0", UIMin="0")) float DefaultGravityScale; /** How much to dampen lateral velocities at the start of a jump */ - UPROPERTY(EditDefaultsOnly, BlueprintReadOnly, Category="SNG Character Movement|Air|Defaults", meta=(ClampMin="0", UIMin="0")) + UPROPERTY(EditDefaultsOnly, BlueprintReadOnly, Category="SNG Character Movement|Defaults|Air", meta=(ClampMin="0", UIMin="0")) float LateralVelocityDampening; + /** Gravity Scale we want character to interpolate to. Interpolated based on GravityScaleInterpSpeed. */ + UPROPERTY(BlueprintReadWrite) + float TargetGravityScale; + + /** How fast current GravityScale will be interpolated to TargetGravityScale */ + UPROPERTY(BlueprintReadWrite) + float GravityScaleInterpSpeed; + + /** Timer used to determine when to start interpolating GravityScale back to TargetGravityScale */ + UPROPERTY(BlueprintReadWrite) + float FloatTime; + /** * How high (Z) is the character able to reach when holding the jump button for the maximum allowed time. * * This is used in conjunction with DesiredJumpDuration to derive DefaultGravityScale and JumpZVelocity. */ - UPROPERTY(EditDefaultsOnly, BlueprintReadOnly, Category="SNG Character Movement|Air|Jump", meta=(ClampMin="0", UIMin="0")) + UPROPERTY(EditDefaultsOnly, BlueprintReadOnly, Category="SNG Character Movement|Jump", meta=(ClampMin="0", UIMin="0")) float MaxJumpHeight; /** @@ -116,22 +149,22 @@ protected: * * This is used in conjunction with MaxJumpHeight to derive DefaultGravityScale and JumpZVelocity. */ - UPROPERTY(EditDefaultsOnly, BlueprintReadOnly, Category="SNG Character Movement|Air|Jump", meta=(ClampMin="0", UIMin="0")) + UPROPERTY(EditDefaultsOnly, BlueprintReadOnly, Category="SNG Character Movement|Jump", meta=(ClampMin="0", UIMin="0")) float DesiredJumpDuration; /** Force to continuously apply to character when they are holding the jump button */ - UPROPERTY(VisibleAnywhere, BlueprintReadOnly, Category="SNG Character Movement|Air|Jump", meta=(ClampMin="0", UIMin="0")) + UPROPERTY(VisibleAnywhere, BlueprintReadOnly, Category="SNG Character Movement|Jump", meta=(ClampMin="0", UIMin="0")) float DefaultJumpZVelocity; /** Minimum height a character must reach before jump force is no longer applied even if the jump input is not being held */ - UPROPERTY(EditDefaultsOnly, BlueprintReadOnly, Category="SNG Character Movement|Air|Jump", meta=(ClampMin="0", UIMin="0")) + UPROPERTY(EditDefaultsOnly, BlueprintReadOnly, Category="SNG Character Movement|Jump", meta=(ClampMin="0", UIMin="0")) float MinJumpHeight; /** Max time the jump button can be held to give character upward velocity */ - UPROPERTY(EditDefaultsOnly, BlueprintReadOnly, Category="SNG Character Movement|Air|Jump", meta=(ClampMin="0", UIMin="0")) + UPROPERTY(EditDefaultsOnly, BlueprintReadOnly, Category="SNG Character Movement|Jump", meta=(ClampMin="0", UIMin="0")) float MaxJumpTime; - void ComputerGravityScaleAndJumpZVelocity(); + void ComputeGravityScaleAndJumpZVelocity(); /** * Sets up character velocities and jump parameters like the jump timer @@ -146,16 +179,54 @@ protected: void AddJumpForce(); /** Default friction when not performing any special actions and in the air */ - UPROPERTY(EditDefaultsOnly, BlueprintReadOnly, Category="SNG Character Movement|Air|Defaults", meta=(ClampMin="0", UIMin="0")) + UPROPERTY(EditDefaultsOnly, BlueprintReadOnly, Category="SNG Character Movement|Defaults|Air", meta=(ClampMin="0", UIMin="0")) float DefaultAirControl; /** Minimum distance from the ground a character has to be to be able to perform an air dash */ - UPROPERTY(EditDefaultsOnly, BlueprintReadOnly, Category="SNG Character Movement|Air|Defaults", meta=(ClampMin="0", UIMin="0")) + UPROPERTY(EditDefaultsOnly, BlueprintReadOnly, Category="SNG Character Movement|Defaults|Air", meta=(ClampMin="0", UIMin="0")) float MinAllowedDashHeight; /** Minimum distance from the ground a character has to be to be able to perform an air attack */ - UPROPERTY(EditDefaultsOnly, BlueprintReadOnly, Category="SNG Character Movement|Air|Defaults", meta=(ClampMin="0", UIMin="0")) + UPROPERTY(EditDefaultsOnly, BlueprintReadOnly, Category="SNG Character Movement|Defaults|Air", meta=(ClampMin="0", UIMin="0")) float MinAllowedAttackHeight; + + /** Initial lateral velocity when the character dashes */ + UPROPERTY(EditDefaultsOnly, BlueprintReadOnly, Category="SNG Character Movement|Dash", meta=(ClampMin="0", UIMin="0")) + float DashVelocity; + + /** Initial ground friction when the character dashes */ + UPROPERTY(EditDefaultsOnly, BlueprintReadOnly, Category="SNG Character Movement|Dash", meta=(ClampMin="0", UIMin="0")) + float DashGroundFriction; + + /** Initial gravity scale when the character dashes */ + UPROPERTY(EditDefaultsOnly, BlueprintReadOnly, Category="SNG Character Movement|Dash", meta=(ClampMin="0", UIMin="0")) + float DashGravityScale; + + /** How long the character should "float" before the gravity scale is interpolated back to default */ + UPROPERTY(EditDefaultsOnly, BlueprintReadOnly, Category="SNG Character Movement|Dash", meta=(ClampMin="0", UIMin="0")) + float DashFloatTime; + + /** How fast default gravity scale will be interpolated to after dash is done */ + UPROPERTY(EditDefaultsOnly, BlueprintReadOnly, Category="SNG Character Movement|Dash", meta=(ClampMin="0", UIMin="0")) + float DashGravityToDefaultSpeed; + + /** How long the character should "slide" before the ground friction is interpolated back to default */ + UPROPERTY(EditDefaultsOnly, BlueprintReadOnly, Category="SNG Character Movement|Dash", meta=(ClampMin="0", UIMin="0")) + float DashSlideTime; + + /** How fast default ground friction will be interpolated to after dash is done */ + UPROPERTY(EditDefaultsOnly, BlueprintReadOnly, Category="SNG Character Movement|Dash", meta=(ClampMin="0", UIMin="0")) + float DashGroundFrictionToDefaultSpeed; + + /** + * @brief Interpolates current movement parameters (i.e. GravityScale, MaxWalkSpeed, GroundFrinction) to the values + * specified by the parameters corresponding target value (i.e. GravityScale will be interpolated to TargetGravityScale). + * The interpolation speed is determined by the parameters corresponding speed value (i.e. GravityScale is interpolated + * to TargetGravityScale by a speed of GravityScaleInterpSpeed). + * + * This function is called every component tick. + */ + void InterpolateMovementParameters(float DeltaTime); virtual void BeginPlay() override;