diff --git a/Content/Legumix/Player/BP_Play.uasset b/Content/Legumix/Player/BP_Play.uasset index 6c89a76..dfbc0e6 100644 --- a/Content/Legumix/Player/BP_Play.uasset +++ b/Content/Legumix/Player/BP_Play.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a6394dc8bd43c1199896af3b09ce201c36ca3ee2ee5569ac7c986802be9d1074 -size 103103 +oid sha256:76d7fde5410cba3053be0a215334f12a73d00bab4166acbbd42878f80a7c9b9d +size 107224 diff --git a/Content/Legumix/Weapon/Revolver/BP_Revolver.uasset b/Content/Legumix/Weapon/Revolver/BP_Revolver.uasset index ddeacaf..a0558c0 100644 --- a/Content/Legumix/Weapon/Revolver/BP_Revolver.uasset +++ b/Content/Legumix/Weapon/Revolver/BP_Revolver.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c98f77d416772eb10fed3580bef23694f4c8a924cecdd8c5700ddd4a8ea36bf8 -size 41693 +oid sha256:f5684e28e54a10a2f0d9b639024c6e0fcb62cf163dde97aff50d99f3e0497bc1 +size 40222 diff --git a/Content/Legumix/Weapon/Revolver/FireAnimationTest/ABP_Arms.uasset b/Content/Legumix/Weapon/Revolver/FireAnimationTest/ABP_Arms.uasset new file mode 100644 index 0000000..b4fbc97 --- /dev/null +++ b/Content/Legumix/Weapon/Revolver/FireAnimationTest/ABP_Arms.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e9c3b8c928cfdc7ff788413b555f8697508a0798f6acceee118796642505b4f2 +size 162590 diff --git a/Content/Legumix/Weapon/Revolver/FireAnimationTest/AM_Gun.uasset b/Content/Legumix/Weapon/Revolver/FireAnimationTest/AM_Gun.uasset new file mode 100644 index 0000000..6d9ffc5 --- /dev/null +++ b/Content/Legumix/Weapon/Revolver/FireAnimationTest/AM_Gun.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f15bd7d85ec19fe87fad5c95d77f483321dcc6d38e8c3643538ea21df70a66b6 +size 9576 diff --git a/Content/Legumix/Weapon/Revolver/FireAnimationTest/A_Arms_Fire.uasset b/Content/Legumix/Weapon/Revolver/FireAnimationTest/A_Arms_Fire.uasset index b54fd2d..15b4c08 100644 --- a/Content/Legumix/Weapon/Revolver/FireAnimationTest/A_Arms_Fire.uasset +++ b/Content/Legumix/Weapon/Revolver/FireAnimationTest/A_Arms_Fire.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:397451852f2382d318d495687031b15c58f50f87ebc9e2012683f1764393c90f -size 145933 +oid sha256:55c3a9d78986af215df04e27201d8c93e1af7a62a385e8dc6c663c5f7cdc4dcc +size 145934 diff --git a/Content/Legumix/Weapon/Revolver/FireAnimationTest/A_Arms_Idle.uasset b/Content/Legumix/Weapon/Revolver/FireAnimationTest/A_Arms_Idle.uasset new file mode 100644 index 0000000..0f6b01e --- /dev/null +++ b/Content/Legumix/Weapon/Revolver/FireAnimationTest/A_Arms_Idle.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:8917816619297442dac6547496a5ecbfd8ba3f4aae6d78bf9d960db72b99824f +size 144825 diff --git a/Content/Legumix/Weapon/Revolver/FireAnimationTest/A_Arms_Idle/Driving_A_Arms_Idle1.uasset b/Content/Legumix/Weapon/Revolver/FireAnimationTest/A_Arms_Idle/Driving_A_Arms_Idle1.uasset new file mode 100644 index 0000000..69c60d9 --- /dev/null +++ b/Content/Legumix/Weapon/Revolver/FireAnimationTest/A_Arms_Idle/Driving_A_Arms_Idle1.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:8345912252624115780f58a7befd8478e4eb20db9d3365a09bfb4410e7aa4957 +size 82813 diff --git a/Content/Legumix/Weapon/Revolver/FireAnimationTest/SKEL_Arms.uasset b/Content/Legumix/Weapon/Revolver/FireAnimationTest/SKEL_Arms.uasset index 9367e0b..acfb89a 100644 --- a/Content/Legumix/Weapon/Revolver/FireAnimationTest/SKEL_Arms.uasset +++ b/Content/Legumix/Weapon/Revolver/FireAnimationTest/SKEL_Arms.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:503884898961590cb889a330f74f6aac87e455f89d1b267b060439a921beb05d -size 14917 +oid sha256:4abc30d553e7d9b0eec6c92711fcff1f0c2930abd368257a7df3146046ae7c01 +size 16740 diff --git a/Content/Legumix/Weapon/Revolver/FireAnimationTest/SK_Arms.uasset b/Content/Legumix/Weapon/Revolver/FireAnimationTest/SK_Arms.uasset index cb532f0..ac97a3d 100644 --- a/Content/Legumix/Weapon/Revolver/FireAnimationTest/SK_Arms.uasset +++ b/Content/Legumix/Weapon/Revolver/FireAnimationTest/SK_Arms.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a3663f2d8d3bf54728883879bdbee31fd63f8eea7691c6cda4ec19a88ff57707 -size 231525 +oid sha256:3cb63053237ba1573993ff9f841e2c2ff90dab702710042341780dc3d1963f7f +size 231836 diff --git a/Content/Legumix/Weapon/Shotgun/BP_Shotgun.uasset b/Content/Legumix/Weapon/Shotgun/BP_Shotgun.uasset index d0ce8ff..7518f43 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:203d2fd50d5dd8e762b8e46c739f03cb5f360e204082019a8c1f7e2a8157a587 -size 41153 +oid sha256:3a51860445d23fba55e0b48a68fe958e971bd3149cb94212f57a3ea3d36faccb +size 41319 diff --git a/Source/LegumeMix/Private/Weapon/LMWeaponBase.cpp b/Source/LegumeMix/Private/Weapon/LMWeaponBase.cpp index 8c676af..c6308f1 100644 --- a/Source/LegumeMix/Private/Weapon/LMWeaponBase.cpp +++ b/Source/LegumeMix/Private/Weapon/LMWeaponBase.cpp @@ -41,7 +41,7 @@ void ALMWeaponBase::Setup(USkeletalMeshComponent* Mesh, AActor* CharOwner) EAttachmentRule::KeepRelative, false); - AttachToComponent(Mesh, Rules); + AttachToComponent(Mesh, Rules, WeaponSocket); Player = Cast(CharOwner); }