From d8d7c2eb53f9b8c0733b85e27830dc15eb86a4f7 Mon Sep 17 00:00:00 2001 From: Kevin Poretti Date: Fri, 2 Apr 2021 20:23:17 -0500 Subject: [PATCH] Call Start + Stop fire in firing state and add reloading state [git-p4: depot-paths = "//depot/main/": change = 51] --- .../Animations/Protagonist_AnimBP.uasset | 3 +++ .../Animations/Ranged/Reload_Montage.uasset | 3 +++ .../Animations/ThirdPerson_AnimBP.uasset | 4 ++-- .../Protagonist/BP_Protagonist.uasset | 4 ++-- .../States/BP_ProtagFiringWeaponState.uasset | 4 ++-- .../States/BP_ProtagGroundedState.uasset | 4 ++-- .../States/BP_ProtagReloadState.uasset | 3 +++ .../Private/Weapons/SNGRangedWeaponBase.cpp | Bin 1820 -> 1992 bytes .../Public/Weapons/SNGRangedWeaponBase.h | Bin 3380 -> 3878 bytes 9 files changed, 17 insertions(+), 8 deletions(-) create mode 100644 SwordNGun/Content/Characters/Protagonist/Animations/Protagonist_AnimBP.uasset create mode 100644 SwordNGun/Content/Characters/Protagonist/Animations/Ranged/Reload_Montage.uasset create mode 100644 SwordNGun/Content/Characters/Protagonist/States/BP_ProtagReloadState.uasset diff --git a/SwordNGun/Content/Characters/Protagonist/Animations/Protagonist_AnimBP.uasset b/SwordNGun/Content/Characters/Protagonist/Animations/Protagonist_AnimBP.uasset new file mode 100644 index 0000000..0b763a0 --- /dev/null +++ b/SwordNGun/Content/Characters/Protagonist/Animations/Protagonist_AnimBP.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:77e4a5c457dffa099f5ec6c77217b0f18a37a219a4712eb3701391dc36507328 +size 425679 diff --git a/SwordNGun/Content/Characters/Protagonist/Animations/Ranged/Reload_Montage.uasset b/SwordNGun/Content/Characters/Protagonist/Animations/Ranged/Reload_Montage.uasset new file mode 100644 index 0000000..1450532 --- /dev/null +++ b/SwordNGun/Content/Characters/Protagonist/Animations/Ranged/Reload_Montage.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:168b869d5efe782ebe27bb7a410f48a15f76886c2f088968633ca1b752326061 +size 97414 diff --git a/SwordNGun/Content/Characters/Protagonist/Animations/ThirdPerson_AnimBP.uasset b/SwordNGun/Content/Characters/Protagonist/Animations/ThirdPerson_AnimBP.uasset index cdd5f1e..3801549 100644 --- a/SwordNGun/Content/Characters/Protagonist/Animations/ThirdPerson_AnimBP.uasset +++ b/SwordNGun/Content/Characters/Protagonist/Animations/ThirdPerson_AnimBP.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:481006b61edcb8af1de8c238fd879fe6341f943d495ff32808e4ae34f8fddfd5 -size 429734 +oid sha256:9b227fa81a0971990b9a95eb86595b4a1aa440c264b5565b56922914ded6faf8 +size 2471 diff --git a/SwordNGun/Content/Characters/Protagonist/BP_Protagonist.uasset b/SwordNGun/Content/Characters/Protagonist/BP_Protagonist.uasset index b4c76d3..4c23c54 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:c3327312455050452fe757f9456cb88cb70bfb7720fe5c53e3160a5b7cbe723d -size 115616 +oid sha256:858299877d1bfde3b5b70452dffcceabefa5432b7493f7b3fade5b79d199ef21 +size 110305 diff --git a/SwordNGun/Content/Characters/Protagonist/States/BP_ProtagFiringWeaponState.uasset b/SwordNGun/Content/Characters/Protagonist/States/BP_ProtagFiringWeaponState.uasset index ae26e0f..c6689a0 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:ec9bfd4735a66c5a2cd2e3d645c20e6194193f0e9fce4db258b26cb90e1e9085 -size 136935 +oid sha256:a5f65d604a1413099a14b1ebca3654c55b7343e4cd76bc9649cebf4ef2384937 +size 164995 diff --git a/SwordNGun/Content/Characters/Protagonist/States/BP_ProtagGroundedState.uasset b/SwordNGun/Content/Characters/Protagonist/States/BP_ProtagGroundedState.uasset index 3b5acbe..4cc9c4b 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:ffffe50776b67c857835d0ba632af79a48f5d8c02865c2bac7cf020ff9c8859d -size 134915 +oid sha256:abb7eb49c6e4478185571dacd980e280cc3375b599d9d095b17f592e6386f576 +size 151438 diff --git a/SwordNGun/Content/Characters/Protagonist/States/BP_ProtagReloadState.uasset b/SwordNGun/Content/Characters/Protagonist/States/BP_ProtagReloadState.uasset new file mode 100644 index 0000000..95e9518 --- /dev/null +++ b/SwordNGun/Content/Characters/Protagonist/States/BP_ProtagReloadState.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:4b60a8b533e4f866fbda11a3ef736c33e2bceb2b2970c6b7a3657bb66e6658df +size 139209 diff --git a/SwordNGun/Source/SwordNGun/Private/Weapons/SNGRangedWeaponBase.cpp b/SwordNGun/Source/SwordNGun/Private/Weapons/SNGRangedWeaponBase.cpp index d1bc3f2c7f87ac3ed2bad25f2baa9d436f2af3ff..8599efdfbe0e6064ac24328dbc8d602f32580ecd 100644 GIT binary patch delta 48 zcmV-00MGxN4#*F%Cu{o1PnQig}4w1=ztU`i8K+TB^DZog{ P0|t5}gXZQ|uJud+*9KGS delta 45 zcmZ1`w?%5h0_MpcEPRvSFv|gHt;ri$)Fz9t>Hx98