From 5de63297cc893a8b1f5dee746052b7ec682187f5 Mon Sep 17 00:00:00 2001 From: Kevin Poretti Date: Tue, 9 Nov 2021 23:00:18 -0500 Subject: [PATCH] Separate CanCancel flag into CanMove, CanJump, CanDodge, CanAttack [git-p4: depot-paths = "//depot/main/": change = 139] --- .../States/BP_EnemyAirHitStun.uasset | 4 ++-- .../TestEnemy/States/BP_EnemyDead.uasset | 4 ++-- .../TestEnemy/States/BP_EnemyGetUp.uasset | 4 ++-- .../TestEnemy/States/BP_EnemyHit.uasset | 4 ++-- .../TestEnemy/States/BP_EnemyKnockdown.uasset | 4 ++-- .../Dodge/HandGun_Step_B_Montage.uasset | 4 ++-- .../Dodge/HandGun_Step_F_Montage.uasset | 4 ++-- .../Dodge/HandGun_Step_L_Montage.uasset | 4 ++-- .../Dodge/HandGun_Step_R_Montage.uasset | 4 ++-- .../GroundSwordAttackCombo1_Montage.uasset | 4 ++-- .../GroundSwordAttackCombo2_Montage.uasset | 4 ++-- .../GroundSwordAttackCombo3_Montage.uasset | 4 ++-- .../GroundSwordAttackCombo4_Montage.uasset | 4 ++-- .../Melee/OLD/Air_Attack_1_Montage.uasset | 4 ++-- .../Melee/OLD/Air_Attack_2_Montage.uasset | 4 ++-- .../Melee/OLD/Launcher_Attack_Montage.uasset | 4 ++-- .../States/BP_ProtagAirAttack1.uasset | 4 ++-- .../States/BP_ProtagAirAttack2.uasset | 4 ++-- .../States/BP_ProtagAirAttacking.uasset | 4 ++-- .../BP_ProtagAirFiringWeaponState.uasset | 4 ++-- .../States/BP_ProtagAirborneState.uasset | 4 ++-- .../States/BP_ProtagDashStab.uasset | 4 ++-- .../States/BP_ProtagDashState.uasset | 4 ++-- .../States/BP_ProtagFiringWeaponState.uasset | 4 ++-- .../States/BP_ProtagGroundAttack1.uasset | 4 ++-- .../States/BP_ProtagGroundAttack2.uasset | 4 ++-- .../States/BP_ProtagGroundAttack3.uasset | 4 ++-- .../States/BP_ProtagGroundAttack4.uasset | 4 ++-- .../States/BP_ProtagGroundAttacking.uasset | 4 ++-- .../States/BP_ProtagGroundLauncher.uasset | 4 ++-- .../States/BP_ProtagGroundedState.uasset | 4 ++-- .../States/BP_ProtagHitStun.uasset | 4 ++-- .../Protagonist/States/BP_ProtagJump.uasset | 4 ++-- .../States/BP_ProtagReloadState.uasset | 4 ++-- .../Core/AnimNotifies/AN_CanAttack.uasset | 3 +++ .../Core/AnimNotifies/AN_CanCancel.uasset | 4 ++-- .../Core/AnimNotifies/AN_CanDodge.uasset | 3 +++ .../Core/AnimNotifies/AN_CanJump.uasset | 3 +++ .../Core/AnimNotifies/AN_CanMove.uasset | 3 +++ SwordNGun/Content/Maps/Test.umap | 2 +- SwordNGun/Content/Maps/Test_BuiltData.uasset | 2 +- .../Private/Characters/SNGCharacterBase.cpp | Bin 11282 -> 12718 bytes .../Public/Characters/SNGCharacterBase.h | Bin 5280 -> 7364 bytes 43 files changed, 84 insertions(+), 72 deletions(-) create mode 100644 SwordNGun/Content/Core/AnimNotifies/AN_CanAttack.uasset create mode 100644 SwordNGun/Content/Core/AnimNotifies/AN_CanDodge.uasset create mode 100644 SwordNGun/Content/Core/AnimNotifies/AN_CanJump.uasset create mode 100644 SwordNGun/Content/Core/AnimNotifies/AN_CanMove.uasset diff --git a/SwordNGun/Content/Characters/Enemies/TestEnemy/States/BP_EnemyAirHitStun.uasset b/SwordNGun/Content/Characters/Enemies/TestEnemy/States/BP_EnemyAirHitStun.uasset index 28ae03b..5a23b35 100644 --- a/SwordNGun/Content/Characters/Enemies/TestEnemy/States/BP_EnemyAirHitStun.uasset +++ b/SwordNGun/Content/Characters/Enemies/TestEnemy/States/BP_EnemyAirHitStun.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:41e4c46fa8939a37ffa1ec4aad5173102e3d7bbeac8077d07da5970f23177554 -size 71660 +oid sha256:64120c089814e5db428e4644d1a432ba733d23c75cf53b4be69662467f1410b7 +size 52435 diff --git a/SwordNGun/Content/Characters/Enemies/TestEnemy/States/BP_EnemyDead.uasset b/SwordNGun/Content/Characters/Enemies/TestEnemy/States/BP_EnemyDead.uasset index 2e89c46..6bee64a 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:62e251e4c0c84ccb687b760ace9a4ef2af9cce6f77e907533039d07a651de255 -size 85077 +oid sha256:868945ea2a87a07dd06f7d2ac4d6e08b6bf0b0c6f2df546164043e9932848764 +size 80641 diff --git a/SwordNGun/Content/Characters/Enemies/TestEnemy/States/BP_EnemyGetUp.uasset b/SwordNGun/Content/Characters/Enemies/TestEnemy/States/BP_EnemyGetUp.uasset index 9afdd7c..4735d3b 100644 --- a/SwordNGun/Content/Characters/Enemies/TestEnemy/States/BP_EnemyGetUp.uasset +++ b/SwordNGun/Content/Characters/Enemies/TestEnemy/States/BP_EnemyGetUp.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c1b0e9780575bb1b1acec1a1202065ba048a37f31709475e039278c3fbb4e866 -size 78199 +oid sha256:2c9fe6600bbb632696fe976f5f7cc02c4650be9172ba817cebad821a812a00ea +size 59170 diff --git a/SwordNGun/Content/Characters/Enemies/TestEnemy/States/BP_EnemyHit.uasset b/SwordNGun/Content/Characters/Enemies/TestEnemy/States/BP_EnemyHit.uasset index b53357e..2ebe3b5 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:885883f4f364d50b13463e172e96ad4bd3818cbcb7dd8c9dfc06ec2bf0ebce56 -size 34434 +oid sha256:0f88acfe7f177ccb58456bd55cad30ebca16f207557dcccf5f4a7d74000f5b65 +size 31910 diff --git a/SwordNGun/Content/Characters/Enemies/TestEnemy/States/BP_EnemyKnockdown.uasset b/SwordNGun/Content/Characters/Enemies/TestEnemy/States/BP_EnemyKnockdown.uasset index e0121c7..d19ebae 100644 --- a/SwordNGun/Content/Characters/Enemies/TestEnemy/States/BP_EnemyKnockdown.uasset +++ b/SwordNGun/Content/Characters/Enemies/TestEnemy/States/BP_EnemyKnockdown.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e3ee480ef77c851dd2096e42644d13db761c1c9577b542fb8c91b1879e0ed072 -size 87428 +oid sha256:832718fa375e7dcdca270a61fd3cc3bb013499d5158042aa7ad40f176f00b046 +size 68119 diff --git a/SwordNGun/Content/Characters/Protagonist/Animations/Locomotion/Ranged/Dodge/HandGun_Step_B_Montage.uasset b/SwordNGun/Content/Characters/Protagonist/Animations/Locomotion/Ranged/Dodge/HandGun_Step_B_Montage.uasset index 006b146..5147eec 100644 --- a/SwordNGun/Content/Characters/Protagonist/Animations/Locomotion/Ranged/Dodge/HandGun_Step_B_Montage.uasset +++ b/SwordNGun/Content/Characters/Protagonist/Animations/Locomotion/Ranged/Dodge/HandGun_Step_B_Montage.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:521e89df1444c2c8a88e0c9b43fe661622bf9c631d6c58e7dc3921793703fd7e -size 98266 +oid sha256:23e229f182e876fc503efb4d15715de5f9c97c850d8776ee751af94e5ffaca8e +size 103010 diff --git a/SwordNGun/Content/Characters/Protagonist/Animations/Locomotion/Ranged/Dodge/HandGun_Step_F_Montage.uasset b/SwordNGun/Content/Characters/Protagonist/Animations/Locomotion/Ranged/Dodge/HandGun_Step_F_Montage.uasset index 03e3185..d58c24d 100644 --- a/SwordNGun/Content/Characters/Protagonist/Animations/Locomotion/Ranged/Dodge/HandGun_Step_F_Montage.uasset +++ b/SwordNGun/Content/Characters/Protagonist/Animations/Locomotion/Ranged/Dodge/HandGun_Step_F_Montage.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:62bef9e86249147dfdfe2067ed3bea92dfc815d6a0d89f7b375d825eaa16892f -size 97730 +oid sha256:92d2d03dfb2163d38abc3304e4570f3312dbd764ce9671df132eea4441f573aa +size 102211 diff --git a/SwordNGun/Content/Characters/Protagonist/Animations/Locomotion/Ranged/Dodge/HandGun_Step_L_Montage.uasset b/SwordNGun/Content/Characters/Protagonist/Animations/Locomotion/Ranged/Dodge/HandGun_Step_L_Montage.uasset index 5d298d9..3cc86de 100644 --- a/SwordNGun/Content/Characters/Protagonist/Animations/Locomotion/Ranged/Dodge/HandGun_Step_L_Montage.uasset +++ b/SwordNGun/Content/Characters/Protagonist/Animations/Locomotion/Ranged/Dodge/HandGun_Step_L_Montage.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:cdaac0a659fce5f432d81746182e9549439b6af6d6d54894a4af8b5e7a18ca6e -size 99120 +oid sha256:34f51b49a180b706f321a3998e061dd37f41ad22734c22ab1323d2e025a5a739 +size 103733 diff --git a/SwordNGun/Content/Characters/Protagonist/Animations/Locomotion/Ranged/Dodge/HandGun_Step_R_Montage.uasset b/SwordNGun/Content/Characters/Protagonist/Animations/Locomotion/Ranged/Dodge/HandGun_Step_R_Montage.uasset index 907cc09..882e594 100644 --- a/SwordNGun/Content/Characters/Protagonist/Animations/Locomotion/Ranged/Dodge/HandGun_Step_R_Montage.uasset +++ b/SwordNGun/Content/Characters/Protagonist/Animations/Locomotion/Ranged/Dodge/HandGun_Step_R_Montage.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:8f4be6b762eb17c2decc47cbaae8f7f2d6385638a4f3daf131305f73264aa16c -size 99521 +oid sha256:eedfa6f2a589320e7d49f96cefda1fdcdebab3bbed08b259a231b47262d3d1d1 +size 104109 diff --git a/SwordNGun/Content/Characters/Protagonist/Animations/Melee/Ground/GroundSwordAttackCombo1_Montage.uasset b/SwordNGun/Content/Characters/Protagonist/Animations/Melee/Ground/GroundSwordAttackCombo1_Montage.uasset index d3b5a9f..595e812 100644 --- a/SwordNGun/Content/Characters/Protagonist/Animations/Melee/Ground/GroundSwordAttackCombo1_Montage.uasset +++ b/SwordNGun/Content/Characters/Protagonist/Animations/Melee/Ground/GroundSwordAttackCombo1_Montage.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d4fe3086b23ccb4b43da5714b9f2293de30f686d1b13f40dbb1bc9796b2b1a04 -size 102169 +oid sha256:c6d1712d58428698887a8661b31e5b383d4dcdeebe3612972fe00bbd078134cf +size 106849 diff --git a/SwordNGun/Content/Characters/Protagonist/Animations/Melee/Ground/GroundSwordAttackCombo2_Montage.uasset b/SwordNGun/Content/Characters/Protagonist/Animations/Melee/Ground/GroundSwordAttackCombo2_Montage.uasset index fe61ff7..f527c71 100644 --- a/SwordNGun/Content/Characters/Protagonist/Animations/Melee/Ground/GroundSwordAttackCombo2_Montage.uasset +++ b/SwordNGun/Content/Characters/Protagonist/Animations/Melee/Ground/GroundSwordAttackCombo2_Montage.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:55a7946f890612b2e1802e1a836fd62a1d012ff15f7073e6556282b297b69596 -size 103315 +oid sha256:2fddd6f14df6ff8966f69f6add14e92b78573962503a30ebd41f70e94a0c90d2 +size 107995 diff --git a/SwordNGun/Content/Characters/Protagonist/Animations/Melee/Ground/GroundSwordAttackCombo3_Montage.uasset b/SwordNGun/Content/Characters/Protagonist/Animations/Melee/Ground/GroundSwordAttackCombo3_Montage.uasset index 5378d70..637cddd 100644 --- a/SwordNGun/Content/Characters/Protagonist/Animations/Melee/Ground/GroundSwordAttackCombo3_Montage.uasset +++ b/SwordNGun/Content/Characters/Protagonist/Animations/Melee/Ground/GroundSwordAttackCombo3_Montage.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:201607ad295a3d09177692c3dc55c20d3d6267809198e262c0b02ff76c2c543f -size 103806 +oid sha256:3d57074bd95f9f5e164337d1ff18141d3596b3eb43f5c69f9746277b0b305de8 +size 108486 diff --git a/SwordNGun/Content/Characters/Protagonist/Animations/Melee/Ground/GroundSwordAttackCombo4_Montage.uasset b/SwordNGun/Content/Characters/Protagonist/Animations/Melee/Ground/GroundSwordAttackCombo4_Montage.uasset index 26aa494..beb6435 100644 --- a/SwordNGun/Content/Characters/Protagonist/Animations/Melee/Ground/GroundSwordAttackCombo4_Montage.uasset +++ b/SwordNGun/Content/Characters/Protagonist/Animations/Melee/Ground/GroundSwordAttackCombo4_Montage.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:eeec817155918bb6a960a2a48a3a46c80730e6c2aabd558e874de64dab44d9d9 -size 99446 +oid sha256:1ead3f73f2c5fb2045086a50e2f584a7bcb31638ec8ad5c9eeb1253fd601cd04 +size 104142 diff --git a/SwordNGun/Content/Characters/Protagonist/Animations/Melee/OLD/Air_Attack_1_Montage.uasset b/SwordNGun/Content/Characters/Protagonist/Animations/Melee/OLD/Air_Attack_1_Montage.uasset index 18fb249..42fe0fa 100644 --- a/SwordNGun/Content/Characters/Protagonist/Animations/Melee/OLD/Air_Attack_1_Montage.uasset +++ b/SwordNGun/Content/Characters/Protagonist/Animations/Melee/OLD/Air_Attack_1_Montage.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:62d006b736c873a499e81305fc3594f7be69c9b19a5b546e4d0882909abeed06 -size 102014 +oid sha256:62d50db7034d7c06cca052eb9a1c768382387120988ccad30bdd633e7e4767a8 +size 106542 diff --git a/SwordNGun/Content/Characters/Protagonist/Animations/Melee/OLD/Air_Attack_2_Montage.uasset b/SwordNGun/Content/Characters/Protagonist/Animations/Melee/OLD/Air_Attack_2_Montage.uasset index 0e63fcc..4aa1e1a 100644 --- a/SwordNGun/Content/Characters/Protagonist/Animations/Melee/OLD/Air_Attack_2_Montage.uasset +++ b/SwordNGun/Content/Characters/Protagonist/Animations/Melee/OLD/Air_Attack_2_Montage.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:9c3f68723c8a603c9fedc52df643897f85875415dda9137e1c2de2be599a7aad -size 100467 +oid sha256:3f37b410ec6fb4142d405b0b064b6eb2cacdeb8ae5dc532cf681ab8a1ed7ae3e +size 105124 diff --git a/SwordNGun/Content/Characters/Protagonist/Animations/Melee/OLD/Launcher_Attack_Montage.uasset b/SwordNGun/Content/Characters/Protagonist/Animations/Melee/OLD/Launcher_Attack_Montage.uasset index 62fbe50..531e7c5 100644 --- a/SwordNGun/Content/Characters/Protagonist/Animations/Melee/OLD/Launcher_Attack_Montage.uasset +++ b/SwordNGun/Content/Characters/Protagonist/Animations/Melee/OLD/Launcher_Attack_Montage.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e031046fecd40c5491ce39985d23ac84c7415ddb58be7bff92f3e829593d0f86 -size 102722 +oid sha256:145da94c6c5598e2b8bc44c733b34c2c372688b7e3b9678e0ec40d409800b0b2 +size 107021 diff --git a/SwordNGun/Content/Characters/Protagonist/States/BP_ProtagAirAttack1.uasset b/SwordNGun/Content/Characters/Protagonist/States/BP_ProtagAirAttack1.uasset index 68829a6..7b518d1 100644 --- a/SwordNGun/Content/Characters/Protagonist/States/BP_ProtagAirAttack1.uasset +++ b/SwordNGun/Content/Characters/Protagonist/States/BP_ProtagAirAttack1.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:5746d1bd8cb9520d61cd3f9ee993d59ce91279ce98ecf2d2cd4a7434b75ebdf3 -size 103731 +oid sha256:195abaca28f505bcd1d6027a828670bc2ce0ba8ca122e8f879362ac6a9d2e21a +size 102840 diff --git a/SwordNGun/Content/Characters/Protagonist/States/BP_ProtagAirAttack2.uasset b/SwordNGun/Content/Characters/Protagonist/States/BP_ProtagAirAttack2.uasset index b4bbd46..6971848 100644 --- a/SwordNGun/Content/Characters/Protagonist/States/BP_ProtagAirAttack2.uasset +++ b/SwordNGun/Content/Characters/Protagonist/States/BP_ProtagAirAttack2.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:99ac11cdd8c06d93823281301fb25aa1ff37c697de4af56d5224adb2557b037c -size 70058 +oid sha256:2c4511dcee0003f1bd0e34b2751d51902f18a7e6b8a9d45802ffedeb14cde448 +size 68631 diff --git a/SwordNGun/Content/Characters/Protagonist/States/BP_ProtagAirAttacking.uasset b/SwordNGun/Content/Characters/Protagonist/States/BP_ProtagAirAttacking.uasset index 0e5ab1d..e5f4bd9 100644 --- a/SwordNGun/Content/Characters/Protagonist/States/BP_ProtagAirAttacking.uasset +++ b/SwordNGun/Content/Characters/Protagonist/States/BP_ProtagAirAttacking.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e838a781edd1558122767da6bf560f442ce250358192914ac7e8a4a2f5db0640 -size 29248 +oid sha256:ac5d6959a6f9e1cdd2bba1479952466f79957f0989d0a2897d61ae95df38e6e8 +size 28395 diff --git a/SwordNGun/Content/Characters/Protagonist/States/BP_ProtagAirFiringWeaponState.uasset b/SwordNGun/Content/Characters/Protagonist/States/BP_ProtagAirFiringWeaponState.uasset index 053d238..86ac822 100644 --- a/SwordNGun/Content/Characters/Protagonist/States/BP_ProtagAirFiringWeaponState.uasset +++ b/SwordNGun/Content/Characters/Protagonist/States/BP_ProtagAirFiringWeaponState.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:dd209eb1510d426eac2aa4316b078d137e0141e83711906d7a9094dd03690db1 -size 177250 +oid sha256:5e2a65964b7fb82e5600dc96ea9a870d51d45b590e72388b84ca449aeed3d241 +size 171224 diff --git a/SwordNGun/Content/Characters/Protagonist/States/BP_ProtagAirborneState.uasset b/SwordNGun/Content/Characters/Protagonist/States/BP_ProtagAirborneState.uasset index d97a072..513ace5 100644 --- a/SwordNGun/Content/Characters/Protagonist/States/BP_ProtagAirborneState.uasset +++ b/SwordNGun/Content/Characters/Protagonist/States/BP_ProtagAirborneState.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:6d1a26b0ff0e04ee02aab38104524c588d3d95f55257fb2feac6d4fdf4962880 -size 121614 +oid sha256:bc663675ef0ffb7a66412146c935d97f5862a6f33fb67cc2cfccc2476228c822 +size 120554 diff --git a/SwordNGun/Content/Characters/Protagonist/States/BP_ProtagDashStab.uasset b/SwordNGun/Content/Characters/Protagonist/States/BP_ProtagDashStab.uasset index 5e3f519..ab033ae 100644 --- a/SwordNGun/Content/Characters/Protagonist/States/BP_ProtagDashStab.uasset +++ b/SwordNGun/Content/Characters/Protagonist/States/BP_ProtagDashStab.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:bbec8a81b716446d40cb5d432553fb93ab4279c251855e3e131a7fce9d009a85 -size 32531 +oid sha256:4e5b1a18210f6c27dee6690bb21871298843b90ed125c5817e25e25a346e2138 +size 31654 diff --git a/SwordNGun/Content/Characters/Protagonist/States/BP_ProtagDashState.uasset b/SwordNGun/Content/Characters/Protagonist/States/BP_ProtagDashState.uasset index 7b941bc..b15537e 100644 --- a/SwordNGun/Content/Characters/Protagonist/States/BP_ProtagDashState.uasset +++ b/SwordNGun/Content/Characters/Protagonist/States/BP_ProtagDashState.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:db7da912b1347c6bd39aaa6f87a30fbe0c0da962a1decd94518d8fae167fd772 -size 190960 +oid sha256:618cdcd089c7d553b5319fcb80d4f48c1a7ef44383f09b4ef1d15bb31b4e93da +size 186562 diff --git a/SwordNGun/Content/Characters/Protagonist/States/BP_ProtagFiringWeaponState.uasset b/SwordNGun/Content/Characters/Protagonist/States/BP_ProtagFiringWeaponState.uasset index 74d8d95..28c67ea 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:8e3a92e1d687885a0e16ab9e4723b98d6384ab4f50593909839ae4a90ce09ac3 -size 167664 +oid sha256:757d09317584a58a58b2a7fec2f3d0f86972bad7cc6c2167f8ce3af1233bacbb +size 162560 diff --git a/SwordNGun/Content/Characters/Protagonist/States/BP_ProtagGroundAttack1.uasset b/SwordNGun/Content/Characters/Protagonist/States/BP_ProtagGroundAttack1.uasset index 348422a..3e91a04 100644 --- a/SwordNGun/Content/Characters/Protagonist/States/BP_ProtagGroundAttack1.uasset +++ b/SwordNGun/Content/Characters/Protagonist/States/BP_ProtagGroundAttack1.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:9b04c443f68c24ff982676d5e5b7d2ac28aef3fed7d6e6eb1508cd646777ef5a -size 91317 +oid sha256:382f31d714aecd87638ee13b05ff365bfdab6176f474211c21ea9b4b44963b44 +size 88678 diff --git a/SwordNGun/Content/Characters/Protagonist/States/BP_ProtagGroundAttack2.uasset b/SwordNGun/Content/Characters/Protagonist/States/BP_ProtagGroundAttack2.uasset index f66cb5e..5e40401 100644 --- a/SwordNGun/Content/Characters/Protagonist/States/BP_ProtagGroundAttack2.uasset +++ b/SwordNGun/Content/Characters/Protagonist/States/BP_ProtagGroundAttack2.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:265baf3a404ebf25cbb38b0e344fc235bf0c65db69b8859009b9c79ca657b91e -size 91210 +oid sha256:0ae2c2da82ebb15e8c27ca5a26129676d537d93095eef707a657cbe5d1c92e86 +size 88464 diff --git a/SwordNGun/Content/Characters/Protagonist/States/BP_ProtagGroundAttack3.uasset b/SwordNGun/Content/Characters/Protagonist/States/BP_ProtagGroundAttack3.uasset index 8607b4a..2d6473e 100644 --- a/SwordNGun/Content/Characters/Protagonist/States/BP_ProtagGroundAttack3.uasset +++ b/SwordNGun/Content/Characters/Protagonist/States/BP_ProtagGroundAttack3.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:15d0a6d2b29623520acb9bdaaf7536821ad151d82b6714cf4ae91c03cce02cc1 -size 109798 +oid sha256:c57ff3f5f786518cf22ab10e26222f9448e6d6fd988d9099667f4173e8e53d4d +size 90058 diff --git a/SwordNGun/Content/Characters/Protagonist/States/BP_ProtagGroundAttack4.uasset b/SwordNGun/Content/Characters/Protagonist/States/BP_ProtagGroundAttack4.uasset index 58a4aa5..1799793 100644 --- a/SwordNGun/Content/Characters/Protagonist/States/BP_ProtagGroundAttack4.uasset +++ b/SwordNGun/Content/Characters/Protagonist/States/BP_ProtagGroundAttack4.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:444f711d136ec87889f7bc2d7ecaf5fc350e2e638399dd6117b5871a89638811 -size 54334 +oid sha256:aca2304fb81922cb9b336ddf75b72693136218315f6a13b62a7591b995e13aa1 +size 52067 diff --git a/SwordNGun/Content/Characters/Protagonist/States/BP_ProtagGroundAttacking.uasset b/SwordNGun/Content/Characters/Protagonist/States/BP_ProtagGroundAttacking.uasset index e17ef7b..bc33773 100644 --- a/SwordNGun/Content/Characters/Protagonist/States/BP_ProtagGroundAttacking.uasset +++ b/SwordNGun/Content/Characters/Protagonist/States/BP_ProtagGroundAttacking.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ee7a4b7f4f56eed835fc8f45e99ed6a238e464bd691863df14fa0ed738ad016a -size 60237 +oid sha256:1e89681cc2c2439d08eb9959c4a0fca407860a86e0fbb5131b7b5f2abad2ce8e +size 58970 diff --git a/SwordNGun/Content/Characters/Protagonist/States/BP_ProtagGroundLauncher.uasset b/SwordNGun/Content/Characters/Protagonist/States/BP_ProtagGroundLauncher.uasset index aa20b1c..fd19bd3 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:b632e945a867103091af2e9ee0bdfab51530bafb8666b4b3d41fe819fd5ec0ff -size 58226 +oid sha256:37bc6f112155aa0e3cd901294abb40dbc8a15a3ed32285efff48ada2c343c8d5 +size 55879 diff --git a/SwordNGun/Content/Characters/Protagonist/States/BP_ProtagGroundedState.uasset b/SwordNGun/Content/Characters/Protagonist/States/BP_ProtagGroundedState.uasset index 6116ed2..a0400ac 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:8e7d278997ed39141c76ad1274c0fde98e10514ea0ded3110d915b84736e9d16 -size 226630 +oid sha256:775fcfc5595706db16561a5da50d52ac779061fc800ab047d0cf7820e359c713 +size 226421 diff --git a/SwordNGun/Content/Characters/Protagonist/States/BP_ProtagHitStun.uasset b/SwordNGun/Content/Characters/Protagonist/States/BP_ProtagHitStun.uasset index 6184706..4e7d2de 100644 --- a/SwordNGun/Content/Characters/Protagonist/States/BP_ProtagHitStun.uasset +++ b/SwordNGun/Content/Characters/Protagonist/States/BP_ProtagHitStun.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c94d62b02b99f3e1a33288f704473b54e285679d1cff04d76190b58a77250063 -size 79135 +oid sha256:b213a0fa9edde2b8a38f5810abea497065b0f2d069b94d789ad736bde8ca6fdc +size 72831 diff --git a/SwordNGun/Content/Characters/Protagonist/States/BP_ProtagJump.uasset b/SwordNGun/Content/Characters/Protagonist/States/BP_ProtagJump.uasset index 57602e9..6170db7 100644 --- a/SwordNGun/Content/Characters/Protagonist/States/BP_ProtagJump.uasset +++ b/SwordNGun/Content/Characters/Protagonist/States/BP_ProtagJump.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:efdff1a92de4aeb0c0254d7a4cd499ef2bdb201fbf9cc47e5e477e0b7451f338 -size 61323 +oid sha256:381f6dc05878c79e8df5bb3dbb66718cbed9da99f529e6f21e60e514248bb799 +size 58786 diff --git a/SwordNGun/Content/Characters/Protagonist/States/BP_ProtagReloadState.uasset b/SwordNGun/Content/Characters/Protagonist/States/BP_ProtagReloadState.uasset index 4c73651..e1acecb 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:77e02cef2e07e8e2955a67bb17611db5920f2017daa531708774476ed18898dc -size 110978 +oid sha256:8e09d51570b3eade7d513be99303288898bc6c50a8b0fe61dd66b8c1ee36059a +size 107874 diff --git a/SwordNGun/Content/Core/AnimNotifies/AN_CanAttack.uasset b/SwordNGun/Content/Core/AnimNotifies/AN_CanAttack.uasset new file mode 100644 index 0000000..e61259b --- /dev/null +++ b/SwordNGun/Content/Core/AnimNotifies/AN_CanAttack.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a46f6c183cd9b424aa3a30a91f8f1dfb04d231f5ca68a3bfd82c2c9ad4b88e6b +size 23120 diff --git a/SwordNGun/Content/Core/AnimNotifies/AN_CanCancel.uasset b/SwordNGun/Content/Core/AnimNotifies/AN_CanCancel.uasset index 866a5a5..75296df 100644 --- a/SwordNGun/Content/Core/AnimNotifies/AN_CanCancel.uasset +++ b/SwordNGun/Content/Core/AnimNotifies/AN_CanCancel.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:5a88e9fe63e260cdbf54bdbfa3dab7bd6717b7a4dc0bcd28dd3ce287e503aff9 -size 23342 +oid sha256:957417823dbb8327684db3911ed683c401bf157616d1d973798f3013e93ed26c +size 2227 diff --git a/SwordNGun/Content/Core/AnimNotifies/AN_CanDodge.uasset b/SwordNGun/Content/Core/AnimNotifies/AN_CanDodge.uasset new file mode 100644 index 0000000..39d731b --- /dev/null +++ b/SwordNGun/Content/Core/AnimNotifies/AN_CanDodge.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:0245ddddeca5ebce99e2c3547aec30d8dbc6b770e6e0eaf04fab038bc4cbc234 +size 23247 diff --git a/SwordNGun/Content/Core/AnimNotifies/AN_CanJump.uasset b/SwordNGun/Content/Core/AnimNotifies/AN_CanJump.uasset new file mode 100644 index 0000000..b76a39b --- /dev/null +++ b/SwordNGun/Content/Core/AnimNotifies/AN_CanJump.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b10a0afd83a173cbc8bae9d6cad12b243e46b0b5c1411d01f87d88e6c7b26f75 +size 23127 diff --git a/SwordNGun/Content/Core/AnimNotifies/AN_CanMove.uasset b/SwordNGun/Content/Core/AnimNotifies/AN_CanMove.uasset new file mode 100644 index 0000000..a09fa2b --- /dev/null +++ b/SwordNGun/Content/Core/AnimNotifies/AN_CanMove.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c9c792fead266c3cb1b92b8e9bc39c8a1387c9bae91e7c254853496bcb27a866 +size 23362 diff --git a/SwordNGun/Content/Maps/Test.umap b/SwordNGun/Content/Maps/Test.umap index 23a2aa2..9be9cde 100644 --- a/SwordNGun/Content/Maps/Test.umap +++ b/SwordNGun/Content/Maps/Test.umap @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:806148830ddd72c56e7fc462d545dd580e373da268f85d0a4bb27f3dd3fd537a +oid sha256:018df65c93d4933b55ca460620bf3b8b8897e5510f6ac627c6e6eedab19af4a5 size 685776 diff --git a/SwordNGun/Content/Maps/Test_BuiltData.uasset b/SwordNGun/Content/Maps/Test_BuiltData.uasset index 451a6bb..a6c4cf1 100644 --- a/SwordNGun/Content/Maps/Test_BuiltData.uasset +++ b/SwordNGun/Content/Maps/Test_BuiltData.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:9288c1a3a6d7a1a05a789aa5b938c90a2dfa1b9cb07dbd0fa66b84fe49869034 +oid sha256:ce540a804ca78ae8e63fc4d688bd8454b7c7da692446d3d04d2ae64e26121b36 size 2330061 diff --git a/SwordNGun/Source/SwordNGun/Private/Characters/SNGCharacterBase.cpp b/SwordNGun/Source/SwordNGun/Private/Characters/SNGCharacterBase.cpp index dc671f8d3b03d1035677635116af209c67ce007a..d658134ea04c1c330890bf481f0c572db98bcc0a 100644 GIT binary patch delta 917 zcma)(OG?8~7=;grsZ|p!Qah+xOA%U%14jjmlww0s5T{Nx)(6J6w9%4t?hEj6&J5ylkYJnY|eG$LdtG2*ToJlaUou+`8}Cw zaqpOi?pTaK8iL6+h+Yq0c zCZ2VzD0#|ssmI5rrtelzajEmN%Xc_huNm!>?0w4=GSXW)Q>Qy7wWiij>EFQf(BYW} z{(bP2ac%FW(D$^1|G*37CRwi;+qs0TLS>OVB#Ty2Jo!Oisk#g$C5~_?d9t);)R_8N q>4lO<$gn!TzqkWo&DAf2QA9n=y4vY+MCEy@9A-V;#^~KxSo#86=)1%K delta 155 zcmZ3NJSk$s5?0|P24{vuhCC>l%#g~EGkGGvC?n_Oi9B~VuVIs8pZtKIhZ~{@BCRMW njKVJz5?4l&XHa0U1!7EN?FHOX^z{m;qwqJ1I&PjJA|?v}t4t)! diff --git a/SwordNGun/Source/SwordNGun/Public/Characters/SNGCharacterBase.h b/SwordNGun/Source/SwordNGun/Public/Characters/SNGCharacterBase.h index a8feaf5af8d51eccb7eb08549b442a78f2ffa9f4..951182bd8390d036eaf3ef7848fe20497e135c8d 100644 GIT binary patch delta 1209 zcmds1!Ab%_82*ZIP4S=|JVh%?xI|{BP@|AED5xNU=vL~g;kwH1YDb|qQRcsh25^>R{;(+=M&T2$;YRbrB)o{Pm2Q+NPGT$PP;|{wvC1vV{ki#X&&$l>ls=2Nh^1~L9rdmRe zqmC|2@vNsGU8o@5w2bES#Bw+}`p0d{Jr)1F?fj;+ z&S8^hFMU7csdRZN(>C~sxDRd7h}Gl|Z_b7>IipNNJY`Jh8#4l^Z%8H@%+18@$fYYR zgodiL>HFYglfsAwxbnX+&WBGUAJwuOPmBG;c5HIJN{AsM))MDmT$`{yrApAp4~h8v EJGjp5_5c6? delta 97 zcmX?Nxj=J66Z>QvP99BXhD3%uhGd3Rh8zYBh9ri3Ak1M