From 6e4cbae7c1665c29aca74b70528e42c7568bf4ac Mon Sep 17 00:00:00 2001 From: Kevin Poretti Date: Fri, 9 Apr 2021 20:11:10 -0500 Subject: [PATCH] Melee weapon functionality [git-p4: depot-paths = "//depot/main/": change = 54] --- Assets/Models/Sword.fbx | 3 +++ .../Melee/Air_Attack_1_Montage.uasset | 4 ++-- .../Melee/Air_Attack_2_Montage.uasset | 4 ++-- .../Melee/Ground_Attack_1_Montage.uasset | 4 ++-- .../Melee/Ground_Attack_2_Montage.uasset | 4 ++-- .../Melee/Ground_Attack_3_Montage.uasset | 4 ++-- .../Melee/Ground_Attack_4_Montage.uasset | 4 ++-- .../Protagonist/BP_Protagonist.uasset | 4 ++-- .../Mesh/UE4_Mannequin_Skeleton.uasset | 4 ++-- .../States/BP_ProtagFiringWeaponState.uasset | 4 ++-- .../States/BP_ProtagGroundedState.uasset | 4 ++-- .../States/BP_ProtagReloadState.uasset | 4 ++-- .../AnimNotifies/ANS_DoMeleeAttack.uasset | 3 +++ .../Content/Weapons/Sword/BP_Sword.uasset | 3 +++ .../Weapons/Sword/Materials/M_Sword.uasset | 3 +++ .../Content/Weapons/Sword/Mesh/Sword.uasset | 3 +++ .../Sword/Mesh/Sword_PhysicsAsset.uasset | 3 +++ .../Weapons/Sword/Mesh/Sword_Skeleton.uasset | 3 +++ .../Private/Characters/SNGProtagonist.cpp | Bin 14030 -> 14712 bytes .../SNGWeaponInventoryComponent.cpp | Bin 2666 -> 4684 bytes .../Private/Weapons/SNGMeleeWeaponBase.cpp | Bin 206 -> 2782 bytes .../Public/Characters/SNGProtagonist.h | Bin 6544 -> 6742 bytes .../Components/SNGWeaponInventoryComponent.h | Bin 1966 -> 3100 bytes .../Public/Weapons/SNGMeleeWeaponBase.h | Bin 600 -> 1520 bytes 24 files changed, 43 insertions(+), 22 deletions(-) create mode 100644 Assets/Models/Sword.fbx create mode 100644 SwordNGun/Content/Core/AnimNotifies/ANS_DoMeleeAttack.uasset create mode 100644 SwordNGun/Content/Weapons/Sword/BP_Sword.uasset create mode 100644 SwordNGun/Content/Weapons/Sword/Materials/M_Sword.uasset create mode 100644 SwordNGun/Content/Weapons/Sword/Mesh/Sword.uasset create mode 100644 SwordNGun/Content/Weapons/Sword/Mesh/Sword_PhysicsAsset.uasset create mode 100644 SwordNGun/Content/Weapons/Sword/Mesh/Sword_Skeleton.uasset diff --git a/Assets/Models/Sword.fbx b/Assets/Models/Sword.fbx new file mode 100644 index 0000000..d5da867 --- /dev/null +++ b/Assets/Models/Sword.fbx @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:8088ab78502e55154618bbb44cd96098c25f6e7d6d56e823fa6df5a6bb498b4f +size 115868 diff --git a/SwordNGun/Content/Characters/Protagonist/Animations/Melee/Air_Attack_1_Montage.uasset b/SwordNGun/Content/Characters/Protagonist/Animations/Melee/Air_Attack_1_Montage.uasset index 0e6d6b9..9f0cf2e 100644 --- a/SwordNGun/Content/Characters/Protagonist/Animations/Melee/Air_Attack_1_Montage.uasset +++ b/SwordNGun/Content/Characters/Protagonist/Animations/Melee/Air_Attack_1_Montage.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:1b42e0b4e12a0cc14f40b5f1d37b40fb4edd569fdcd602d6ccacfcbca964667e -size 101031 +oid sha256:9332a635d4106be81f098600ce6b4519845d7e7e9ecab60e099289c55a40c2c5 +size 101601 diff --git a/SwordNGun/Content/Characters/Protagonist/Animations/Melee/Air_Attack_2_Montage.uasset b/SwordNGun/Content/Characters/Protagonist/Animations/Melee/Air_Attack_2_Montage.uasset index dfb23e8..9c8c9f7 100644 --- a/SwordNGun/Content/Characters/Protagonist/Animations/Melee/Air_Attack_2_Montage.uasset +++ b/SwordNGun/Content/Characters/Protagonist/Animations/Melee/Air_Attack_2_Montage.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:1471002c02a81241b70c4834d500fc5142482c8c61784f066dd55a065148cb01 -size 98679 +oid sha256:0166f718176566dbe72001eaac7b752fe37e1f5c3c9e26e93cb2dcf9774242d6 +size 100281 diff --git a/SwordNGun/Content/Characters/Protagonist/Animations/Melee/Ground_Attack_1_Montage.uasset b/SwordNGun/Content/Characters/Protagonist/Animations/Melee/Ground_Attack_1_Montage.uasset index 5521ff2..17761d4 100644 --- a/SwordNGun/Content/Characters/Protagonist/Animations/Melee/Ground_Attack_1_Montage.uasset +++ b/SwordNGun/Content/Characters/Protagonist/Animations/Melee/Ground_Attack_1_Montage.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:064bb5c356f67d97d132e044a0c33593d9a6c04981edc6fc71caa692aaf694da -size 100099 +oid sha256:2dfa3bfbf24eab69affe97dd9d91ec2bace88cbab22519adf3c2ae44fdac7d7a +size 101610 diff --git a/SwordNGun/Content/Characters/Protagonist/Animations/Melee/Ground_Attack_2_Montage.uasset b/SwordNGun/Content/Characters/Protagonist/Animations/Melee/Ground_Attack_2_Montage.uasset index be72034..d9e5c09 100644 --- a/SwordNGun/Content/Characters/Protagonist/Animations/Melee/Ground_Attack_2_Montage.uasset +++ b/SwordNGun/Content/Characters/Protagonist/Animations/Melee/Ground_Attack_2_Montage.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a1f59389147cc2bd03c9b10d0ee60f517ac139c3ac0670edb0070e93569c216d -size 100999 +oid sha256:2de6cb313ef29de45524e5c8a17a7451e73797178bd9129c728d7b0638271735 +size 102751 diff --git a/SwordNGun/Content/Characters/Protagonist/Animations/Melee/Ground_Attack_3_Montage.uasset b/SwordNGun/Content/Characters/Protagonist/Animations/Melee/Ground_Attack_3_Montage.uasset index 17f1b13..be2b4d4 100644 --- a/SwordNGun/Content/Characters/Protagonist/Animations/Melee/Ground_Attack_3_Montage.uasset +++ b/SwordNGun/Content/Characters/Protagonist/Animations/Melee/Ground_Attack_3_Montage.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:77003cb10755dc4ae9629ab3dfb1011b3e1f7c599750b63ee09298fa90f74a9c -size 100188 +oid sha256:f5ef8305bbc9e83d0974a27c4d5249272a5fed99bcd7a923df1806b6cc1437be +size 101800 diff --git a/SwordNGun/Content/Characters/Protagonist/Animations/Melee/Ground_Attack_4_Montage.uasset b/SwordNGun/Content/Characters/Protagonist/Animations/Melee/Ground_Attack_4_Montage.uasset index 5259cf0..4152306 100644 --- a/SwordNGun/Content/Characters/Protagonist/Animations/Melee/Ground_Attack_4_Montage.uasset +++ b/SwordNGun/Content/Characters/Protagonist/Animations/Melee/Ground_Attack_4_Montage.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:9a5e56e0ce506b952bf21b4f5e8fe3ee4e9ee52677aa28bed9b6f771cc4ec37c -size 98127 +oid sha256:28c2b423aa66714cd78fc71d15772d5db55618d48d4f82d59a222c4f0e5d6ef9 +size 100244 diff --git a/SwordNGun/Content/Characters/Protagonist/BP_Protagonist.uasset b/SwordNGun/Content/Characters/Protagonist/BP_Protagonist.uasset index 4c23c54..7031eb5 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:858299877d1bfde3b5b70452dffcceabefa5432b7493f7b3fade5b79d199ef21 -size 110305 +oid sha256:2c651c0a1101680562d7e7636c69a5d61b9a7d16f7d416caa260a0a284a445c9 +size 115906 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 8a678d1..32da95c 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:f99a3549e0cedc9b22ee9acf4a645d5628bdb0ff2ecc04180497aad22694ae71 -size 30408 +oid sha256:68c2b35d1c7effa5675639e1203f311c0e914dfb561b0d2a154244f28c8cfc44 +size 30700 diff --git a/SwordNGun/Content/Characters/Protagonist/States/BP_ProtagFiringWeaponState.uasset b/SwordNGun/Content/Characters/Protagonist/States/BP_ProtagFiringWeaponState.uasset index e996ec1..b9c4dc2 100644 --- a/SwordNGun/Content/Characters/Protagonist/States/BP_ProtagFiringWeaponState.uasset +++ b/SwordNGun/Content/Characters/Protagonist/States/BP_ProtagFiringWeaponState.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:250fd52384b21034c69c1fd2597c78b713a1dbc518f808853e57afb8f20afec5 -size 167550 +oid sha256:6fa4a0b2f3249f771308e59cd4993ff28d3842f2e54a67c3764da0f78c88cf2d +size 163397 diff --git a/SwordNGun/Content/Characters/Protagonist/States/BP_ProtagGroundedState.uasset b/SwordNGun/Content/Characters/Protagonist/States/BP_ProtagGroundedState.uasset index 7ac1612..dc37b46 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:7aaed864a84944c4540e30db7e7bedcdec0377c4bc1f40aa7270d19198656d61 -size 186477 +oid sha256:3ef1d3548664857ae42c19c08ef66848df27b85199d910119b6b59bb1b5e4ad5 +size 179489 diff --git a/SwordNGun/Content/Characters/Protagonist/States/BP_ProtagReloadState.uasset b/SwordNGun/Content/Characters/Protagonist/States/BP_ProtagReloadState.uasset index 16679af..eb148ec 100644 --- a/SwordNGun/Content/Characters/Protagonist/States/BP_ProtagReloadState.uasset +++ b/SwordNGun/Content/Characters/Protagonist/States/BP_ProtagReloadState.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:0bcf6fc62840c0eab05dd9e39d0e60b672d26d1f9c56793e51d635f798fefafd -size 122050 +oid sha256:fe87650f0374a120eef646e15078ba22ce93f96715cc586c8c42fc20a8d7b812 +size 118506 diff --git a/SwordNGun/Content/Core/AnimNotifies/ANS_DoMeleeAttack.uasset b/SwordNGun/Content/Core/AnimNotifies/ANS_DoMeleeAttack.uasset new file mode 100644 index 0000000..f5c5def --- /dev/null +++ b/SwordNGun/Content/Core/AnimNotifies/ANS_DoMeleeAttack.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:0f202c7277b584f7a3fea9b4d3751505d41957a1963baa1d9e6625cb8f0ade01 +size 30873 diff --git a/SwordNGun/Content/Weapons/Sword/BP_Sword.uasset b/SwordNGun/Content/Weapons/Sword/BP_Sword.uasset new file mode 100644 index 0000000..d802e3f --- /dev/null +++ b/SwordNGun/Content/Weapons/Sword/BP_Sword.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:8d1635c6362f12ced08450c7b08bb3dc82c8e63d89d76f8fe6455f1917e4af12 +size 93615 diff --git a/SwordNGun/Content/Weapons/Sword/Materials/M_Sword.uasset b/SwordNGun/Content/Weapons/Sword/Materials/M_Sword.uasset new file mode 100644 index 0000000..1747d65 --- /dev/null +++ b/SwordNGun/Content/Weapons/Sword/Materials/M_Sword.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:7ac980c42be733074b20537fe05a7df08458388e04fecd2c2750d0723ae6a481 +size 79306 diff --git a/SwordNGun/Content/Weapons/Sword/Mesh/Sword.uasset b/SwordNGun/Content/Weapons/Sword/Mesh/Sword.uasset new file mode 100644 index 0000000..6861b1d --- /dev/null +++ b/SwordNGun/Content/Weapons/Sword/Mesh/Sword.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:722ea6cbb4f66ee8ba53efeb2a3fb3aab54927ae06a39e305b8af7374a79a409 +size 522147 diff --git a/SwordNGun/Content/Weapons/Sword/Mesh/Sword_PhysicsAsset.uasset b/SwordNGun/Content/Weapons/Sword/Mesh/Sword_PhysicsAsset.uasset new file mode 100644 index 0000000..e8d6f0c --- /dev/null +++ b/SwordNGun/Content/Weapons/Sword/Mesh/Sword_PhysicsAsset.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:05159ce71cbf136a0d6660756f51c86cab70b435ae8fb0cc8bc35611fa66d7f9 +size 75385 diff --git a/SwordNGun/Content/Weapons/Sword/Mesh/Sword_Skeleton.uasset b/SwordNGun/Content/Weapons/Sword/Mesh/Sword_Skeleton.uasset new file mode 100644 index 0000000..97e5646 --- /dev/null +++ b/SwordNGun/Content/Weapons/Sword/Mesh/Sword_Skeleton.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:08692f8f7694eda3bf2716f1bd11cfe88f10cab1518fdf110fd4e8b675a805c1 +size 2569 diff --git a/SwordNGun/Source/SwordNGun/Private/Characters/SNGProtagonist.cpp b/SwordNGun/Source/SwordNGun/Private/Characters/SNGProtagonist.cpp index b1940ea51f0c249b0b8af4abcccc61df6fc322ea..f3043df996e13afe3d2378f82e03fe5fe0e69933 100644 GIT binary patch delta 192 zcmX??`=e-s2N!n`Ln1>SLpnn$L&{`#E@u>eCs#BI|1p;$3ZI$V9fj}7y`R;cp_CzS zGCPkfBj@D%?BSLpnn$L&{`EPSMGWm_ks*zA_o3@YR{iQTTJ2W0Core=^51 zY9blR5Dqjtk)ePgA83sNgDnsv$xcpZwG?z@2xjnOaA)uZs>}i6RG33J5h6fmAn|~X zK;i+NfZ%~0pbFQB#d^3L$nwogSfv<|JurD8oA~A{Y{yUqK_Rn_10`fOGjb}UDpKaM dW#pXP&Ss8q4cs&&A*fjh5wJ-J?qp>ycL3V?U@rgw delta 76 zcmX@3@=9bwAJfDYJd^WycqYrS1x)5+Hk$0iTsHX}bIj&h>@kd!n|OpK?_ssr9Kb2Z ZxVee%4kJW$420s?{7!(6aWb2b8vqZH8TJ4G diff --git a/SwordNGun/Source/SwordNGun/Private/Weapons/SNGMeleeWeaponBase.cpp b/SwordNGun/Source/SwordNGun/Private/Weapons/SNGMeleeWeaponBase.cpp index 8eb1ccbe75883c20defbb2e9dcf5f09476493eed..348749d344208184293152749852f68d5ccfe914 100644 GIT binary patch literal 2782 zcmbuBZ*LMo5XR^2nfM*fnkY4uT3^;bNv%|yRzacay9R+$ltKeX2{C>kzohzmc3Eyu zpdm5MaksOx^XHjoX8Y&&uI*ZCH5=K`zFEgwma(qel=aBkd_UlMV-p+jK16zLGj@8` zwM(b_3;9!f!n4QM2{vxnm3Gb9=%AG$xodY8&wZ!SvOad(oJeiUKJ#v3eaP7{QPu4| ze%~SO^K=UPuh1MLD-*-k!m2#1vV4NKv0b5`VK-jY$z_bR!|o|sU&*Y=Gm9**vY6we z7=?}E4VVR4F}j0|GTOI&+f1`$+b;7T?l&P0RplDgnl9JWUN~HXe9NBAH5)7SyfkPD z%fuQEj~4iR#A=&!6Y%nu_o#W9=VEU6=b{cb)UfBcvsos}`88+iM1P5|5znEkaAyBz z*~4GS?iJV|j*L0!@klHnlGvG5?3~J0L8ruf2x}W?U*TzoJSzAS^G9ygVEu*t5}ewE zeJOG8VK3MVxo{?~VrkHNEN zpr21&7j;UkQ+$dc4;{uCoqEkWB^Muy=8}*Xha?TSsUkzTlajM4B+SC;*i(~fqj{iu zczkYH_3@KpSvbn7&Nf-6Ag3wR<m%!<8^)EG1ACQ&q zoeo<5k8Ohf}br^HiCl=k!yBY-?_nXXYo+*@pLsCPX~f z@(k)O+Af%MKvS&LEv2ax>x2$3%6;b*W$}bA?gTs}%|JnT?##K8+`@3%Obu>rRz*kX|O||Pgo3gH(O#cZC97?xoif?VF zwKu<`#7*BF`R#B-q`E8B$sIBkM|_8^mIsz5YtEGm@_@@B8R$j`_hxK6=y=OMz68$2 z9UHLAWuEiPh^jZkyerT9Q(alK?$70#x*-}wsGA{~D+VDdsX@yR|c zVklyXER`tyn=ICo-!Xe284cBiB$CJy$*#ZvhLd-*$Ro+zWI4`@yuhx3qa dWhiE_X5eMuV&H_5*z}4EBU}$RW%6IPjQ~KgZbAS6 delta 107 zcmbOuv5tR(6XWC;OgxkMI5{RKFmi3)$9RniD!?;|O=PkhTf}4oR)xtitX7jBu=Px? pVt0e9f56T*`4f8yP)u#|JuVKYI2W@WgTmy?9Li9>$mAUE4FEt~A^!jX diff --git a/SwordNGun/Source/SwordNGun/Public/Weapons/SNGMeleeWeaponBase.h b/SwordNGun/Source/SwordNGun/Public/Weapons/SNGMeleeWeaponBase.h index d6453b8e98cc50ab02d40046ed79bb6474017379..97a26d8fe92fe7536c5e361cbed0c3a910e78893 100644 GIT binary patch literal 1520 zcmd6n-EPxB5QXP9NW6m;BvcS0z-15@Elw*0ZKBu_;tH9>New2BY?r92cpzR9_|Dh~ zMlBV0plH35*)u<9W_EvkAK1VGn^6&_A;$tfxq?@$rRIp(pMm1y!TDYj=Fz!$WBa_MiC%VAe!UJLj^VTTaXc`oQ`g zw?sa5&zW21_LvO%tpk)6S#t3Bep0(HBe#_kkc&PxB_Va3UsC1y4I zqT^M}2lkMkq<}rxO9Pi?FnnW&1sm&UnOm1}+4-B=!ZdYx*=Mr<~jIh`85toq|rV?4p#v z;;o2YV)=r3j*#c}39Wqg_neNYLBizgMx21oV71dUmD^SP|I9hQA>*dkdV^{@l=-Z0 z+11kkwmEzYw0e{DMwCbi=S`ghx~^*I6=^!SX)%{*3VIW`-v*;sDDle5V(rth1|{E$ zF4UIq?#&2@qYmiaFaOyzG%xdxS4KA7nOKrrLB`?`QyuY3nODtO##~nIo%-7DKLO;W B^11*3 delta 22 acmeyseS>9#7ZV>R11|#?LoI_fm<9kq6$8-#