From 303277fa917e1325d6985bef7b6aec6a0f6d5d87 Mon Sep 17 00:00:00 2001 From: Kevin Poretti Date: Sun, 16 May 2021 15:20:40 -0500 Subject: [PATCH] Implement launcher attack [git-p4: depot-paths = "//depot/main/": change = 63] --- .../Animations/Melee/Launcher_Attack.uasset | 3 +++ .../Melee/Launcher_Attack_Montage.uasset | 3 +++ .../Melee/Launcher_Attack_Recovery.uasset | 3 +++ .../Protagonist/BP_Protagonist.uasset | 4 ++-- .../Mesh/UE4_Mannequin_Skeleton.uasset | 2 +- .../States/BP_ProtagGroundLauncher.uasset | 4 ++-- .../States/BP_ProtagGroundedState.uasset | 4 ++-- .../AnimNotifies/ANS_DoMeleeAttack.uasset | 4 ++-- .../Private/Characters/SNGCharacterBase.cpp | Bin 3914 -> 6960 bytes .../Private/Weapons/SNGMeleeWeaponBase.cpp | Bin 2782 -> 2912 bytes .../Public/Characters/SNGCharacterBase.h | Bin 3818 -> 4036 bytes .../Public/Weapons/SNGMeleeWeaponBase.h | Bin 1520 -> 1642 bytes SwordNGun/Source/SwordNGun/SNGTypes.cpp | 9 +++++++++ SwordNGun/Source/SwordNGun/SNGTypes.h | Bin 2808 -> 6840 bytes 14 files changed, 27 insertions(+), 9 deletions(-) create mode 100644 SwordNGun/Content/Characters/Protagonist/Animations/Melee/Launcher_Attack.uasset create mode 100644 SwordNGun/Content/Characters/Protagonist/Animations/Melee/Launcher_Attack_Montage.uasset create mode 100644 SwordNGun/Content/Characters/Protagonist/Animations/Melee/Launcher_Attack_Recovery.uasset create mode 100644 SwordNGun/Source/SwordNGun/SNGTypes.cpp diff --git a/SwordNGun/Content/Characters/Protagonist/Animations/Melee/Launcher_Attack.uasset b/SwordNGun/Content/Characters/Protagonist/Animations/Melee/Launcher_Attack.uasset new file mode 100644 index 0000000..55c8ecf --- /dev/null +++ b/SwordNGun/Content/Characters/Protagonist/Animations/Melee/Launcher_Attack.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:08b1fdfa58adbef6d0f8212dfebb08c9b6480d931d85807caade08640fbade32 +size 169646 diff --git a/SwordNGun/Content/Characters/Protagonist/Animations/Melee/Launcher_Attack_Montage.uasset b/SwordNGun/Content/Characters/Protagonist/Animations/Melee/Launcher_Attack_Montage.uasset new file mode 100644 index 0000000..ff2c969 --- /dev/null +++ b/SwordNGun/Content/Characters/Protagonist/Animations/Melee/Launcher_Attack_Montage.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:8659a9d0615b44abac56c2214a70646abd59c9c3614692b01e4e663fad87bd88 +size 101501 diff --git a/SwordNGun/Content/Characters/Protagonist/Animations/Melee/Launcher_Attack_Recovery.uasset b/SwordNGun/Content/Characters/Protagonist/Animations/Melee/Launcher_Attack_Recovery.uasset new file mode 100644 index 0000000..0a7e4f8 --- /dev/null +++ b/SwordNGun/Content/Characters/Protagonist/Animations/Melee/Launcher_Attack_Recovery.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:332c39844f28fe7d0b0f12bdc995faac5f4492e1f3c5b9ee6bbbec4204b47f98 +size 154611 diff --git a/SwordNGun/Content/Characters/Protagonist/BP_Protagonist.uasset b/SwordNGun/Content/Characters/Protagonist/BP_Protagonist.uasset index b25d56b..d0bd7a4 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:26843fa1ef0c79cd2bb04da559fccbf80e4ee430b0cdd443c0ba48cf88a0cc2d -size 116834 +oid sha256:b5795bd82a2f460f36c613a77d7c8b42cd0ffa633797451d300396933da8f2c9 +size 116009 diff --git a/SwordNGun/Content/Characters/Protagonist/Character/Mesh/UE4_Mannequin_Skeleton.uasset b/SwordNGun/Content/Characters/Protagonist/Character/Mesh/UE4_Mannequin_Skeleton.uasset index 70dc194..8c16e62 100644 --- a/SwordNGun/Content/Characters/Protagonist/Character/Mesh/UE4_Mannequin_Skeleton.uasset +++ b/SwordNGun/Content/Characters/Protagonist/Character/Mesh/UE4_Mannequin_Skeleton.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:0a9108c89c8b4cb1d7d1c355c0c54b997d48efc5481858f3b541b881c75138b4 +oid sha256:2a9bf72c3a10d233d3519452142afb076d29bc10e00456371d743f81f02d6fa9 size 30740 diff --git a/SwordNGun/Content/Characters/Protagonist/States/BP_ProtagGroundLauncher.uasset b/SwordNGun/Content/Characters/Protagonist/States/BP_ProtagGroundLauncher.uasset index 808bf4a..8c89ec8 100644 --- a/SwordNGun/Content/Characters/Protagonist/States/BP_ProtagGroundLauncher.uasset +++ b/SwordNGun/Content/Characters/Protagonist/States/BP_ProtagGroundLauncher.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:0c7f3fa973b3ad59b960112bed490b95067177dadf891a618e7cf9cf787ee0c1 -size 5571 +oid sha256:0dae4259d21dc4cc5a0acb01b864e1b176c257f353a7d522d2c949322ae5dbfd +size 64378 diff --git a/SwordNGun/Content/Characters/Protagonist/States/BP_ProtagGroundedState.uasset b/SwordNGun/Content/Characters/Protagonist/States/BP_ProtagGroundedState.uasset index dc37b46..66a8d05 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:3ef1d3548664857ae42c19c08ef66848df27b85199d910119b6b59bb1b5e4ad5 -size 179489 +oid sha256:ff785b27e9097a5b5ba7dcad54b2db6814fb0bc98f0fdafc305517929d6685b9 +size 203534 diff --git a/SwordNGun/Content/Core/AnimNotifies/ANS_DoMeleeAttack.uasset b/SwordNGun/Content/Core/AnimNotifies/ANS_DoMeleeAttack.uasset index f5c5def..cb544f3 100644 --- a/SwordNGun/Content/Core/AnimNotifies/ANS_DoMeleeAttack.uasset +++ b/SwordNGun/Content/Core/AnimNotifies/ANS_DoMeleeAttack.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:0f202c7277b584f7a3fea9b4d3751505d41957a1963baa1d9e6625cb8f0ade01 -size 30873 +oid sha256:0942191e8a9eb3bcae2c625033c2cc9fef531238d8d29ab3ed3f7805e4be3cab +size 36116 diff --git a/SwordNGun/Source/SwordNGun/Private/Characters/SNGCharacterBase.cpp b/SwordNGun/Source/SwordNGun/Private/Characters/SNGCharacterBase.cpp index 10338e99d89f701e5e95467b711510573d4ba2b6..68af13a5c47820c689964fe90977d54824f0adcc 100644 GIT binary patch literal 6960 zcmds6+in{-5S`a8(0^FCKp`8goc7Ue11OT^7?Bf0R_f*{uyu)5tCApXYy?3+s6W~E z9L~}twcOPzHc+4lR^AIaoH=vmLgt^p59Lr&IhU0zkk3!}SC1UO~nkzH;=rkuk=o3~#=cuO6;%%!r}PAa{fr zsq8`aja)(UmC<30yESyXkk?qf`0WM8tueESS$kXLF60kry?{<*T$z#E#{4DjK0=4F zu`3+oP;1^w5MO4|-$vwJ#&+zdMP@b21JvjSe#(j3~fl}OWW>jC@D$sm&Iw+o}e z8u$^#3D%}P^xz%tiS8JBa(rtml1Fk>V^l--jl9q1Htx#f$QFpkARSG-E0;1bAt0ab>Q@kNRK0!;el>D?Zn!uVKoy&19$9_rW z7f8%7mRS5`DoM=!whnTfzDd@z?j-mmj`XNDNyt>%xp@$U@iw&e{Xv?r&Ka*F%c@?I{1eG5$E z(|6#^F-Gs z*AVscI4RCly&ZF$Z|gCqC^4*AiHYP4++Bf3=|ko4ZQImgSN5Jm`WpFHs}b4CJi-ox z-G*f_tB>ZahII3K;bt%cG153YL{sCuetjrLe*L-30!3>Yfo^3?v;Mk-73{W{y=>pc zoM*q6cX#YbY?h+Gn1hLjFL4{PA$FADd_RYuSUr|_x61RVW8SV_XXRlHm>R#m#9wAd z>sfv7m=59!)(;IHYm8xs9e!o~DbG}n7tDc_z;2vuVwKXlu16x$T$SC^2WUs0lbx(Q zAvP_qv*Ij&q}HM8mB|(L);ZR=hiquLdL4ls1mgGf^A%VIx#z>NYpsSO->F zpClM@Z}4QFmO^fbS2HqG_c9t^160=~Rwzco5GxW3Mw{+6iaNw3k(uoAjuF{y*rE6A z7y9TR26!_-#Iu(;%4?q}~l0WhX=sVwU z%Ah}*qLRoHE6eo|)H12z7u!cVE^V%*t28|u$AR~E^;^ zT_INO>4oOJB&c}B4ypm|w$)Zv0DCgx--q#C&4&c5_-7&IXw>zCuIG3*L4UR|nW}Eb zIKb#zXytc3+@(4>{uf%_4aT}IXR}N5=ebdo@a5eaaY>)(-)0Br>+4s9uArkJXtULARhFaM?q+HQ`PW3rbv7@UV&swPGb?iCqX|q445!mKp z!N!5=X1jW4t-oKhcDS!iZ^vXaiS4Pi?{s7BcY31(W}V?W!Tgw1A4}e|n`{Oa=qmoW z`f{93F<)B!?JhMorv6&KhCVBb`ukt4{Cay-$1Cn3{1u(0P1KV$s>}qDpt}aQhl|gk zpW4VS>^OP))IpbBD%&@yMdjifcjIU)bEyef={xMT8@Oy(e<$jgX z%9C>4E!i$k?PEu#oQmtqy`9^A>e*v_q+-9#{sUOc|0jyeupUZKrDOYJo>#_aGFHRN bNMxL+Vtm`oO+Hu3VmUk$@O4q$T`l?-+tyLD delta 26 icmdmBc1mu81>@#6#u=QOmxz2~+&n`pj%hNRv=#u5nhB5q diff --git a/SwordNGun/Source/SwordNGun/Private/Weapons/SNGMeleeWeaponBase.cpp b/SwordNGun/Source/SwordNGun/Private/Weapons/SNGMeleeWeaponBase.cpp index 348749d344208184293152749852f68d5ccfe914..77d80291f6ed3acbed85569677887d369f5114a8 100644 GIT binary patch delta 132 zcmca7`ao>M5+-9ehF}Ii26qMzhD?SM1{a1zAeqRZz>v(4&ydGZ4CJW+c_^}*7c)h( rO`gUX#}3sz`9DYhWD`yqZ4_ldZMNuI8LSz28MqiY88|1u=KKr*#-SX; delta 30 mcmaDLc29J}5~j^Jn4;Ji-6mh;5}&+|vtqIqXWHa4u2%rRBn#vK diff --git a/SwordNGun/Source/SwordNGun/Public/Characters/SNGCharacterBase.h b/SwordNGun/Source/SwordNGun/Public/Characters/SNGCharacterBase.h index 308827ec916ffd2213190da13d6025c67ffc7f3d..892d9e51d795647a06bbfa0b77ad23ebf244b860 100644 GIT binary patch delta 104 zcmaDQdqjRi4EN-FTw=jx4EYS13@Ho>3_%R349P&8$xsF)J%Drxg9d{eLokCMgFBS( k!jK3QO$4e=2I|XWCfINt5sO;pw+}WGMxTi1!0QrFzasU7T delta 12 TcmX>i|4Md44EJU;o<3#(BANt< diff --git a/SwordNGun/Source/SwordNGun/Public/Weapons/SNGMeleeWeaponBase.h b/SwordNGun/Source/SwordNGun/Public/Weapons/SNGMeleeWeaponBase.h index 97a26d8fe92fe7536c5e361cbed0c3a910e78893..7c323f3cd9783b0612acb16b05f1c1df82a557ae 100644 GIT binary patch delta 106 zcmeys{fcM8iHQ>=l!F<{8S)v57*ZJg7~C038S)tP8G^y=5Qa*I0)|wE;*ERlnT*|_ mq8<#H3?&RM42eK8kwJkW8K^stp%}(9nojG&vb8h_o*J4-K-?4PW^3P19F$YSDD!*}+5YPq4~&lRN9?=&wn9Cu zg(c)z4ZESjU%j=$HndBlPXoRNoNgOV=Sk4Q*=Dx~N0R2L@jsi+8u(YCzA=Nw%X?zo z4IfR0DpcyovuyNAP%M(<)mTq0;H#Yc5Xzj9J-X;$wmm^Ym;9N*%NiHxJ3%Wwv@qn8 zm{hXdDmE8HdMXKT*uNOz`pIxy+20b{-+)VTx&jsPyvtJ!K0dHkMbj@vkQLswCJMf$ z_n$ejiqzu2$#XM&#@nRh2=y(zH4L&+i`6DHT1IWQq(h__z{drpvR>WnSY)9(T(;q?hL81#5>cblW|j3myD>JUGWdG* zgVM;KT>H1xKx&hc`Ey=RPNNJL@>9i>szsyjm_zrFhq9$?r6{O)`Tw!o0aiSPYvr1( z1nI3UabN$PXM98>@^9s_goty@^P0UWSIm!+qL?y}qQ)t5^}s#|&!L${#ZC4VSClm+ zwRoBr2MLt)S>ogJih5SBD^R_F192AVPTq(twEK~Jzf0P#qW6ChrIeTQImB~o)<=9T>lb-lq?sYjBe#uYlkw4Q z?B0-K%v#o=^7i&sKkFH4(x+1YcTZA{CGSahTu3n225)+tUx74e$FT#cfBQS6;p z7;vE;4}K0lvuWiI^W>j%~j?@NL#_H2BSQ7fB#YitlDJ7q|vh~ zZdF}PR+?x-8gkhkdYjc6-XMLc#-0Z6-jUZ;#dJJNXY;7cV`ldVao70nF{`NBSS25+ zYFHu{UD6RBS^n&zsidG^npUIUx7L|I^#-yiqco99HFGx8JdXV0Kof+=<-qgr^jJM@ z=W#UT{1wN!qE*kl^7i6NdH&v$<>U5s^nCaz($Gz@G0W?8xX04s8k34_FLE=TVJo9O8vb$dG#Wi({yxQ@=FBAq8>E4j2f zES^9V!`?OWPro}+hO{EiXBh7#J>z6!gj-5gSb`>F?& z>(iw7Jv8mz&~L2j%`vvE&z!VtcRYpD1U12DqK!(>*2GHIlV$g7hcXE$z zpshYpKoLc=hIo73ALUV+y{T)L#pOjYPNY?nQ`6*8I25DK_*@!YaT9${Q)caJvOhE% z9ge8#7Db=cUFwEEEGoqrX2+^BzX4H_Q+!JQrI>zC5@@xJ1977nwpQYV|9C8Iq&s=1 zChx)*q(3$-#+$GVHr=re<64%Iw#w)(ozrA*ha!B0P4`u4&W0CmQOZu2bW&^CNp{4p zT1UA<|HaV%c4|CNa;ek#td&A;q9M(MdtlMbQ4wL*t;xnnpTQRUdA57M-nYxM_5BA; CK^GDL delta 7 OcmdmC`a^WX4=w-?g9EJq