From e7fc33342d0cd4e28006aafb45b9ba81c8bebee5 Mon Sep 17 00:00:00 2001 From: Benjamin Black Date: Thu, 12 Jan 2023 12:16:26 -0800 Subject: [PATCH 1/2] Jonny upload Signed-off-by: Benjamin Black --- Gems/character_mps/Assets/Mixamo/Animations/Pistol Recoil.fbx | 3 +++ .../character_mps/Assets/Mixamo/Animations/Run Strafe Left.fbx | 3 +++ .../Assets/Mixamo/Animations/Run Strafe Right.fbx | 3 +++ 3 files changed, 9 insertions(+) create mode 100644 Gems/character_mps/Assets/Mixamo/Animations/Pistol Recoil.fbx create mode 100644 Gems/character_mps/Assets/Mixamo/Animations/Run Strafe Left.fbx create mode 100644 Gems/character_mps/Assets/Mixamo/Animations/Run Strafe Right.fbx diff --git a/Gems/character_mps/Assets/Mixamo/Animations/Pistol Recoil.fbx b/Gems/character_mps/Assets/Mixamo/Animations/Pistol Recoil.fbx new file mode 100644 index 00000000..2da7c189 --- /dev/null +++ b/Gems/character_mps/Assets/Mixamo/Animations/Pistol Recoil.fbx @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e00627424f87892fd17b72f566013f8ce237d487198294702a1d2737642f4b9c +size 404944 diff --git a/Gems/character_mps/Assets/Mixamo/Animations/Run Strafe Left.fbx b/Gems/character_mps/Assets/Mixamo/Animations/Run Strafe Left.fbx new file mode 100644 index 00000000..b777294e --- /dev/null +++ b/Gems/character_mps/Assets/Mixamo/Animations/Run Strafe Left.fbx @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:11444bb93949845e35d5ac14169dfb185bfdc4fae7e0aacc29bfd5d2a136dd94 +size 401584 diff --git a/Gems/character_mps/Assets/Mixamo/Animations/Run Strafe Right.fbx b/Gems/character_mps/Assets/Mixamo/Animations/Run Strafe Right.fbx new file mode 100644 index 00000000..a99b41e4 --- /dev/null +++ b/Gems/character_mps/Assets/Mixamo/Animations/Run Strafe Right.fbx @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a40d4ec565c036ed6a3da8cfbb2d03e239684ad930f08eef942cae0ddd860195 +size 381584 From e7ed28e49b370fc84182801036f042986ea265bc Mon Sep 17 00:00:00 2001 From: Benjamin Black Date: Fri, 13 Jan 2023 11:58:42 -0800 Subject: [PATCH 2/2] Modified Pistol Jump animation. This version there is no windup which should be more easily blended with characters in motion Signed-off-by: Benjamin Black --- Gems/character_mps/Assets/Mixamo/Animations/Pistol Jump 3.fbx | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 Gems/character_mps/Assets/Mixamo/Animations/Pistol Jump 3.fbx diff --git a/Gems/character_mps/Assets/Mixamo/Animations/Pistol Jump 3.fbx b/Gems/character_mps/Assets/Mixamo/Animations/Pistol Jump 3.fbx new file mode 100644 index 00000000..576233d1 --- /dev/null +++ b/Gems/character_mps/Assets/Mixamo/Animations/Pistol Jump 3.fbx @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:773b69a4da12abf0b79a8ee55c016cf7fddc2a8a24bed21567836c43316ad4cb +size 214464