From 5c2588a7eb79c950c68fdb33df95e475358e1570 Mon Sep 17 00:00:00 2001 From: Kevin Poretti Date: Thu, 4 Mar 2021 21:46:34 -0500 Subject: [PATCH] Add basic attack behavior to protagonist [git-p4: depot-paths = "//depot/main/": change = 21] --- .../Locomotion/Roll_RootMotion_Montage.uasset | 4 ++-- .../Animations/Melee/Attack_A_Montage.uasset | 4 ++-- .../Protagonist/BP_Protagonist.uasset | 4 ++-- .../AN_SetIgnoreCharacterMovement.uasset | 4 ++-- .../AnimNotifies/AN_SetCanAct.uasset | 3 +++ .../AN_SetIgnoreCharacterMovement.uasset | 3 +++ .../Private/Characters/SNGCharacterBase.cpp | Bin 1176 -> 1368 bytes .../Private/Characters/SNGProtagonist.cpp | Bin 8272 -> 11196 bytes .../Public/Characters/SNGCharacterBase.h | Bin 894 -> 1150 bytes .../Public/Characters/SNGProtagonist.h | Bin 2332 -> 2654 bytes 10 files changed, 14 insertions(+), 8 deletions(-) create mode 100644 SwordNGun/Content/Core/Characters/AnimNotifies/AN_SetCanAct.uasset create mode 100644 SwordNGun/Content/Core/Characters/AnimNotifies/AN_SetIgnoreCharacterMovement.uasset diff --git a/SwordNGun/Content/Characters/Protagonist/Animations/Locomotion/Roll_RootMotion_Montage.uasset b/SwordNGun/Content/Characters/Protagonist/Animations/Locomotion/Roll_RootMotion_Montage.uasset index 3c27285..b0c1798 100644 --- a/SwordNGun/Content/Characters/Protagonist/Animations/Locomotion/Roll_RootMotion_Montage.uasset +++ b/SwordNGun/Content/Characters/Protagonist/Animations/Locomotion/Roll_RootMotion_Montage.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:27d8b0559a39c7eb5ef7c3d37f58f7ed45629b55cb44722d495241fbbb315eb4 -size 97983 +oid sha256:5e3926efa6bca6e4f169ea07342e4a7ffe1a313565054cff83c18cc9f9a7d4bd +size 99658 diff --git a/SwordNGun/Content/Characters/Protagonist/Animations/Melee/Attack_A_Montage.uasset b/SwordNGun/Content/Characters/Protagonist/Animations/Melee/Attack_A_Montage.uasset index d855014..fd9a005 100644 --- a/SwordNGun/Content/Characters/Protagonist/Animations/Melee/Attack_A_Montage.uasset +++ b/SwordNGun/Content/Characters/Protagonist/Animations/Melee/Attack_A_Montage.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:540bbda8bd2b748bc2ce546b5615d2bcec075c05d7edeec62785a6a8a09a38c0 -size 97419 +oid sha256:6318ca457721a7df65eef5b8a408132c442c63764aa0e892f9239b638a3d7ed1 +size 101284 diff --git a/SwordNGun/Content/Characters/Protagonist/BP_Protagonist.uasset b/SwordNGun/Content/Characters/Protagonist/BP_Protagonist.uasset index fb72ae9..b141b89 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:61d07838aab97f03d905bf9ae5a89e8aae7b52c197a5358545003763ec635667 -size 111642 +oid sha256:78acb1d3629cf0d04e04cb0d334c093094d79d6a2f2c6c7788783363e472ba1b +size 143645 diff --git a/SwordNGun/Content/Core/Characters/AN_SetIgnoreCharacterMovement.uasset b/SwordNGun/Content/Core/Characters/AN_SetIgnoreCharacterMovement.uasset index 03ec720..4e49275 100644 --- a/SwordNGun/Content/Core/Characters/AN_SetIgnoreCharacterMovement.uasset +++ b/SwordNGun/Content/Core/Characters/AN_SetIgnoreCharacterMovement.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:21566823f7f715298c4634911c102c4535dff8db656f6f3c2cef8259c5d9917d -size 30437 +oid sha256:be03e5ecf7c88cc24b6268dd11c69def28208caaee59f734688ac06c60901973 +size 2521 diff --git a/SwordNGun/Content/Core/Characters/AnimNotifies/AN_SetCanAct.uasset b/SwordNGun/Content/Core/Characters/AnimNotifies/AN_SetCanAct.uasset new file mode 100644 index 0000000..45ebcaa --- /dev/null +++ b/SwordNGun/Content/Core/Characters/AnimNotifies/AN_SetCanAct.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:89f6f8789d420edf37974550d0cf963f1a99e880abcc35f43da5e936779cf944 +size 38905 diff --git a/SwordNGun/Content/Core/Characters/AnimNotifies/AN_SetIgnoreCharacterMovement.uasset b/SwordNGun/Content/Core/Characters/AnimNotifies/AN_SetIgnoreCharacterMovement.uasset new file mode 100644 index 0000000..e363c5f --- /dev/null +++ b/SwordNGun/Content/Core/Characters/AnimNotifies/AN_SetIgnoreCharacterMovement.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:3a9d984f9dbf446a352537c0155e701c9adecfeb304c56db194a3ee04ea2f1e5 +size 39164 diff --git a/SwordNGun/Source/SwordNGun/Private/Characters/SNGCharacterBase.cpp b/SwordNGun/Source/SwordNGun/Private/Characters/SNGCharacterBase.cpp index 56ee54bb62840bcd63b0eb32cf9133683f3ba50b..77466dfeb54ac7813296eb145f47d33cdd2b9f1c 100644 GIT binary patch delta 175 zcmbQid4p@iKSuKsh9ZVihExV?1}-S%WJqFgW=LenV{l|hW+-7$V6X*ZRCSz_`lgv|cnY8Z diff --git a/SwordNGun/Source/SwordNGun/Private/Characters/SNGProtagonist.cpp b/SwordNGun/Source/SwordNGun/Private/Characters/SNGProtagonist.cpp index cd8b85eb0bb08f09c38d9ad737ceee2bb75b42f0..c3b8d41f45d2084fc83e05934e63f9d19b6785eb 100644 GIT binary patch literal 11196 zcmeHNZEqVz5ZXy z>*ISHcQ4!rtaM$+oqE{casQFqz-JRz&w%3^tAsxEINE?3;m&8l-{&5p>3YE1!j9Cf z0QaeD0CU6h(8kpzczf+$g1YcG!deG7``CR6oa@-JGQm0x=Z?pB<90yf7_>U>DXw~u zLGT-fX}kA9?;MbO9t*ETD`()V$n6Vob`2Q9^}!u=bq-48SMHQkd*-F$?h){Zzg~ck z5oCQ1h-1&o5H>Ju)a+KNrXIV;b09Le<~8}z|4+QeyWpP|`GCFj3wp#6cxbvaP(Ox* z4am0ZrM8vSeFJ-r0DA>lz8d2rj|q6ZzSrE=(4KjpAhG*d;xs-xe$Z&6Rz&}P?XtNC%D zak_^+Lqs$^yaj(~;&S-62i|_dHBY20&>-VbsA`T%5cgZ4 zKxs+cWc>n^w!y;?fANagWgqxQSZRaqsppKoDR&hk<)D437wUoh8#Y#e z<1WpC2{@&`bZ-o)(k0I1OU69a<21(q9$AUDy#NOr$lsgb<^D`Pg#Y*%oH>kkqIG-tqn-1b4I!8*g@)h?^;w;RAHn6#SniFn+_Sh{ zcLGh_P)~$6ZEV4lTi&O_v)+6@gHO&syXo`dZE^N^3w`KGOW&WaPvLLPThB6#^0-)5 zd3c*^rfiME_kjWX)pP&@#vEWy0@JH?VKxNyC#)Ph&Z| zwd;`+U(alXxvNN|8kmOFZd!WR+sEaD8<9*P4EI|h?wO0bTFhWvP&{}oxV6SuqoVu`<3hOU} z+XA&8u+ECRg&sS*opwCrN^3y&TVXH8%8OMW zJ0o^zq(&MBPkf4L9=%pUvUH+F>tB?=q8`>ux)bY3;;LQxf18>VtJtblBD!pKS+H)W=ZFo}e?)Ti>o_je<6@Z(;V0}HwLgmYWbhz~k@&t=rKGR@ zLjrkv-locp7n|GHTXDYRw z?fKJj{!~!TYKx01rz0(_K2v=b5uV2X?fPFlJe-wko{6U#It8#Oc8Tav}5Ssc}dLvi%DU4>O`sSF6VyP(fKLQ|D-zR zv_NY-cA2I%p2_iZd(QOB)|ut2;)-K2o?6u5tUBG$d#di@^R91Eul3O}sYT1qWM(Dy z?d;fjy^39BZ*Xu{GyQzD(|uXIns2Un-sGMNzy_XmFJ!1s*Uo3lG_)$$UZJT9u~ zm{*;xESFcsx?EoQteVet+lYPZ0GG>oh*`O}TJ2L#gClqZJJc+yrue=X-!*FZSxOV0 z&J1{&dm<2LZ^JZux8&ei)ridt8C`q>L;W?Z?`K1W6We@!V7uZfW7(CCbWKLBIQa}` zlg0P*inC14xA?9YXMTK!FBEKYO{sa-7|p!)%2!jz9v}<$=QYIheG~5i*xLa2Co?(T zmv;n6WzWB()dQ#U9AX>OJI?gDW|KPpdH{^JZ^J`8%DrtMxh`)>%ZWu@g??gi^Jf|5 z?=q2Jg|O34>j90wB&d;!oUQxGE8qB|J-hB#L|Evr|0Yi`%@yU4o_?A)q|g%o$~}Vf P{0?N7`EotKkWBX%B3n4_ delta 149 zcmdlJe!*db9OLF5#wX0YoD5t*$jOk&kj9`f*_};u@+C1L-Xexnh7yKSh9ZVM2J6l0 z9N|nvDvV~FJb|xe@;_CM$p(UAlik>~K;~`UC3uZ_@;T9n$y%~0n{6a7@l3wLX*QWj P-DdJJDS^#>>Ut~yR