From dfc22989645bf18e239b236126432ba8bb73bcef Mon Sep 17 00:00:00 2001 From: Kevin Poretti Date: Sun, 28 Mar 2021 19:08:04 -0500 Subject: [PATCH] Add firing gun aim offset and blendspace to protag anim BP [git-p4: depot-paths = "//depot/main/": change = 48] --- .../Ranged/AimOffsets/Ranged_Idle_AO.uasset | 3 +++ .../Ranged_NonCombat_Idle_AO.uasset | 3 +++ .../Ranged/AimOffsets/Revenant_Idle_AO.uasset | 4 ++-- .../Revenant_NonCombat_Idle_AO.uasset | 4 ++-- .../Ranged/Fire_Var_A_Montage.uasset | 4 ++-- .../Animations/ThirdPerson_AnimBP.uasset | 4 ++-- .../Protagonist/BP_Protagonist.uasset | 4 ++-- .../Mesh/UE4_Mannequin_Skeleton.uasset | 4 ++-- .../Components/SNGStateMachineComponent.cpp | Bin 8524 -> 8782 bytes .../Components/SNGStateMachineComponent.h | Bin 2502 -> 2630 bytes 10 files changed, 18 insertions(+), 12 deletions(-) create mode 100644 SwordNGun/Content/Characters/Protagonist/Animations/Ranged/AimOffsets/Ranged_Idle_AO.uasset create mode 100644 SwordNGun/Content/Characters/Protagonist/Animations/Ranged/AimOffsets/Ranged_NonCombat_Idle_AO.uasset diff --git a/SwordNGun/Content/Characters/Protagonist/Animations/Ranged/AimOffsets/Ranged_Idle_AO.uasset b/SwordNGun/Content/Characters/Protagonist/Animations/Ranged/AimOffsets/Ranged_Idle_AO.uasset new file mode 100644 index 0000000..7de4ad7 --- /dev/null +++ b/SwordNGun/Content/Characters/Protagonist/Animations/Ranged/AimOffsets/Ranged_Idle_AO.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:992c9a0febc885615ba68c2898d5724d1a29060e853fa8a9409ad184a43f619d +size 107661 diff --git a/SwordNGun/Content/Characters/Protagonist/Animations/Ranged/AimOffsets/Ranged_NonCombat_Idle_AO.uasset b/SwordNGun/Content/Characters/Protagonist/Animations/Ranged/AimOffsets/Ranged_NonCombat_Idle_AO.uasset new file mode 100644 index 0000000..39ba920 --- /dev/null +++ b/SwordNGun/Content/Characters/Protagonist/Animations/Ranged/AimOffsets/Ranged_NonCombat_Idle_AO.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:7aec205931ac04c4bc099a50264f41d8c44796da372b57bfb36b8462e56f6939 +size 104991 diff --git a/SwordNGun/Content/Characters/Protagonist/Animations/Ranged/AimOffsets/Revenant_Idle_AO.uasset b/SwordNGun/Content/Characters/Protagonist/Animations/Ranged/AimOffsets/Revenant_Idle_AO.uasset index 397691f..d2a5169 100644 --- a/SwordNGun/Content/Characters/Protagonist/Animations/Ranged/AimOffsets/Revenant_Idle_AO.uasset +++ b/SwordNGun/Content/Characters/Protagonist/Animations/Ranged/AimOffsets/Revenant_Idle_AO.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:5476a5ab007a64bc69106d714fff8717ccfe625e30a3c0eb80c9b59d02e29d53 -size 107894 +oid sha256:8be658826c716b8a536cafdf897f1853f3e17624aa753e153fcb11a2fc798e3c +size 1497 diff --git a/SwordNGun/Content/Characters/Protagonist/Animations/Ranged/AimOffsets/Revenant_NonCombat_Idle_AO.uasset b/SwordNGun/Content/Characters/Protagonist/Animations/Ranged/AimOffsets/Revenant_NonCombat_Idle_AO.uasset index 18145b1..9c8930b 100644 --- a/SwordNGun/Content/Characters/Protagonist/Animations/Ranged/AimOffsets/Revenant_NonCombat_Idle_AO.uasset +++ b/SwordNGun/Content/Characters/Protagonist/Animations/Ranged/AimOffsets/Revenant_NonCombat_Idle_AO.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4f8a418da09f66f40db1b16c4f5833f7ef3c9e6684beea11a148c8c90d79a588 -size 105203 +oid sha256:7998b2de23fef128f5b36d240552a60e192f9b4090803eb9b0cd889a58649b50 +size 1577 diff --git a/SwordNGun/Content/Characters/Protagonist/Animations/Ranged/Fire_Var_A_Montage.uasset b/SwordNGun/Content/Characters/Protagonist/Animations/Ranged/Fire_Var_A_Montage.uasset index 71256ef..2d97e0f 100644 --- a/SwordNGun/Content/Characters/Protagonist/Animations/Ranged/Fire_Var_A_Montage.uasset +++ b/SwordNGun/Content/Characters/Protagonist/Animations/Ranged/Fire_Var_A_Montage.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:94e962051c85a5baebc5a9a47dcae70b61c3a0beab45182281b6796096194fb5 -size 97310 +oid sha256:42dea317dd1a2f7d6c6e0787c10f4183eac25f4edb397b3bd5c12581537470df +size 97312 diff --git a/SwordNGun/Content/Characters/Protagonist/Animations/ThirdPerson_AnimBP.uasset b/SwordNGun/Content/Characters/Protagonist/Animations/ThirdPerson_AnimBP.uasset index 673d21b..cdd5f1e 100644 --- a/SwordNGun/Content/Characters/Protagonist/Animations/ThirdPerson_AnimBP.uasset +++ b/SwordNGun/Content/Characters/Protagonist/Animations/ThirdPerson_AnimBP.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c981eb32d12e2cd4c69fef2a151bafcb0fc422e42a97fa81c37f45c56a2b727f -size 243158 +oid sha256:481006b61edcb8af1de8c238fd879fe6341f943d495ff32808e4ae34f8fddfd5 +size 429734 diff --git a/SwordNGun/Content/Characters/Protagonist/BP_Protagonist.uasset b/SwordNGun/Content/Characters/Protagonist/BP_Protagonist.uasset index 4ce16de..9dee506 100644 --- a/SwordNGun/Content/Characters/Protagonist/BP_Protagonist.uasset +++ b/SwordNGun/Content/Characters/Protagonist/BP_Protagonist.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:58baeaebb003091eaf016db9c7554beccfc63f0e31c14121ece38b238747cf63 -size 115034 +oid sha256:313faca3eaa319d312d1ae364ec5e932c9175fccfd25bfee417bacc88234e00e +size 115372 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 43adcac..2aff237 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:3e3be7638f613e99c79335f8e18a5a16978bbce6efa6d69116c447d03c94ab29 -size 29082 +oid sha256:fbcb78c96f3dfe7a0a1b7987c918d4b1b98f0ef11d676fbf4be742cec4649f35 +size 29108 diff --git a/SwordNGun/Source/SwordNGun/Private/Components/SNGStateMachineComponent.cpp b/SwordNGun/Source/SwordNGun/Private/Components/SNGStateMachineComponent.cpp index 1f7df0a5ca04b0ceeb340a6c12f555bb518b2512..8a56a287636f6c46fe77d8e026b6de9128ea6d93 100644 GIT binary patch delta 88 zcmX@(bk1eN3KmW`20w;GhFpf!$$?^)tnLh{3?-8tr6eck@o_L}Og_&gI$4K{Z}Jsc q31$Tb`^gt&jU}xZ6o7gh8GIRB8RCJge1<%rE^7vb%`;gx%K!i#?-la^ delta 12 UcmX@-a>i-H3YN{QSeM8E04THtp8x;= diff --git a/SwordNGun/Source/SwordNGun/Public/Components/SNGStateMachineComponent.h b/SwordNGun/Source/SwordNGun/Public/Components/SNGStateMachineComponent.h index 54bfe9ebe143e18700aaded4d2a4afe4e009e2c4..86932e609ff0b6bdc5ac18e569a5c3bbf73b687c 100644 GIT binary patch delta 140 zcmX>md`x7+5|(;i1}+9phEN7KAogQ$W(Z;MWbg;FG#H#1au`Y(QW**uiWo8(@)$~h zvWY;k93YtlBvTnQ86djdfa((&a)BZW4DLV@q_PyKs|d&j=?ezpL?BLutJ47LwFc?l JyqHCq6#zOD87%++ delta 12 TcmX>ma!h!`5|+&>tV*l^Arb@+