From be2e59e0031f5bbbc8b8e93293c18ceba3510ecf Mon Sep 17 00:00:00 2001 From: TjgL Date: Fri, 14 Mar 2025 14:17:01 +0100 Subject: [PATCH] Updated shotgun firing animation Signed-off-by: TjgL --- .gitignore | 4 ++-- Content/Legumix/Weapon/Shotgun/Animations/ABP_Shotgun.uasset | 3 +++ Content/Legumix/Weapon/Shotgun/Animations/AM_Arms_Fire.uasset | 3 +++ .../Legumix/Weapon/Shotgun/Animations/AM_Shotgun_Fire.uasset | 3 +++ Content/Legumix/Weapon/Shotgun/BP_Shotgun.uasset | 4 ++-- Source/LegumeMix/Private/Weapon/LMShotgun.cpp | 1 + 6 files changed, 14 insertions(+), 4 deletions(-) create mode 100644 Content/Legumix/Weapon/Shotgun/Animations/ABP_Shotgun.uasset create mode 100644 Content/Legumix/Weapon/Shotgun/Animations/AM_Arms_Fire.uasset create mode 100644 Content/Legumix/Weapon/Shotgun/Animations/AM_Shotgun_Fire.uasset diff --git a/.gitignore b/.gitignore index 216cec3..4d0683e 100644 --- a/.gitignore +++ b/.gitignore @@ -47,8 +47,8 @@ SourceArt/**/*.png SourceArt/**/*.tga # Binary Files -#Binaries/* -#Plugins/**/Binaries/* +Binaries/* +Plugins/**/Binaries/* # Builds Build/* diff --git a/Content/Legumix/Weapon/Shotgun/Animations/ABP_Shotgun.uasset b/Content/Legumix/Weapon/Shotgun/Animations/ABP_Shotgun.uasset new file mode 100644 index 0000000..2eb022a --- /dev/null +++ b/Content/Legumix/Weapon/Shotgun/Animations/ABP_Shotgun.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:9128b4299e23d8a62e598657abf4c77656f1a54c0918648905a67db1404a7906 +size 35909 diff --git a/Content/Legumix/Weapon/Shotgun/Animations/AM_Arms_Fire.uasset b/Content/Legumix/Weapon/Shotgun/Animations/AM_Arms_Fire.uasset new file mode 100644 index 0000000..c22fda4 --- /dev/null +++ b/Content/Legumix/Weapon/Shotgun/Animations/AM_Arms_Fire.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:43a53023023971e8632e9bdfdb2b73dd0bff411b4a4eaddb4f19aad0168d53bb +size 8620 diff --git a/Content/Legumix/Weapon/Shotgun/Animations/AM_Shotgun_Fire.uasset b/Content/Legumix/Weapon/Shotgun/Animations/AM_Shotgun_Fire.uasset new file mode 100644 index 0000000..9f07be8 --- /dev/null +++ b/Content/Legumix/Weapon/Shotgun/Animations/AM_Shotgun_Fire.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d09af8cbf1947b5661ceef9f7952c9ff2b86578b4c8a08c9a67cc95a07d9011d +size 12249 diff --git a/Content/Legumix/Weapon/Shotgun/BP_Shotgun.uasset b/Content/Legumix/Weapon/Shotgun/BP_Shotgun.uasset index 0365395..8cccd9c 100644 --- a/Content/Legumix/Weapon/Shotgun/BP_Shotgun.uasset +++ b/Content/Legumix/Weapon/Shotgun/BP_Shotgun.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:edd6a16c3e3c46dfc46d703dd1c9bb23252ba92ff80d39152f10465af60e7755 -size 40178 +oid sha256:b90b3bcbbf678bf45bf01242c7c579d28efc797de7c67039fc639c06463b154a +size 40700 diff --git a/Source/LegumeMix/Private/Weapon/LMShotgun.cpp b/Source/LegumeMix/Private/Weapon/LMShotgun.cpp index 0312f59..576ed93 100644 --- a/Source/LegumeMix/Private/Weapon/LMShotgun.cpp +++ b/Source/LegumeMix/Private/Weapon/LMShotgun.cpp @@ -31,6 +31,7 @@ void ALMShotgun::PrimaryFire() } PlayAnimation(PrimaryFireAnimation); + Player->PlayAnimation(PrimaryFireArmsAnimation); const FVector Origin = Player->GetWeaponFiringOrigin(); const FVector Direction = Player->GetAimVector();