From 97e255047b0268ffaef869de6d64ea298e2f99f4 Mon Sep 17 00:00:00 2001 From: mhampel1 Date: Thu, 28 Sep 2023 03:00:02 +0200 Subject: [PATCH] Merge Weapons into Main (#23) **Content:** - Imported basic shooting animations - Implemented blending of shooting animations with standard - Created enum to track current state (gun, carry or default) - Added functionality to toggle between shooting and walking. - Added Gun 3d Model. Co-authored-by: MarcoHampel Reviewed-on: https://git.nugamestudioclub.com/Station_Obscurum/StationObscurum/pulls/23 --- Content/3DModels/Weapons/LowPolyScifiPistol.uasset | 3 +++ Content/3DModels/Weapons/Material.uasset | 3 +++ Content/3DModels/Weapons/Material_002.uasset | 3 +++ Content/3DModels/Weapons/Material_003.uasset | 3 +++ Content/3DModels/Weapons/Material_004.uasset | 3 +++ Content/3DModels/Weapons/Material_005.uasset | 3 +++ .../AstronautMixamo/Animations/PlayerAnimation.uasset | 4 ++-- .../AstronautMixamo/Animations/PlayerMovement.uasset | 4 ++-- .../AstronautMixamo/Animations/Player_Pistol_Idle.uasset | 3 +++ .../AstronautMixamo/Animations/Player_Pistol_Walk.uasset | 3 +++ Content/Characters/AstronautMixamo/AstronautModel.uasset | 4 ++-- .../Characters/AstronautMixamo/AstronautModel_Skeleton.uasset | 4 ++-- Content/Levels/MainMenu/MainMenu.umap | 2 +- 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 ++-- .../Maps/ThirdPersonMap/4/ZO/10YRBB1ONRG0CH810A68HN.uasset | 3 +++ 18 files changed, 46 insertions(+), 13 deletions(-) create mode 100644 Content/3DModels/Weapons/LowPolyScifiPistol.uasset create mode 100644 Content/3DModels/Weapons/Material.uasset create mode 100644 Content/3DModels/Weapons/Material_002.uasset create mode 100644 Content/3DModels/Weapons/Material_003.uasset create mode 100644 Content/3DModels/Weapons/Material_004.uasset create mode 100644 Content/3DModels/Weapons/Material_005.uasset create mode 100644 Content/Characters/AstronautMixamo/Animations/Player_Pistol_Idle.uasset create mode 100644 Content/Characters/AstronautMixamo/Animations/Player_Pistol_Walk.uasset create mode 100644 Content/Scripting/Enumerations/MovementState.uasset create mode 100644 Content/ThirdPerson/Input/Actions/IA_ToggleGun.uasset create mode 100644 Content/__ExternalActors__/ThirdPerson/Maps/ThirdPersonMap/4/ZO/10YRBB1ONRG0CH810A68HN.uasset diff --git a/Content/3DModels/Weapons/LowPolyScifiPistol.uasset b/Content/3DModels/Weapons/LowPolyScifiPistol.uasset new file mode 100644 index 0000000..fbe07bd --- /dev/null +++ b/Content/3DModels/Weapons/LowPolyScifiPistol.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:6ef33168218d2952de452fae0750bc48911d7a803b9fe6945048a42a99ad78ea +size 109217 diff --git a/Content/3DModels/Weapons/Material.uasset b/Content/3DModels/Weapons/Material.uasset new file mode 100644 index 0000000..76956e1 --- /dev/null +++ b/Content/3DModels/Weapons/Material.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:5b88026e0d61fb53fb2abb98ccc69f6a77e58fada1c3d79d2d6ec5f396a5457f +size 7871 diff --git a/Content/3DModels/Weapons/Material_002.uasset b/Content/3DModels/Weapons/Material_002.uasset new file mode 100644 index 0000000..f06c0ba --- /dev/null +++ b/Content/3DModels/Weapons/Material_002.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e97a74a0c346ba1735d377b4c50a467155050734ff2cb7d0e8389a47345aa7a1 +size 8715 diff --git a/Content/3DModels/Weapons/Material_003.uasset b/Content/3DModels/Weapons/Material_003.uasset new file mode 100644 index 0000000..b1eeb90 --- /dev/null +++ b/Content/3DModels/Weapons/Material_003.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:808de35d435bb200980221b1595c47102a4b013261b124fdc0e351d13507abe1 +size 8035 diff --git a/Content/3DModels/Weapons/Material_004.uasset b/Content/3DModels/Weapons/Material_004.uasset new file mode 100644 index 0000000..5a34413 --- /dev/null +++ b/Content/3DModels/Weapons/Material_004.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b4db2062565063054dfd8d323fdb6627e5402833c76ef4f5b1560fbebed1ed70 +size 7995 diff --git a/Content/3DModels/Weapons/Material_005.uasset b/Content/3DModels/Weapons/Material_005.uasset new file mode 100644 index 0000000..13ef917 --- /dev/null +++ b/Content/3DModels/Weapons/Material_005.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:6bc20270ae66320a2a52d7561cf873509087e7d0ea419a054bc06c31783afba7 +size 7981 diff --git a/Content/Characters/AstronautMixamo/Animations/PlayerAnimation.uasset b/Content/Characters/AstronautMixamo/Animations/PlayerAnimation.uasset index 5571281..c2d1e58 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:440ec8612b776cb152ba65e5272d6350e7a933fff451c88982d173a2a24fc84d +size 114561 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/Characters/AstronautMixamo/Animations/Player_Pistol_Idle.uasset b/Content/Characters/AstronautMixamo/Animations/Player_Pistol_Idle.uasset new file mode 100644 index 0000000..442a9a1 --- /dev/null +++ b/Content/Characters/AstronautMixamo/Animations/Player_Pistol_Idle.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:8edc7bdc183b082f22e672b32f2400671d9dac939eb6b4c49d380f4ad078a020 +size 173882 diff --git a/Content/Characters/AstronautMixamo/Animations/Player_Pistol_Walk.uasset b/Content/Characters/AstronautMixamo/Animations/Player_Pistol_Walk.uasset new file mode 100644 index 0000000..aae9c79 --- /dev/null +++ b/Content/Characters/AstronautMixamo/Animations/Player_Pistol_Walk.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:0fd1c467281fa2303b12e8ec28b374fe963bc16bd36adaa86f69a7bb244e104f +size 146239 diff --git a/Content/Characters/AstronautMixamo/AstronautModel.uasset b/Content/Characters/AstronautMixamo/AstronautModel.uasset index ec33cc8..39e6b89 100644 --- a/Content/Characters/AstronautMixamo/AstronautModel.uasset +++ b/Content/Characters/AstronautMixamo/AstronautModel.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d2238bb12dadd2125cb72996459383d6d8844c7b3f5a1340bb73d39e45a0b69b -size 140054864 +oid sha256:2b67c2e066854e6e844e63ba33d31e946536e991af2e852d808c8f982be6ec76 +size 140054657 diff --git a/Content/Characters/AstronautMixamo/AstronautModel_Skeleton.uasset b/Content/Characters/AstronautMixamo/AstronautModel_Skeleton.uasset index 8dda2f3..88b247a 100644 --- a/Content/Characters/AstronautMixamo/AstronautModel_Skeleton.uasset +++ b/Content/Characters/AstronautMixamo/AstronautModel_Skeleton.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:76b803b2747ded4bc52de159daa469781ae775f7758c5421f25c0222a6279f92 -size 24301 +oid sha256:52077be74b9d796238f5926790c5131fc7a73018647309175d4661c8edef27cc +size 25353 diff --git a/Content/Levels/MainMenu/MainMenu.umap b/Content/Levels/MainMenu/MainMenu.umap index 8c5f11c..db5e32d 100644 --- a/Content/Levels/MainMenu/MainMenu.umap +++ b/Content/Levels/MainMenu/MainMenu.umap @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4ad4d603f63e68c9b006ccbf10eeef4b97a645f470d6fdb954f6f6aac5d5b3de +oid sha256:d02352152ba44172b277ffbcbc21f0aab3460d78ddf2960840aea002d0ef0890 size 77102 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..5860a25 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:fe657a46ab189cc684eeeff724d01507a8c8287b5230a56cd81201734b127b7d +size 106370 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 diff --git a/Content/__ExternalActors__/ThirdPerson/Maps/ThirdPersonMap/4/ZO/10YRBB1ONRG0CH810A68HN.uasset b/Content/__ExternalActors__/ThirdPerson/Maps/ThirdPersonMap/4/ZO/10YRBB1ONRG0CH810A68HN.uasset new file mode 100644 index 0000000..cf58c04 --- /dev/null +++ b/Content/__ExternalActors__/ThirdPerson/Maps/ThirdPersonMap/4/ZO/10YRBB1ONRG0CH810A68HN.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:6e5b091a8c1245cee56bb2dac1dd7784e7234fb8e012fc78aa1a2c51769b8467 +size 4487