From 82b9f3e2f2638fa5e89d4e5668ec5f723dc44015 Mon Sep 17 00:00:00 2001 From: Kevin Poretti Date: Sat, 26 Jun 2021 20:34:29 -0500 Subject: [PATCH] Some gamefeel and implementation loose ends [git-p4: depot-paths = "//depot/main/": change = 104] --- .../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 ++-- .../Melee/Launcher_Attack_Montage.uasset | 4 ++-- .../States/BP_ProtagAirAttack1.uasset | 4 ++-- .../States/BP_ProtagAirAttack2.uasset | 4 ++-- .../BP_ProtagAirFiringWeaponState.uasset | 4 ++-- .../Weapons/Revolver/BP_Revolver.uasset | 4 ++-- .../Private/Characters/SNGCharacterBase.cpp | Bin 9544 -> 9858 bytes .../Private/Weapons/SNGHitscanWeapon.cpp | Bin 7754 -> 7958 bytes .../Private/Weapons/SNGMeleeWeaponBase.cpp | Bin 5430 -> 5668 bytes SwordNGun/Source/SwordNGun/SNGTypes.h | Bin 7456 -> 7908 bytes 13 files changed, 18 insertions(+), 18 deletions(-) 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 34eb292..126face 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:065e16fb2a640d3b5e305220b6164b83934172fa8714863e6f9a78e330d1a215 -size 102597 +oid sha256:d1274ff412d4d07eb1d4888b8774f62b331124c295a789d2cc88c08705f99a5a +size 103142 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 717fd39..f975f39 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:d2a5256959cfb6fd1c4ef779ca288a962d482302d603efe429786b7019f4da76 -size 103822 +oid sha256:e5f671b8ad688aae178b6415a403c299711b686b4755106410a8df513a855aa5 +size 104412 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 5bb0188..f2806b6 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:1949dc1ae6214de605e35368542d9237a162deb15fd35037a45aeffb1018eff3 -size 103082 +oid sha256:4c7a8c610a66775701eb5872c14caeb8a51d2d0da739ffb0f8abf5035afdbbb1 +size 103672 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 426284b..4e8e81a 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:fd55cec9e5a90ac0cdb7a26e05b2940984210c15d12035f51596807c4d4611bd -size 101365 +oid sha256:56874841035a12774b7344c12bd1f3b54ad53c3bc8a19c5e615476b913624522 +size 101950 diff --git a/SwordNGun/Content/Characters/Protagonist/Animations/Melee/Launcher_Attack_Montage.uasset b/SwordNGun/Content/Characters/Protagonist/Animations/Melee/Launcher_Attack_Montage.uasset index e3ab1c6..38ee65b 100644 --- a/SwordNGun/Content/Characters/Protagonist/Animations/Melee/Launcher_Attack_Montage.uasset +++ b/SwordNGun/Content/Characters/Protagonist/Animations/Melee/Launcher_Attack_Montage.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:1d30a10e84c0b76715e432bfe4b30c1d2c040a8000eead16693cb0a81407e880 -size 102340 +oid sha256:41378221c7b0daf2733732405747b20c63b65590f753118e890024a363c351c0 +size 102533 diff --git a/SwordNGun/Content/Characters/Protagonist/States/BP_ProtagAirAttack1.uasset b/SwordNGun/Content/Characters/Protagonist/States/BP_ProtagAirAttack1.uasset index cdeca67..7d327cf 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:32fe896930db89bd8f975491c1c22d39275692f4ab8835f40e49f7f086f23fc9 -size 100040 +oid sha256:4bae6d804cbc203c6600b5f3c246dc0552c73cd0b2211f42ec3879c969b0dca0 +size 114096 diff --git a/SwordNGun/Content/Characters/Protagonist/States/BP_ProtagAirAttack2.uasset b/SwordNGun/Content/Characters/Protagonist/States/BP_ProtagAirAttack2.uasset index 0807e0c..3b24c65 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:2195eebefceb9bc1b287b960b5b11e03640e21fb9bca49e427f4a515a9c33f7c -size 62514 +oid sha256:37a7251caa8b42dbf9dcee544ab5e420cf6d2ce029e695b5fdcd4e45637beead +size 76792 diff --git a/SwordNGun/Content/Characters/Protagonist/States/BP_ProtagAirFiringWeaponState.uasset b/SwordNGun/Content/Characters/Protagonist/States/BP_ProtagAirFiringWeaponState.uasset index f6151e2..053d238 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:d5013a64313bf9c74e4901f84d4309192fd27c47f29765148c3825a5d580e3fc -size 163271 +oid sha256:dd209eb1510d426eac2aa4316b078d137e0141e83711906d7a9094dd03690db1 +size 177250 diff --git a/SwordNGun/Content/Weapons/Revolver/BP_Revolver.uasset b/SwordNGun/Content/Weapons/Revolver/BP_Revolver.uasset index 8b92061..c5f2a8d 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:54c2409ea5fe6c9e0746efc8ab596c63bcfe1fff6e7f2ee70478b73704a3b130 -size 97503 +oid sha256:047a425cf966240900d18ef3d7b5752a0b4a42dfc7a441535a106ef942f12847 +size 97657 diff --git a/SwordNGun/Source/SwordNGun/Private/Characters/SNGCharacterBase.cpp b/SwordNGun/Source/SwordNGun/Private/Characters/SNGCharacterBase.cpp index 9c02c816f29fa282807fff20ef476c4e5ef3eec9..e569b9d47647f49f8b6e481e53cd7c3a2f6256a4 100644 GIT binary patch delta 332 zcmX@%)#STDkFP$HA&o(U!Gj@_p@hMOArVL>GU$Q%#XxpGLji*$5En4y097P|M4VnL2CI4oCkB6@VIDvuYJiZJfs26?2kXC6yX~ksYN@|H%P#a931eJV*(C<+C3thSO zdjxM{5~4-wMjn&Qdo%COow@I=F|l4Ym-bp*)8}3`AjFdwu!}>NHuJHj@&dfqkLlX; z<@zjMWd%cP$Q2bj`iC4UCzS1^`#}B(A6w>gql`fsAL{fDmq@1`CI?z3M_J`Bq=k3m z^m3g#O?m?B2;xyIr)B&zrTDjg5=yoRx%##^R$pgah+>x$&Z!mz9}3S<=7OoSrS^J^ zHMc}3n;&tFm7r^{re{t%juvK5?RGlnvR*l%9VF mdBm0aw<@_Usz2X~Bczdf%X7*!o(e*_u&2uI6HUh(@5`TQqI^^U delta 301 zcmbPccgkji4CCek#wp^g`V9IE3X==P#V1Qi2-Vv#=rSlU6fhJqnja0HrM0Cr6P(6mgTIVB7(K=X2e z7-XUbg9lKw1gI__yGFUznD4NF*!cYkmO=VDEumwT|23Lk)20sROs7VC%)`K-$F<3D;G57-w^8gxA z1B5VVanjgH?zsE|a*`v^K_NiWnZXA4bG~o`chOj1E3s0YXLAZ^v fc5^NNPo~M6gheLb6Y-JYWYA*JhbpcG(-0B>YP?4Y delta 134 zcmZ3YvrTJ56+bgC1J~xwLO+=%f8bA;%q7MX2^3)91VVivRA5MCC;-A7hDsnigCUcl zgrOLS^MPUtU>ZbbFr)%`3@bEi zW^iQ)Vu)w(XYgb2VTfeVVc=!pV&G&5WAFsZh5$)lEV52O^&t!%n+sWgGEOew;Bd!d mA*n3N-)#