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 b1940ea..f3043df 100644 Binary files a/SwordNGun/Source/SwordNGun/Private/Characters/SNGProtagonist.cpp and b/SwordNGun/Source/SwordNGun/Private/Characters/SNGProtagonist.cpp differ diff --git a/SwordNGun/Source/SwordNGun/Private/Components/SNGWeaponInventoryComponent.cpp b/SwordNGun/Source/SwordNGun/Private/Components/SNGWeaponInventoryComponent.cpp index f387cb5..c7301dc 100644 Binary files a/SwordNGun/Source/SwordNGun/Private/Components/SNGWeaponInventoryComponent.cpp and b/SwordNGun/Source/SwordNGun/Private/Components/SNGWeaponInventoryComponent.cpp differ diff --git a/SwordNGun/Source/SwordNGun/Private/Weapons/SNGMeleeWeaponBase.cpp b/SwordNGun/Source/SwordNGun/Private/Weapons/SNGMeleeWeaponBase.cpp index 8eb1ccb..348749d 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/SNGProtagonist.h b/SwordNGun/Source/SwordNGun/Public/Characters/SNGProtagonist.h index cd4eec9..a0b4bd7 100644 Binary files a/SwordNGun/Source/SwordNGun/Public/Characters/SNGProtagonist.h and b/SwordNGun/Source/SwordNGun/Public/Characters/SNGProtagonist.h differ diff --git a/SwordNGun/Source/SwordNGun/Public/Components/SNGWeaponInventoryComponent.h b/SwordNGun/Source/SwordNGun/Public/Components/SNGWeaponInventoryComponent.h index c4a7ed8..65ae95c 100644 Binary files a/SwordNGun/Source/SwordNGun/Public/Components/SNGWeaponInventoryComponent.h and b/SwordNGun/Source/SwordNGun/Public/Components/SNGWeaponInventoryComponent.h differ diff --git a/SwordNGun/Source/SwordNGun/Public/Weapons/SNGMeleeWeaponBase.h b/SwordNGun/Source/SwordNGun/Public/Weapons/SNGMeleeWeaponBase.h index d6453b8..97a26d8 100644 Binary files a/SwordNGun/Source/SwordNGun/Public/Weapons/SNGMeleeWeaponBase.h and b/SwordNGun/Source/SwordNGun/Public/Weapons/SNGMeleeWeaponBase.h differ