From 7f2d51317fee1adac130af528f0d151a089ab4c0 Mon Sep 17 00:00:00 2001 From: Kevin Poretti Date: Sun, 21 Nov 2021 00:48:10 -0500 Subject: [PATCH] Implement air dash [git-p4: depot-paths = "//depot/main/": change = 166] --- .../AN_SetCollisionEnabled.uasset | 3 +++ .../Locomotion/Common/Air_Dash.uasset | 3 +++ .../Locomotion/Common/Air_Dash_Alt.uasset | 3 +++ .../Common/Air_Dash_Alt_Montage.uasset | 3 +++ .../Locomotion/Common/Air_Dash_Montage.uasset | 3 +++ .../Animations/Locomotion/Common/Dash.uasset | 4 ++-- .../Animations/Protagonist_AnimBP.uasset | 4 ++-- .../Protagonist/BP_Protagonist.uasset | 4 ++-- .../States/BP_ProtagAirDashState.uasset | 3 +++ .../States/BP_ProtagAirJump.uasset | 3 +++ .../States/BP_ProtagAirborneState.uasset | 4 ++-- .../States/BP_ProtagDashState.uasset | 4 ++-- .../States/BP_ProtagGroundedState.uasset | 4 ++-- SwordNGun/Content/Maps/Test.umap | 2 +- SwordNGun/Content/Maps/Test_BuiltData.uasset | 2 +- .../Private/Characters/SNGProtagonist.cpp | Bin 21258 -> 22188 bytes .../Public/Characters/SNGCharacterBase.h | Bin 7364 -> 7664 bytes .../Public/Characters/SNGProtagonist.h | Bin 7276 -> 9406 bytes 18 files changed, 35 insertions(+), 14 deletions(-) create mode 100644 SwordNGun/Content/Characters/AnimNotifies/AN_SetCollisionEnabled.uasset create mode 100644 SwordNGun/Content/Characters/Protagonist/Animations/Locomotion/Common/Air_Dash.uasset create mode 100644 SwordNGun/Content/Characters/Protagonist/Animations/Locomotion/Common/Air_Dash_Alt.uasset create mode 100644 SwordNGun/Content/Characters/Protagonist/Animations/Locomotion/Common/Air_Dash_Alt_Montage.uasset create mode 100644 SwordNGun/Content/Characters/Protagonist/Animations/Locomotion/Common/Air_Dash_Montage.uasset create mode 100644 SwordNGun/Content/Characters/Protagonist/States/BP_ProtagAirDashState.uasset create mode 100644 SwordNGun/Content/Characters/Protagonist/States/BP_ProtagAirJump.uasset diff --git a/SwordNGun/Content/Characters/AnimNotifies/AN_SetCollisionEnabled.uasset b/SwordNGun/Content/Characters/AnimNotifies/AN_SetCollisionEnabled.uasset new file mode 100644 index 0000000..1a44ba6 --- /dev/null +++ b/SwordNGun/Content/Characters/AnimNotifies/AN_SetCollisionEnabled.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:9af39784c70ed1a592233dc2d36a5ee4d3884b9aba99e695c79cf50a810f39f8 +size 36390 diff --git a/SwordNGun/Content/Characters/Protagonist/Animations/Locomotion/Common/Air_Dash.uasset b/SwordNGun/Content/Characters/Protagonist/Animations/Locomotion/Common/Air_Dash.uasset new file mode 100644 index 0000000..f379afc --- /dev/null +++ b/SwordNGun/Content/Characters/Protagonist/Animations/Locomotion/Common/Air_Dash.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:96c82ec6a8e43be543af9f1814361c1b88b1c2a5c0b4b38665dbeb817809c86e +size 169403 diff --git a/SwordNGun/Content/Characters/Protagonist/Animations/Locomotion/Common/Air_Dash_Alt.uasset b/SwordNGun/Content/Characters/Protagonist/Animations/Locomotion/Common/Air_Dash_Alt.uasset new file mode 100644 index 0000000..41de649 --- /dev/null +++ b/SwordNGun/Content/Characters/Protagonist/Animations/Locomotion/Common/Air_Dash_Alt.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:3841bafc87fa23002833c00ac60316a334e3d807653de533aae60ce05e855391 +size 179995 diff --git a/SwordNGun/Content/Characters/Protagonist/Animations/Locomotion/Common/Air_Dash_Alt_Montage.uasset b/SwordNGun/Content/Characters/Protagonist/Animations/Locomotion/Common/Air_Dash_Alt_Montage.uasset new file mode 100644 index 0000000..7586349 --- /dev/null +++ b/SwordNGun/Content/Characters/Protagonist/Animations/Locomotion/Common/Air_Dash_Alt_Montage.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:8680a41d66983c0085d0973a1c30558de2cac2c132d64350cc23dad3820833c1 +size 96565 diff --git a/SwordNGun/Content/Characters/Protagonist/Animations/Locomotion/Common/Air_Dash_Montage.uasset b/SwordNGun/Content/Characters/Protagonist/Animations/Locomotion/Common/Air_Dash_Montage.uasset new file mode 100644 index 0000000..e99fc5f --- /dev/null +++ b/SwordNGun/Content/Characters/Protagonist/Animations/Locomotion/Common/Air_Dash_Montage.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:369305057569a703186ff725e3f11cecd354f2515da76b9ffbdb3cd5b67863a5 +size 106157 diff --git a/SwordNGun/Content/Characters/Protagonist/Animations/Locomotion/Common/Dash.uasset b/SwordNGun/Content/Characters/Protagonist/Animations/Locomotion/Common/Dash.uasset index 2a6c248..0f8a38f 100644 --- a/SwordNGun/Content/Characters/Protagonist/Animations/Locomotion/Common/Dash.uasset +++ b/SwordNGun/Content/Characters/Protagonist/Animations/Locomotion/Common/Dash.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:80753e3f2e7ac661208a36d0e001d435824db1ba835372a00a8245d1b4b746f3 -size 180243 +oid sha256:39d08567be57229fc4381549e62e6bdcd14ef7524a6706026428a324e16f0894 +size 1427 diff --git a/SwordNGun/Content/Characters/Protagonist/Animations/Protagonist_AnimBP.uasset b/SwordNGun/Content/Characters/Protagonist/Animations/Protagonist_AnimBP.uasset index 1aab950..8315fd5 100644 --- a/SwordNGun/Content/Characters/Protagonist/Animations/Protagonist_AnimBP.uasset +++ b/SwordNGun/Content/Characters/Protagonist/Animations/Protagonist_AnimBP.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:807cc3ef23fa56c453eaf9a17f9fd665dc3d431bc3297d343632cc08895a06b8 -size 830713 +oid sha256:c2bd3d75ff879c5a61d2f4a572c45ddaf51851c06c0bb7841733b87d79891979 +size 844053 diff --git a/SwordNGun/Content/Characters/Protagonist/BP_Protagonist.uasset b/SwordNGun/Content/Characters/Protagonist/BP_Protagonist.uasset index d1baff6..b30919a 100644 --- a/SwordNGun/Content/Characters/Protagonist/BP_Protagonist.uasset +++ b/SwordNGun/Content/Characters/Protagonist/BP_Protagonist.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:87543bba68e44d0df86480ee2dce250395f2b2c3f4b4d8942ac10a74381e1e41 -size 173401 +oid sha256:0d273a9500af90c84a291186bbcac724b3cee4a1f8bf9a41a15839c03c281c62 +size 172583 diff --git a/SwordNGun/Content/Characters/Protagonist/States/BP_ProtagAirDashState.uasset b/SwordNGun/Content/Characters/Protagonist/States/BP_ProtagAirDashState.uasset new file mode 100644 index 0000000..01f5f05 --- /dev/null +++ b/SwordNGun/Content/Characters/Protagonist/States/BP_ProtagAirDashState.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b204c4545ee28b3e859ae14569fbb8a99df18c8b53407d6036141b63c636aa85 +size 278741 diff --git a/SwordNGun/Content/Characters/Protagonist/States/BP_ProtagAirJump.uasset b/SwordNGun/Content/Characters/Protagonist/States/BP_ProtagAirJump.uasset new file mode 100644 index 0000000..502f20d --- /dev/null +++ b/SwordNGun/Content/Characters/Protagonist/States/BP_ProtagAirJump.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:2425707101fffd6a7888baa49fd9f1113f0159bd14210918139e28ed149f9cbf +size 59969 diff --git a/SwordNGun/Content/Characters/Protagonist/States/BP_ProtagAirborneState.uasset b/SwordNGun/Content/Characters/Protagonist/States/BP_ProtagAirborneState.uasset index fc25f56..7a7df77 100644 --- a/SwordNGun/Content/Characters/Protagonist/States/BP_ProtagAirborneState.uasset +++ b/SwordNGun/Content/Characters/Protagonist/States/BP_ProtagAirborneState.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c975ba3b39b84a140bf7bf34558b85c44523ae97d494a5bba5073666d93400d5 -size 120975 +oid sha256:d4590c09f7584ff6a1d5b2a4770bbb254731f8a8b6bc9fa2f702b5ee3f65cd2f +size 163189 diff --git a/SwordNGun/Content/Characters/Protagonist/States/BP_ProtagDashState.uasset b/SwordNGun/Content/Characters/Protagonist/States/BP_ProtagDashState.uasset index 26fcead..49d10f4 100644 --- a/SwordNGun/Content/Characters/Protagonist/States/BP_ProtagDashState.uasset +++ b/SwordNGun/Content/Characters/Protagonist/States/BP_ProtagDashState.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ef96efe740edda83d685f424b170f7b9444c1ecc4c6310952cf925321b917af1 -size 183268 +oid sha256:c19678ac56a2415c81786bb61e1e38382eba6fc8aa833d1a980d233c7492232b +size 202675 diff --git a/SwordNGun/Content/Characters/Protagonist/States/BP_ProtagGroundedState.uasset b/SwordNGun/Content/Characters/Protagonist/States/BP_ProtagGroundedState.uasset index 2c02fe1..b0c9b0b 100644 --- a/SwordNGun/Content/Characters/Protagonist/States/BP_ProtagGroundedState.uasset +++ b/SwordNGun/Content/Characters/Protagonist/States/BP_ProtagGroundedState.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a4c97912707c1807f4be0b1bd08f58ab97579ed69ebaa36fb719c4cc3c9d7a5b -size 240610 +oid sha256:57747ad0720e9a930eea48673795eb885efb66875e678da46fcbd38555aa3b6c +size 247250 diff --git a/SwordNGun/Content/Maps/Test.umap b/SwordNGun/Content/Maps/Test.umap index d7cf6a1..56fde59 100644 --- a/SwordNGun/Content/Maps/Test.umap +++ b/SwordNGun/Content/Maps/Test.umap @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:0f04e8bd53daf542f1ee8b0dd785a4ebd8e7c8762243f8e9fd808d6ea5f87d48 +oid sha256:1f015214c9b86b5a0b9cc42be312f69363399785f580ec2903688a68f01845ba size 684060 diff --git a/SwordNGun/Content/Maps/Test_BuiltData.uasset b/SwordNGun/Content/Maps/Test_BuiltData.uasset index 1648833..38705fd 100644 --- a/SwordNGun/Content/Maps/Test_BuiltData.uasset +++ b/SwordNGun/Content/Maps/Test_BuiltData.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:673cccba60875fb895e1e50348e5061f4b3897bcd3612db25f9f352368960fb4 +oid sha256:4c1b2628b6add51318436b1f7927f64a5258faf38cf9820aa20d0941872bb6ac size 2330061 diff --git a/SwordNGun/Source/SwordNGun/Private/Characters/SNGProtagonist.cpp b/SwordNGun/Source/SwordNGun/Private/Characters/SNGProtagonist.cpp index 05d9ff4b8b220f5cb937a641d58bdf4dec447a3f..347f389d8980caadc369d992056a5275d0f974fe 100644 GIT binary patch delta 584 zcmeBL#<*rJS zH~GGdGOG_zZ~A0zSyO*P`V<&c8B!RO7&IAlfUYK_S`*~N_#m)9QyEIoeD4gjwUi+b zD6RoC59IY~Fv&^KTu7K1VDmvB!nP7%Sm!aM1KkM;bp@1gC*BY8schJ1!nh8%_zATJR}7X$eU3Q7D$;;B8K}PmXkR8! gPx|DIe7chluxV`mz-7lgSR6C?0~g!oCO#)V0LN`VO8@`> delta 25 dcmexheZ+FZBCg3?ydj%=xGk8$jCK4@d;o&k2*v;a diff --git a/SwordNGun/Source/SwordNGun/Public/Characters/SNGProtagonist.h b/SwordNGun/Source/SwordNGun/Public/Characters/SNGProtagonist.h index 48902a562bcaa368a4b16b34980301454f7c7657..98564a8ffe2f9c326d07cfad073e232541964e41 100644 GIT binary patch delta 1674 zcma)6&2G~`5FU^a#1b^9LIEx{aG(iQE43E{Jy4}Z%7GRkULbYcVv)pE;{0*(L-;K? zA@#hjj6UYEOfXN7 zBhvgazIA1WZ&8Y2fHEOUhZrZifJ;M!n=(RdfFdKrcd&gRyE&XtSB^33A{xp%*6(24 z#eWPsR*+eOJd5Qgy*aUz%zP{#DUbvqqGQqsU}g?iLr;dj9Oh+D0Eu4=IF;)l+QQS( zOpg&^{t!PxV_qudgHSBvP2GHqDa#T07(vROU`z#`;J03av60>O4({wC>gus7_3T@1 z1%|#sh9MqT%f4!Om}fVI&MUKMO<669Wx5->51K7j?Q^?Re40YPo}7SdC~F`w(QW+_ zi3-4(#az{f&PJMJD#$LR4|5ZbAxf++QQsnC5oa$=G)GElX^J%?w+vB2o6SjB@M7C9 zPRJZx6m6@eW_tnKc00Zpy{zW7R^|@49yN_Z_VwCwe)zaD0mcEak#vF)yP5s)zaGB4 zQ*1-?j0cfDMuP&p!&HeClzJdKMcEzz^stN`n&Q@&gu`<|NvJh_C`2so2o@@fGQTq_ z@ZY@UJL*Pd`W!t3m3^-=b*y0%r`agim@ Mt;*@|d&8@L0C1Km{{R30 delta 25 hcmdnz`Nm>{1lQyXY<80!IJh=H5m>~(IYcRo2>^#C33mVh