From 0c67952e4ed6a0b15fa05a2933122c06e1e36b8b Mon Sep 17 00:00:00 2001 From: Kevin Poretti Date: Tue, 22 Jun 2021 19:20:39 -0500 Subject: [PATCH] Implement hitstop [git-p4: depot-paths = "//depot/main/": change = 100] --- .../Animations/Reactions/Hit_React.uasset | 3 +++ .../Reactions/Hit_React_Montage.uasset | 3 +++ .../standing_react_large_gut_Montage.uasset | 4 ++-- .../TestEnemy/States/BP_EnemyHitStun.uasset | 4 ++-- .../Melee/Ground_Attack_1_Montage.uasset | 4 ++-- .../Melee/Ground_Attack_2_Montage.uasset | 4 ++-- .../Melee/Ground_Attack_3_Montage.uasset | 4 ++-- .../Melee/Ground_Attack_4_Montage.uasset | 4 ++-- .../Weapons/Revolver/BP_Revolver.uasset | 4 ++-- .../Private/Characters/SNGCharacterBase.cpp | Bin 8042 -> 9544 bytes .../Private/Weapons/SNGMeleeWeaponBase.cpp | Bin 4970 -> 5430 bytes .../Public/Characters/SNGCharacterBase.h | Bin 4036 -> 4470 bytes SwordNGun/Source/SwordNGun/SNGTypes.h | Bin 7608 -> 7740 bytes 13 files changed, 20 insertions(+), 14 deletions(-) create mode 100644 SwordNGun/Content/Characters/Enemies/TestEnemy/Animations/Reactions/Hit_React.uasset create mode 100644 SwordNGun/Content/Characters/Enemies/TestEnemy/Animations/Reactions/Hit_React_Montage.uasset diff --git a/SwordNGun/Content/Characters/Enemies/TestEnemy/Animations/Reactions/Hit_React.uasset b/SwordNGun/Content/Characters/Enemies/TestEnemy/Animations/Reactions/Hit_React.uasset new file mode 100644 index 0000000..76a0657 --- /dev/null +++ b/SwordNGun/Content/Characters/Enemies/TestEnemy/Animations/Reactions/Hit_React.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:37d86c7c4225f559849cf81d3b38483bd0c58e53c916d250a82de572f601d466 +size 136205 diff --git a/SwordNGun/Content/Characters/Enemies/TestEnemy/Animations/Reactions/Hit_React_Montage.uasset b/SwordNGun/Content/Characters/Enemies/TestEnemy/Animations/Reactions/Hit_React_Montage.uasset new file mode 100644 index 0000000..a5fc8f5 --- /dev/null +++ b/SwordNGun/Content/Characters/Enemies/TestEnemy/Animations/Reactions/Hit_React_Montage.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:3cdf20d0feafd744e2bd8cddbad739a130fdefce9c82bf6171d4da921fb30d72 +size 96891 diff --git a/SwordNGun/Content/Characters/Enemies/TestEnemy/Animations/Reactions/standing_react_large_gut_Montage.uasset b/SwordNGun/Content/Characters/Enemies/TestEnemy/Animations/Reactions/standing_react_large_gut_Montage.uasset index 74dcb8c..29cd5bd 100644 --- a/SwordNGun/Content/Characters/Enemies/TestEnemy/Animations/Reactions/standing_react_large_gut_Montage.uasset +++ b/SwordNGun/Content/Characters/Enemies/TestEnemy/Animations/Reactions/standing_react_large_gut_Montage.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:26f3ece4e786fa9ca301cee88c9fb3b138112297714aa0d6dc1bae0a16a873ea -size 95740 +oid sha256:499a80dce399bb8e5a1527187483abbf5f8925cd1b58330b0602fa527e013eaf +size 96299 diff --git a/SwordNGun/Content/Characters/Enemies/TestEnemy/States/BP_EnemyHitStun.uasset b/SwordNGun/Content/Characters/Enemies/TestEnemy/States/BP_EnemyHitStun.uasset index cc108c7..536e6f5 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:4e74e4830a3377fcb870ff18eb95c0119fece2db4cd719e483f66a19dff1b0d0 -size 166288 +oid sha256:f45b365918d11442369e2f4723ef5e1aa19c38c33f99942fd6aa32b008fd3667 +size 181823 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 0e3d61d..34eb292 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:2b8b9759448a39e0f82bdec21dd667d5754ece943fe30c6b370f81460999508a -size 101842 +oid sha256:065e16fb2a640d3b5e305220b6164b83934172fa8714863e6f9a78e330d1a215 +size 102597 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 24fb5f6..717fd39 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:2aa42e97b4e64bfdeabb35bbccab86f3a63be3fd1fccbd31335fdedd21e660ba -size 102952 +oid sha256:d2a5256959cfb6fd1c4ef779ca288a962d482302d603efe429786b7019f4da76 +size 103822 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 a8f609f..5bb0188 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:f5ebc400353a71a2070e3ec29a26f9485b3fa2c2083a207aa8f3c4eb8ca71470 -size 102001 +oid sha256:1949dc1ae6214de605e35368542d9237a162deb15fd35037a45aeffb1018eff3 +size 103082 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 acd1f02..426284b 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:fb4c930685f5ac955d69026031340baa95645c43832951751b959b0c243b2346 -size 100445 +oid sha256:fd55cec9e5a90ac0cdb7a26e05b2940984210c15d12035f51596807c4d4611bd +size 101365 diff --git a/SwordNGun/Content/Weapons/Revolver/BP_Revolver.uasset b/SwordNGun/Content/Weapons/Revolver/BP_Revolver.uasset index 3960abb..8b92061 100644 --- a/SwordNGun/Content/Weapons/Revolver/BP_Revolver.uasset +++ b/SwordNGun/Content/Weapons/Revolver/BP_Revolver.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:1253c59d90b0713a9eb8e2e14d98e72ea187c5010c9a2bb605e12059fe6271f2 -size 97779 +oid sha256:54c2409ea5fe6c9e0746efc8ab596c63bcfe1fff6e7f2ee70478b73704a3b130 +size 97503 diff --git a/SwordNGun/Source/SwordNGun/Private/Characters/SNGCharacterBase.cpp b/SwordNGun/Source/SwordNGun/Private/Characters/SNGCharacterBase.cpp index 150c8b813c4026e507fb8fda01431c616adac7e7..9c02c816f29fa282807fff20ef476c4e5ef3eec9 100644 GIT binary patch delta 1321 zcmbVM%Sr-K82%!FsaV7u+SaFnJX&aQIo(XBog19Meq_77;Uz4XUb|q0AQZR46^_y5 zbC1m+YdhH>z7}-xIG^kGl=aEWXp!vnf+drN?Y?|2A1Tpbj1QG~nTmD47hYGy=XAO# z)2?wBQolg0s}xFOd7bBV0xyw3P}vH-NW!BQU?#q1VrEGDq0%4V)FN|>U9LR)YV=yp z!?^4esU8xafeRvRFtfxg6)9xxeG^ecWSCScO$F1WA>T*0Q{j54P%=q;bbNv!G_QfJ zoC2jkm-1bfXj-b&`qNurd8vWHZ>hUIAudo4L`M#%cwb#J+s>H&r((uOYv8UBhyPyL zNCx~eBMl3uk2UOHeihxh3%2tc7G+s5L-Lb<2Cmks*okf2{N1CBGfbXG(vgV!;rLpn Scva4TE|!<#6CIJ8jsF5A1LIZz delta 17 ZcmX@%^~!F;9?s2T+!D;2=kQGv0suv02BZK0 diff --git a/SwordNGun/Source/SwordNGun/Private/Weapons/SNGMeleeWeaponBase.cpp b/SwordNGun/Source/SwordNGun/Private/Weapons/SNGMeleeWeaponBase.cpp index 8d4da71c235cbdc8e1d2224ef60960011d4c6c22..e2000114b0a9dbde4d4e83145a2c9b227d443272 100644 GIT binary patch delta 424 zcmaE*woPloGgD`V42DF8A|Os?C}BtivWgk>8G;%77~B~!<(z=(iWyQTOESuDe6~Wc zo|l1(ffESzflvV`R{(@L43$83216#$yka2E2Z||xX%LwKv_pZR97uvx=QHGid6__d z4nqpqegy`Ysg8u);m4o_)b0;7E)T5L5ojUI(FzQ5d7B|xkPbUMWAAwYGxK-cL2U4yA62N(q93@|mC S4AvYl-%p+^Xgqn3&^iEmDNgkO delta 19 bcmdm{^-68Rv&~kFD+DKh6V#jBA+intTha)# diff --git a/SwordNGun/Source/SwordNGun/Public/Characters/SNGCharacterBase.h b/SwordNGun/Source/SwordNGun/Public/Characters/SNGCharacterBase.h index 892d9e51d795647a06bbfa0b77ad23ebf244b860..90f6d877a961128181ee8ef4c95ca45ac5b4aced 100644 GIT binary patch delta 319 zcmX>i|4nIw1^eVzEPjcO3@6G|wG7q_ybN3n09j%M_y7O^ diff --git a/SwordNGun/Source/SwordNGun/SNGTypes.h b/SwordNGun/Source/SwordNGun/SNGTypes.h index 264a0a18dc2e959ae1e4d8b54fc243bd585584e6..67fe810dd85d9fa4b410ba58c446f56a8c2a0acd 100644 GIT binary patch delta 41 xcmdmCy~k$58}>=uJiNgSISly>