diff --git a/SwordNGun/Content/Characters/Enemies/TestEnemy/Animations/Reactions/Death.uasset b/SwordNGun/Content/Characters/Enemies/TestEnemy/Animations/Reactions/Death.uasset new file mode 100644 index 0000000..bdbc9c7 --- /dev/null +++ b/SwordNGun/Content/Characters/Enemies/TestEnemy/Animations/Reactions/Death.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:547905e238ba702a17848bde39110549e870d98810536a26802c7575e5ed5294 +size 186101 diff --git a/SwordNGun/Content/Characters/Enemies/TestEnemy/Animations/Reactions/Death_Montage.uasset b/SwordNGun/Content/Characters/Enemies/TestEnemy/Animations/Reactions/Death_Montage.uasset new file mode 100644 index 0000000..abea4fb --- /dev/null +++ b/SwordNGun/Content/Characters/Enemies/TestEnemy/Animations/Reactions/Death_Montage.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:fdc9cff0521de40a66844f5297e20512f75580f2e768e8382e834a164676ade2 +size 94818 diff --git a/SwordNGun/Content/Characters/Enemies/TestEnemy/Animations/Reactions/Dying_On_Ground.uasset b/SwordNGun/Content/Characters/Enemies/TestEnemy/Animations/Reactions/Dying_On_Ground.uasset new file mode 100644 index 0000000..85e3658 --- /dev/null +++ b/SwordNGun/Content/Characters/Enemies/TestEnemy/Animations/Reactions/Dying_On_Ground.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:2feba16be2fe99af60f4fcd6997cb9fad51896dd969a3b762d6e01c4691210e1 +size 181208 diff --git a/SwordNGun/Content/Characters/Enemies/TestEnemy/Animations/Reactions/Getting_Up.uasset b/SwordNGun/Content/Characters/Enemies/TestEnemy/Animations/Reactions/Getting_Up.uasset new file mode 100644 index 0000000..6fa1a2c --- /dev/null +++ b/SwordNGun/Content/Characters/Enemies/TestEnemy/Animations/Reactions/Getting_Up.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:411fc5be98b43ff593d83df9fb00febaf5b4c441f54279352c1b4e45b5565e93 +size 212027 diff --git a/SwordNGun/Content/Characters/Enemies/TestEnemy/Animations/Reactions/Head_Hit.uasset b/SwordNGun/Content/Characters/Enemies/TestEnemy/Animations/Reactions/Head_Hit.uasset new file mode 100644 index 0000000..e82d0af --- /dev/null +++ b/SwordNGun/Content/Characters/Enemies/TestEnemy/Animations/Reactions/Head_Hit.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:4cd6f55bf9994425d4286d7c6e165cab1984d3891a15b93a4b0215abb71ec956 +size 164115 diff --git a/SwordNGun/Content/Characters/Enemies/TestEnemy/Animations/Reactions/Head_Hit_Root.uasset b/SwordNGun/Content/Characters/Enemies/TestEnemy/Animations/Reactions/Head_Hit_Root.uasset new file mode 100644 index 0000000..bf625ba --- /dev/null +++ b/SwordNGun/Content/Characters/Enemies/TestEnemy/Animations/Reactions/Head_Hit_Root.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d14989ec789bf63566f316c9aa80622e1bf75381ebc605c53be29f755583c4af +size 150732 diff --git a/SwordNGun/Content/Characters/Enemies/TestEnemy/Animations/Reactions/Head_Hit_Root_Montage.uasset b/SwordNGun/Content/Characters/Enemies/TestEnemy/Animations/Reactions/Head_Hit_Root_Montage.uasset new file mode 100644 index 0000000..9683955 --- /dev/null +++ b/SwordNGun/Content/Characters/Enemies/TestEnemy/Animations/Reactions/Head_Hit_Root_Montage.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d94299a29bfb1bfea862fc14f3eeee34a1fa5e864413270c63d7ab9e2b45b4bb +size 96737 diff --git a/SwordNGun/Content/Characters/Enemies/TestEnemy/Animations/Reactions/Knockdown_Death.uasset b/SwordNGun/Content/Characters/Enemies/TestEnemy/Animations/Reactions/Knockdown_Death.uasset new file mode 100644 index 0000000..2b9d803 --- /dev/null +++ b/SwordNGun/Content/Characters/Enemies/TestEnemy/Animations/Reactions/Knockdown_Death.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:0ba33b769815bc2cab42bf1d7e842d6cbe09bd3a9b64c3f60793b325351bb4c3 +size 147193 diff --git a/SwordNGun/Content/Characters/Enemies/TestEnemy/Animations/Reactions/Knockdown_Death_Montage.uasset b/SwordNGun/Content/Characters/Enemies/TestEnemy/Animations/Reactions/Knockdown_Death_Montage.uasset new file mode 100644 index 0000000..2abbc8c --- /dev/null +++ b/SwordNGun/Content/Characters/Enemies/TestEnemy/Animations/Reactions/Knockdown_Death_Montage.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:dfca49a652852667d9ee53693f9c9db5b75e459d78f901e09a1cbcbe1a8f9141 +size 95197 diff --git a/SwordNGun/Content/Characters/Enemies/TestEnemy/States/BP_EnemyDead.uasset b/SwordNGun/Content/Characters/Enemies/TestEnemy/States/BP_EnemyDead.uasset index 4ccad10..ed43cf5 100644 --- a/SwordNGun/Content/Characters/Enemies/TestEnemy/States/BP_EnemyDead.uasset +++ b/SwordNGun/Content/Characters/Enemies/TestEnemy/States/BP_EnemyDead.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ac82c18300625ddf03caa5e5fe23c650d28c29baaec21d1dde1efc08d16b0a7d -size 4934 +oid sha256:d2b4236b87946c3468f9301fe9c2a0345d33fae959b0ee0eb7bc67ccf3faa4a9 +size 54091 diff --git a/SwordNGun/Content/Characters/Enemies/TestEnemy/States/BP_EnemyHit.uasset b/SwordNGun/Content/Characters/Enemies/TestEnemy/States/BP_EnemyHit.uasset index 7cc6b02..d3dac3d 100644 --- a/SwordNGun/Content/Characters/Enemies/TestEnemy/States/BP_EnemyHit.uasset +++ b/SwordNGun/Content/Characters/Enemies/TestEnemy/States/BP_EnemyHit.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:8858a3e8e83b4cb6357c8abd6b251f2176339cc45320cf3aa8c4f740c802dd5d -size 33733 +oid sha256:9af7a76681333b2b568abc86214cb4ae77fd93a0e4003454fcde9bfdcb84df42 +size 33494 diff --git a/SwordNGun/Content/Characters/Enemies/TestEnemy/States/BP_EnemyHitStun.uasset b/SwordNGun/Content/Characters/Enemies/TestEnemy/States/BP_EnemyHitStun.uasset index 530911c..cc108c7 100644 --- a/SwordNGun/Content/Characters/Enemies/TestEnemy/States/BP_EnemyHitStun.uasset +++ b/SwordNGun/Content/Characters/Enemies/TestEnemy/States/BP_EnemyHitStun.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e19d926334b56a934b9db5c75cf937ddf8f4f4b963c65e21834c2231f91597ad -size 59497 +oid sha256:4e74e4830a3377fcb870ff18eb95c0119fece2db4cd719e483f66a19dff1b0d0 +size 166288 diff --git a/SwordNGun/Content/Characters/Enemies/TestEnemy/States/BP_EnemyRootState.uasset b/SwordNGun/Content/Characters/Enemies/TestEnemy/States/BP_EnemyRootState.uasset index 04c01cd..16a9d36 100644 --- a/SwordNGun/Content/Characters/Enemies/TestEnemy/States/BP_EnemyRootState.uasset +++ b/SwordNGun/Content/Characters/Enemies/TestEnemy/States/BP_EnemyRootState.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:8fd837027b5587d04ceb708151001b8344992f0ab95bb3e8ecaca5c4e21f587c -size 60673 +oid sha256:d88994ce0ee7e53761ef73d0cdbb8820daba708dec29d67b51350fbddb11396f +size 74675 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 17761d4..c5ce8e6 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:2dfa3bfbf24eab69affe97dd9d91ec2bace88cbab22519adf3c2ae44fdac7d7a -size 101610 +oid sha256:cc15a2076bc2f05fb4c47c2d61f2aaed9e6732270028ff6f801b4f9c5efa4bab +size 101793 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 d9e5c09..f3ba023 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:2de6cb313ef29de45524e5c8a17a7451e73797178bd9129c728d7b0638271735 -size 102751 +oid sha256:35a965a76e1380bae7604b9428a56dbeee99eab35a5c5398f606b03cb4d085c1 +size 102903 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 be2b4d4..dadb305 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:f5ef8305bbc9e83d0974a27c4d5249272a5fed99bcd7a923df1806b6cc1437be -size 101800 +oid sha256:874441e28abddcfed7ef6a5268016169687f89d8d56002fff430fafa46cd10a6 +size 101952 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 4152306..43c63e4 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:28c2b423aa66714cd78fc71d15772d5db55618d48d4f82d59a222c4f0e5d6ef9 -size 100244 +oid sha256:60b026efefad8fc4219de87fed2079df9596d602eb256739868d6884a1aaa49e +size 100396 diff --git a/SwordNGun/Content/Characters/Protagonist/Character/Mesh/SK_Mannequin_PhysicsAsset.uasset b/SwordNGun/Content/Characters/Protagonist/Character/Mesh/SK_Mannequin_PhysicsAsset.uasset index cbd5986..9e8f989 100644 --- a/SwordNGun/Content/Characters/Protagonist/Character/Mesh/SK_Mannequin_PhysicsAsset.uasset +++ b/SwordNGun/Content/Characters/Protagonist/Character/Mesh/SK_Mannequin_PhysicsAsset.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:66d2ab7979a26c4017a78a4d15fe82080c1e5a5db583cefccda698d25e76e25d -size 128805 +oid sha256:d19ee6e0c87bc5c29876ffa0f2c775498d90a66d84c68563f64f8f33e5a20773 +size 137719 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 93a5fc9..ce530c7 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:64276f30844daf093d063d2ca45bf991267b8a8f95a3fe803b96d769ebc546b7 +oid sha256:bb77be3907c8513d9c1cdba0c4abd64e5318f8100a182c614a9ae4ce4115a15e size 30740 diff --git a/SwordNGun/Content/Core/PhysMaterials/PhysMat_Flesh.uasset b/SwordNGun/Content/Core/PhysMaterials/PhysMat_Flesh.uasset new file mode 100644 index 0000000..508eb1e --- /dev/null +++ b/SwordNGun/Content/Core/PhysMaterials/PhysMat_Flesh.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:1cfe9790acb513d278735140dc74832e4d60581765274537eb749041249a10a4 +size 1274 diff --git a/SwordNGun/Content/Core/PhysMaterials/PhysMat_Flesh_Vulnerable.uasset b/SwordNGun/Content/Core/PhysMaterials/PhysMat_Flesh_Vulnerable.uasset new file mode 100644 index 0000000..2745fd5 --- /dev/null +++ b/SwordNGun/Content/Core/PhysMaterials/PhysMat_Flesh_Vulnerable.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:36f02bb733096977cb93e701c7af612a1b282289a6a99d856a4d96eede94a009 +size 1318 diff --git a/SwordNGun/Source/SwordNGun/Private/Characters/SNGCharacterBase.cpp b/SwordNGun/Source/SwordNGun/Private/Characters/SNGCharacterBase.cpp index 3deddcf..150c8b8 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/Components/SNGStateMachineComponent.cpp b/SwordNGun/Source/SwordNGun/Private/Components/SNGStateMachineComponent.cpp index 8a56a28..1893462 100644 Binary files a/SwordNGun/Source/SwordNGun/Private/Components/SNGStateMachineComponent.cpp and b/SwordNGun/Source/SwordNGun/Private/Components/SNGStateMachineComponent.cpp differ diff --git a/SwordNGun/Source/SwordNGun/Private/States/SNGState.cpp b/SwordNGun/Source/SwordNGun/Private/States/SNGState.cpp index eb066b6..2ffde11 100644 Binary files a/SwordNGun/Source/SwordNGun/Private/States/SNGState.cpp and b/SwordNGun/Source/SwordNGun/Private/States/SNGState.cpp differ diff --git a/SwordNGun/Source/SwordNGun/Private/Weapons/SNGHitscanWeapon.cpp b/SwordNGun/Source/SwordNGun/Private/Weapons/SNGHitscanWeapon.cpp index a27f30f..7ea36f5 100644 Binary files a/SwordNGun/Source/SwordNGun/Private/Weapons/SNGHitscanWeapon.cpp and b/SwordNGun/Source/SwordNGun/Private/Weapons/SNGHitscanWeapon.cpp differ diff --git a/SwordNGun/Source/SwordNGun/Private/Weapons/SNGMeleeWeaponBase.cpp b/SwordNGun/Source/SwordNGun/Private/Weapons/SNGMeleeWeaponBase.cpp index 77d8029..e361b7d 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/Components/SNGHealthComponent.h b/SwordNGun/Source/SwordNGun/Public/Components/SNGHealthComponent.h index b1016bc..3f183f7 100644 Binary files a/SwordNGun/Source/SwordNGun/Public/Components/SNGHealthComponent.h and b/SwordNGun/Source/SwordNGun/Public/Components/SNGHealthComponent.h differ diff --git a/SwordNGun/Source/SwordNGun/Public/Components/SNGStateMachineComponent.h b/SwordNGun/Source/SwordNGun/Public/Components/SNGStateMachineComponent.h index 1accf44..6887b0b 100644 Binary files a/SwordNGun/Source/SwordNGun/Public/Components/SNGStateMachineComponent.h and b/SwordNGun/Source/SwordNGun/Public/Components/SNGStateMachineComponent.h differ diff --git a/SwordNGun/Source/SwordNGun/Public/States/SNGState.h b/SwordNGun/Source/SwordNGun/Public/States/SNGState.h index 6013613..15ee8ed 100644 Binary files a/SwordNGun/Source/SwordNGun/Public/States/SNGState.h and b/SwordNGun/Source/SwordNGun/Public/States/SNGState.h differ diff --git a/SwordNGun/Source/SwordNGun/SNGTypes.h b/SwordNGun/Source/SwordNGun/SNGTypes.h index 1f4525e..a2dc8c0 100644 Binary files a/SwordNGun/Source/SwordNGun/SNGTypes.h and b/SwordNGun/Source/SwordNGun/SNGTypes.h differ