From cf535797154c1fbd248218b70fb52708c4b743f9 Mon Sep 17 00:00:00 2001 From: Kevin Poretti Date: Fri, 21 May 2021 20:13:23 -0500 Subject: [PATCH] Implement air hit stun animations [git-p4: depot-paths = "//depot/main/": change = 67] --- .../Reactions/Fighter_Hitstun_air_loop.uasset | 3 +++ .../Fighter_Hitstun_air_start.uasset | 3 +++ .../Reactions/LaunchReaction_End.uasset | 3 +++ .../Reactions/LaunchReaction_Loop.uasset | 3 +++ .../Reactions/LaunchReaction_Start.uasset | 3 +++ .../Animations/TestEnemy_AnimBP.uasset | 4 ++-- .../States/BP_EnemyAirHitStun.uasset | 3 +++ .../TestEnemy/States/BP_EnemyHit.uasset | 4 ++-- .../TestEnemy/States/BP_EnemyHitStun.uasset | 4 ++-- .../TestEnemy/States/BP_EnemyRootState.uasset | 4 ++-- .../Mesh/UE4_Mannequin_Skeleton.uasset | 2 +- .../Private/Characters/SNGCharacterBase.cpp | Bin 7750 -> 7794 bytes SwordNGun/Source/SwordNGun/SNGTypes.h | Bin 6840 -> 6700 bytes 13 files changed, 27 insertions(+), 9 deletions(-) create mode 100644 SwordNGun/Content/Characters/Enemies/TestEnemy/Animations/Reactions/Fighter_Hitstun_air_loop.uasset create mode 100644 SwordNGun/Content/Characters/Enemies/TestEnemy/Animations/Reactions/Fighter_Hitstun_air_start.uasset create mode 100644 SwordNGun/Content/Characters/Enemies/TestEnemy/Animations/Reactions/LaunchReaction_End.uasset create mode 100644 SwordNGun/Content/Characters/Enemies/TestEnemy/Animations/Reactions/LaunchReaction_Loop.uasset create mode 100644 SwordNGun/Content/Characters/Enemies/TestEnemy/Animations/Reactions/LaunchReaction_Start.uasset create mode 100644 SwordNGun/Content/Characters/Enemies/TestEnemy/States/BP_EnemyAirHitStun.uasset diff --git a/SwordNGun/Content/Characters/Enemies/TestEnemy/Animations/Reactions/Fighter_Hitstun_air_loop.uasset b/SwordNGun/Content/Characters/Enemies/TestEnemy/Animations/Reactions/Fighter_Hitstun_air_loop.uasset new file mode 100644 index 0000000..00e69e9 --- /dev/null +++ b/SwordNGun/Content/Characters/Enemies/TestEnemy/Animations/Reactions/Fighter_Hitstun_air_loop.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:326611f06dc1dfc8e956af8dcf18836d4cd218edca9addcfb9d0704d2511f3a1 +size 116432 diff --git a/SwordNGun/Content/Characters/Enemies/TestEnemy/Animations/Reactions/Fighter_Hitstun_air_start.uasset b/SwordNGun/Content/Characters/Enemies/TestEnemy/Animations/Reactions/Fighter_Hitstun_air_start.uasset new file mode 100644 index 0000000..a124601 --- /dev/null +++ b/SwordNGun/Content/Characters/Enemies/TestEnemy/Animations/Reactions/Fighter_Hitstun_air_start.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:05b0b970d32a29891093f3567a672459257e59117bd8dcc7ca85fa20473a5e06 +size 124139 diff --git a/SwordNGun/Content/Characters/Enemies/TestEnemy/Animations/Reactions/LaunchReaction_End.uasset b/SwordNGun/Content/Characters/Enemies/TestEnemy/Animations/Reactions/LaunchReaction_End.uasset new file mode 100644 index 0000000..41c62cb --- /dev/null +++ b/SwordNGun/Content/Characters/Enemies/TestEnemy/Animations/Reactions/LaunchReaction_End.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e2393fed877623530cd763e013e4b797d0cdb9e7de5d28fd1353f2587bdbe27e +size 175689 diff --git a/SwordNGun/Content/Characters/Enemies/TestEnemy/Animations/Reactions/LaunchReaction_Loop.uasset b/SwordNGun/Content/Characters/Enemies/TestEnemy/Animations/Reactions/LaunchReaction_Loop.uasset new file mode 100644 index 0000000..4c2d98c --- /dev/null +++ b/SwordNGun/Content/Characters/Enemies/TestEnemy/Animations/Reactions/LaunchReaction_Loop.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:7ce4323007754c1eb858c2d3139323deeadc288c1fb3c6083b66e4e694ca2c15 +size 103810 diff --git a/SwordNGun/Content/Characters/Enemies/TestEnemy/Animations/Reactions/LaunchReaction_Start.uasset b/SwordNGun/Content/Characters/Enemies/TestEnemy/Animations/Reactions/LaunchReaction_Start.uasset new file mode 100644 index 0000000..fbe89a0 --- /dev/null +++ b/SwordNGun/Content/Characters/Enemies/TestEnemy/Animations/Reactions/LaunchReaction_Start.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:fb5e3eab34036014c6b12fe53cce868ea834463c488054b263c16c9d2f4f521d +size 122065 diff --git a/SwordNGun/Content/Characters/Enemies/TestEnemy/Animations/TestEnemy_AnimBP.uasset b/SwordNGun/Content/Characters/Enemies/TestEnemy/Animations/TestEnemy_AnimBP.uasset index a2aecdb..48df8c4 100644 --- a/SwordNGun/Content/Characters/Enemies/TestEnemy/Animations/TestEnemy_AnimBP.uasset +++ b/SwordNGun/Content/Characters/Enemies/TestEnemy/Animations/TestEnemy_AnimBP.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f4fad69150f33b34604aeb393ddf171edd4c2623bb550c33d2ed59348cd1e1f8 -size 218771 +oid sha256:fd5bad5423e8f79d4672f391be0ccb74510850c111b564528b67e8dec7eb33b1 +size 299410 diff --git a/SwordNGun/Content/Characters/Enemies/TestEnemy/States/BP_EnemyAirHitStun.uasset b/SwordNGun/Content/Characters/Enemies/TestEnemy/States/BP_EnemyAirHitStun.uasset new file mode 100644 index 0000000..1478235 --- /dev/null +++ b/SwordNGun/Content/Characters/Enemies/TestEnemy/States/BP_EnemyAirHitStun.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:3ce7154a4a059f76818107cfa78d6302fb34bb3ea616d17c8243ba5003b82615 +size 51876 diff --git a/SwordNGun/Content/Characters/Enemies/TestEnemy/States/BP_EnemyHit.uasset b/SwordNGun/Content/Characters/Enemies/TestEnemy/States/BP_EnemyHit.uasset index a96619d..7cc6b02 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:522bb322da8d3ef0c341d87706cdab2b1f7af0e22de5c017960c3053127db400 -size 5323 +oid sha256:8858a3e8e83b4cb6357c8abd6b251f2176339cc45320cf3aa8c4f740c802dd5d +size 33733 diff --git a/SwordNGun/Content/Characters/Enemies/TestEnemy/States/BP_EnemyHitStun.uasset b/SwordNGun/Content/Characters/Enemies/TestEnemy/States/BP_EnemyHitStun.uasset index eaa1be2..530911c 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:957f094628b7d369f057ec43d0320f1acfa5c3b8556e4b5dc9a20bfb2ed56c98 -size 76973 +oid sha256:e19d926334b56a934b9db5c75cf937ddf8f4f4b963c65e21834c2231f91597ad +size 59497 diff --git a/SwordNGun/Content/Characters/Enemies/TestEnemy/States/BP_EnemyRootState.uasset b/SwordNGun/Content/Characters/Enemies/TestEnemy/States/BP_EnemyRootState.uasset index 12f7f6d..04c01cd 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:eeb545f70fe0d79541fe30f4e89c27c680899e47996ee0c8d3bf80b88c106386 -size 30712 +oid sha256:8fd837027b5587d04ceb708151001b8344992f0ab95bb3e8ecaca5c4e21f587c +size 60673 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 8c16e62..93a5fc9 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:2a9bf72c3a10d233d3519452142afb076d29bc10e00456371d743f81f02d6fa9 +oid sha256:64276f30844daf093d063d2ca45bf991267b8a8f95a3fe803b96d769ebc546b7 size 30740 diff --git a/SwordNGun/Source/SwordNGun/Private/Characters/SNGCharacterBase.cpp b/SwordNGun/Source/SwordNGun/Private/Characters/SNGCharacterBase.cpp index 1849d4fccf07d1461e59f5194821787d34c9eefc..3deddcf5e0aadf8c3d69a4826c7cef057fba2554 100644 GIT binary patch delta 98 zcmX?R^T}p|hty^^88#+XUIs1(&dI(~nv+YUA|?w-tB89rWHOX6xG*FF$wUSP23sKZ uWvHAiFCjj8i>wg4H3LMCpmaV+{p5F2Jd@W+8%@3^tuc867sq4~IU@jbFc-c6 delta 88 zcmexlbIfLghty;TIgZKiIOQhqk>;3OClfZ=NmfbOg&~n47l_jtQW+E&Y=IbA#F~MZ eforn8Y(7ZslZix