From 2298b536ef1d3c0529ea1c9d054b4ca8f6d08aff Mon Sep 17 00:00:00 2001 From: MarcoHampel Date: Tue, 26 Sep 2023 19:25:27 -0400 Subject: [PATCH] Added state machine for entering and leaving gun mode. --- .../AstronautMixamo/Animations/PlayerAnimation.uasset | 4 ++-- .../AstronautMixamo/Animations/PlayerMovement.uasset | 4 ++-- Content/Scripting/Enumerations/MovementState.uasset | 3 +++ Content/ThirdPerson/Blueprints/BP_ThirdPersonCharacter.uasset | 4 ++-- Content/ThirdPerson/Input/Actions/IA_ToggleGun.uasset | 3 +++ Content/ThirdPerson/Input/IMC_Default.uasset | 4 ++-- 6 files changed, 14 insertions(+), 8 deletions(-) create mode 100644 Content/Scripting/Enumerations/MovementState.uasset create mode 100644 Content/ThirdPerson/Input/Actions/IA_ToggleGun.uasset diff --git a/Content/Characters/AstronautMixamo/Animations/PlayerAnimation.uasset b/Content/Characters/AstronautMixamo/Animations/PlayerAnimation.uasset index 5571281..069001c 100644 --- a/Content/Characters/AstronautMixamo/Animations/PlayerAnimation.uasset +++ b/Content/Characters/AstronautMixamo/Animations/PlayerAnimation.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:5d8ea1c09ea879485df332090dcc0a404e196be72e2b1dbc60db280c29feec74 -size 80830 +oid sha256:b0609f73b4814d5acca47fd5a97a79ba3cf95ee879b75dea1d36bc65f2b8f756 +size 114130 diff --git a/Content/Characters/AstronautMixamo/Animations/PlayerMovement.uasset b/Content/Characters/AstronautMixamo/Animations/PlayerMovement.uasset index 86bc98c..dbaa52c 100644 --- a/Content/Characters/AstronautMixamo/Animations/PlayerMovement.uasset +++ b/Content/Characters/AstronautMixamo/Animations/PlayerMovement.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d7467b660b75c526cef1939e17b7b85157e9c339b8b470c79b12cf40f6c48957 -size 8088 +oid sha256:6898eca9aefb4deeeecd5fa175fde878e7e791d3f3007adc63b2939d99e1bd9c +size 11293 diff --git a/Content/Scripting/Enumerations/MovementState.uasset b/Content/Scripting/Enumerations/MovementState.uasset new file mode 100644 index 0000000..beab2e4 --- /dev/null +++ b/Content/Scripting/Enumerations/MovementState.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:4fdd61b67926b108756f798183c0c7a4be0a60b0b9f6f562387f791c1ea5117c +size 2720 diff --git a/Content/ThirdPerson/Blueprints/BP_ThirdPersonCharacter.uasset b/Content/ThirdPerson/Blueprints/BP_ThirdPersonCharacter.uasset index df5af74..679aff1 100644 --- a/Content/ThirdPerson/Blueprints/BP_ThirdPersonCharacter.uasset +++ b/Content/ThirdPerson/Blueprints/BP_ThirdPersonCharacter.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3fe9551d9036f6bdd26e686a6521f03aa7b240c7891b5a29bed13ff15d77fceb -size 59688 +oid sha256:796906c2f65061ed312a43b59ae2504ee9a4702aa327c423efade675dc7c0ec8 +size 97924 diff --git a/Content/ThirdPerson/Input/Actions/IA_ToggleGun.uasset b/Content/ThirdPerson/Input/Actions/IA_ToggleGun.uasset new file mode 100644 index 0000000..7761796 --- /dev/null +++ b/Content/ThirdPerson/Input/Actions/IA_ToggleGun.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b6f2bcd2fcdd397e016f0823b5feea56fd9e5ab76f0352442903375340770685 +size 1379 diff --git a/Content/ThirdPerson/Input/IMC_Default.uasset b/Content/ThirdPerson/Input/IMC_Default.uasset index 2b0033c..54033f9 100644 --- a/Content/ThirdPerson/Input/IMC_Default.uasset +++ b/Content/ThirdPerson/Input/IMC_Default.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:658cd92edd5950a4c65ab878682bde4ee787adf1b0d1c3d529fc9f43bcfe0830 -size 12793 +oid sha256:4446ce45acb5c2cfd0c563c7b42558d182118b10a32875b560c9545e412cd842 +size 15626