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 10338e9..68af13a 100644 Binary files a/SwordNGun/Source/SwordNGun/Private/Characters/SNGCharacterBase.cpp and b/SwordNGun/Source/SwordNGun/Private/Characters/SNGCharacterBase.cpp differ diff --git a/SwordNGun/Source/SwordNGun/Private/Weapons/SNGMeleeWeaponBase.cpp b/SwordNGun/Source/SwordNGun/Private/Weapons/SNGMeleeWeaponBase.cpp index 348749d..77d8029 100644 Binary files a/SwordNGun/Source/SwordNGun/Private/Weapons/SNGMeleeWeaponBase.cpp and b/SwordNGun/Source/SwordNGun/Private/Weapons/SNGMeleeWeaponBase.cpp differ diff --git a/SwordNGun/Source/SwordNGun/Public/Characters/SNGCharacterBase.h b/SwordNGun/Source/SwordNGun/Public/Characters/SNGCharacterBase.h index 308827e..892d9e5 100644 Binary files a/SwordNGun/Source/SwordNGun/Public/Characters/SNGCharacterBase.h and b/SwordNGun/Source/SwordNGun/Public/Characters/SNGCharacterBase.h differ diff --git a/SwordNGun/Source/SwordNGun/Public/Weapons/SNGMeleeWeaponBase.h b/SwordNGun/Source/SwordNGun/Public/Weapons/SNGMeleeWeaponBase.h index 97a26d8..7c323f3 100644 Binary files a/SwordNGun/Source/SwordNGun/Public/Weapons/SNGMeleeWeaponBase.h and b/SwordNGun/Source/SwordNGun/Public/Weapons/SNGMeleeWeaponBase.h differ diff --git a/SwordNGun/Source/SwordNGun/SNGTypes.cpp b/SwordNGun/Source/SwordNGun/SNGTypes.cpp new file mode 100644 index 0000000..0a5afe3 --- /dev/null +++ b/SwordNGun/Source/SwordNGun/SNGTypes.cpp @@ -0,0 +1,9 @@ +// Project Sword & Gun Copyright © 2021 Kevin Poretti + +#include "SNGTypes.h" + +void FSNGDamageEvent::GetBestHitInfo(AActor const* HitActor, AActor const* HitInstigator, FHitResult& OutHitInfo, + FVector& OutImpulseDir) const +{ + +} diff --git a/SwordNGun/Source/SwordNGun/SNGTypes.h b/SwordNGun/Source/SwordNGun/SNGTypes.h index ccbe260..106df46 100644 Binary files a/SwordNGun/Source/SwordNGun/SNGTypes.h and b/SwordNGun/Source/SwordNGun/SNGTypes.h differ