From a0d8c1c414aa812c8323448966cb56482fce41f3 Mon Sep 17 00:00:00 2001 From: mhampel1 Date: Mon, 18 Sep 2023 04:49:22 +0200 Subject: [PATCH] Merge character_dev into main. (#6) **Items:** - Imported the Astronaut 3D model using Mixamo's Auto-skinning tool. - Created a Animation Blend and Animation Blueprint for animating the character. - Imported the Boots and Helmet 3D models. - Modified the 3rd Person Character Blueprint to use the Astronaut Model and Astronaut Animation Blueprint. Co-authored-by: MarcoHampel Reviewed-on: https://git.nugamestudioclub.com/Station_Obscurum/StationObscurum/pulls/6 --- Config/DefaultEditor.ini | 2 ++ Content/Characters/Astronaut/AstronautRetargeter.uasset | 3 --- Content/Characters/Astronaut/AstronautRig.uasset | 3 --- .../Astronaut/Astronaut_with_skeleton_updated_no_feet.uasset | 3 --- ...stronaut_with_skeleton_updated_no_feet_PhysicsAsset.uasset | 3 --- .../Astronaut_with_skeleton_updated_no_feet_Skeleton.uasset | 3 --- Content/Characters/Astronaut/Jute_Matting.uasset | 3 --- Content/Characters/Astronaut/Leather_001.uasset | 3 --- Content/Characters/Astronaut/Metal_001.uasset | 3 --- .../AstronautMixamo/Animations/PlayerAnimation.uasset | 3 +++ .../AstronautMixamo/Animations/PlayerMovement.uasset | 3 +++ Content/Characters/AstronautMixamo/Animations/Running.uasset | 3 +++ Content/Characters/AstronautMixamo/AstronautModel.uasset | 3 +++ Content/Characters/AstronautMixamo/AstronautModel_Anim.uasset | 3 +++ .../AstronautMixamo/AstronautModel_PhysicsAsset.uasset | 3 +++ .../Characters/AstronautMixamo/AstronautModel_Skeleton.uasset | 3 +++ .../AstronautMixamo/SubModels/AstronautShoes.uasset | 3 +++ .../AstronautMixamo/SubModels/Degradable_Metal.uasset | 3 +++ .../AstronautMixamo/SubModels/Fluffy_White_Towel.uasset | 3 +++ .../Characters/AstronautMixamo/SubModels/Helmet_Solo.uasset | 3 +++ Content/Characters/AstronautMixamo/SubModels/Leather.uasset | 3 +++ .../Characters/AstronautMixamo/SubModels/Material_002.uasset | 3 +++ .../Characters/AstronautMixamo/SubModels/Material_003.uasset | 3 +++ .../Characters/AstronautMixamo/SubModels/Material_010.uasset | 3 +++ Content/Characters/AstronautMixamo/SubModels/Metal.uasset | 3 +++ .../Characters/AstronautMixamo/SubModels/helmet_glass.uasset | 3 +++ Content/ThirdPerson/Blueprints/BP_ThirdPersonCharacter.uasset | 4 ++-- .../Maps/ThirdPersonMap/4/OC/3JHRHDU7V1MJQESAE0AYBA.uasset | 3 --- .../Maps/ThirdPersonMap/D/DE/SWSI13675DVYIZ0N4NF7Y3.uasset | 4 ++-- 29 files changed, 57 insertions(+), 31 deletions(-) delete mode 100644 Content/Characters/Astronaut/AstronautRetargeter.uasset delete mode 100644 Content/Characters/Astronaut/AstronautRig.uasset delete mode 100644 Content/Characters/Astronaut/Astronaut_with_skeleton_updated_no_feet.uasset delete mode 100644 Content/Characters/Astronaut/Astronaut_with_skeleton_updated_no_feet_PhysicsAsset.uasset delete mode 100644 Content/Characters/Astronaut/Astronaut_with_skeleton_updated_no_feet_Skeleton.uasset delete mode 100644 Content/Characters/Astronaut/Jute_Matting.uasset delete mode 100644 Content/Characters/Astronaut/Leather_001.uasset delete mode 100644 Content/Characters/Astronaut/Metal_001.uasset create mode 100644 Content/Characters/AstronautMixamo/Animations/PlayerAnimation.uasset create mode 100644 Content/Characters/AstronautMixamo/Animations/PlayerMovement.uasset create mode 100644 Content/Characters/AstronautMixamo/Animations/Running.uasset create mode 100644 Content/Characters/AstronautMixamo/AstronautModel.uasset create mode 100644 Content/Characters/AstronautMixamo/AstronautModel_Anim.uasset create mode 100644 Content/Characters/AstronautMixamo/AstronautModel_PhysicsAsset.uasset create mode 100644 Content/Characters/AstronautMixamo/AstronautModel_Skeleton.uasset create mode 100644 Content/Characters/AstronautMixamo/SubModels/AstronautShoes.uasset create mode 100644 Content/Characters/AstronautMixamo/SubModels/Degradable_Metal.uasset create mode 100644 Content/Characters/AstronautMixamo/SubModels/Fluffy_White_Towel.uasset create mode 100644 Content/Characters/AstronautMixamo/SubModels/Helmet_Solo.uasset create mode 100644 Content/Characters/AstronautMixamo/SubModels/Leather.uasset create mode 100644 Content/Characters/AstronautMixamo/SubModels/Material_002.uasset create mode 100644 Content/Characters/AstronautMixamo/SubModels/Material_003.uasset create mode 100644 Content/Characters/AstronautMixamo/SubModels/Material_010.uasset create mode 100644 Content/Characters/AstronautMixamo/SubModels/Metal.uasset create mode 100644 Content/Characters/AstronautMixamo/SubModels/helmet_glass.uasset delete mode 100644 Content/__ExternalActors__/ThirdPerson/Maps/ThirdPersonMap/4/OC/3JHRHDU7V1MJQESAE0AYBA.uasset diff --git a/Config/DefaultEditor.ini b/Config/DefaultEditor.ini index 79b70b5..197e527 100644 --- a/Config/DefaultEditor.ini +++ b/Config/DefaultEditor.ini @@ -7,3 +7,5 @@ bReplaceBlueprintWithClass= true bDontLoadBlueprintOutsideEditor= true bBlueprintIsNotBlueprintType= true +[/Script/AdvancedPreviewScene.SharedProfiles] + diff --git a/Content/Characters/Astronaut/AstronautRetargeter.uasset b/Content/Characters/Astronaut/AstronautRetargeter.uasset deleted file mode 100644 index 3b2c32e..0000000 --- a/Content/Characters/Astronaut/AstronautRetargeter.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:623fffa17f55f1edb304b93028b4bc63c1dbd1622c45ee2690a1bac9eeac11ab -size 1945 diff --git a/Content/Characters/Astronaut/AstronautRig.uasset b/Content/Characters/Astronaut/AstronautRig.uasset deleted file mode 100644 index ee5c993..0000000 --- a/Content/Characters/Astronaut/AstronautRig.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:3bcf5432c1da64abde3a24e718115ba8a0294419381f7fc9e806a8d5d907a332 -size 77439 diff --git a/Content/Characters/Astronaut/Astronaut_with_skeleton_updated_no_feet.uasset b/Content/Characters/Astronaut/Astronaut_with_skeleton_updated_no_feet.uasset deleted file mode 100644 index 6d4b709..0000000 --- a/Content/Characters/Astronaut/Astronaut_with_skeleton_updated_no_feet.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:e8752bc6fc7ee33d5e9908978ad5915a2625550daabf0ce9cb9d7ab3ed9473ba -size 143512384 diff --git a/Content/Characters/Astronaut/Astronaut_with_skeleton_updated_no_feet_PhysicsAsset.uasset b/Content/Characters/Astronaut/Astronaut_with_skeleton_updated_no_feet_PhysicsAsset.uasset deleted file mode 100644 index 20ee7cc..0000000 --- a/Content/Characters/Astronaut/Astronaut_with_skeleton_updated_no_feet_PhysicsAsset.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:4ae1411496448f3527bfcac11dad68bf4bd3ac48027389b942bce93597d3b36a -size 37947 diff --git a/Content/Characters/Astronaut/Astronaut_with_skeleton_updated_no_feet_Skeleton.uasset b/Content/Characters/Astronaut/Astronaut_with_skeleton_updated_no_feet_Skeleton.uasset deleted file mode 100644 index 7bee6bd..0000000 --- a/Content/Characters/Astronaut/Astronaut_with_skeleton_updated_no_feet_Skeleton.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:3da4c951b1679afcfcb1464fe909e7b902fc75b30595d5a76f77dc4da9709ee8 -size 27215 diff --git a/Content/Characters/Astronaut/Jute_Matting.uasset b/Content/Characters/Astronaut/Jute_Matting.uasset deleted file mode 100644 index dc53455..0000000 --- a/Content/Characters/Astronaut/Jute_Matting.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:5ae8df195e5d894784efbceb61aac9befcda9377f7937cfd8349b3cb722b1c40 -size 9105 diff --git a/Content/Characters/Astronaut/Leather_001.uasset b/Content/Characters/Astronaut/Leather_001.uasset deleted file mode 100644 index afda8c1..0000000 --- a/Content/Characters/Astronaut/Leather_001.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:97e88454d074c1be123c520fcb4b90543eaa2fca91c033af3cf2e32e0c7b87cd -size 9099 diff --git a/Content/Characters/Astronaut/Metal_001.uasset b/Content/Characters/Astronaut/Metal_001.uasset deleted file mode 100644 index 2596391..0000000 --- a/Content/Characters/Astronaut/Metal_001.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:25c25110d897f641d59ad94b9b0f36e193eb0b49e21418c38c33154a16290441 -size 9087 diff --git a/Content/Characters/AstronautMixamo/Animations/PlayerAnimation.uasset b/Content/Characters/AstronautMixamo/Animations/PlayerAnimation.uasset new file mode 100644 index 0000000..5571281 --- /dev/null +++ b/Content/Characters/AstronautMixamo/Animations/PlayerAnimation.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:5d8ea1c09ea879485df332090dcc0a404e196be72e2b1dbc60db280c29feec74 +size 80830 diff --git a/Content/Characters/AstronautMixamo/Animations/PlayerMovement.uasset b/Content/Characters/AstronautMixamo/Animations/PlayerMovement.uasset new file mode 100644 index 0000000..86bc98c --- /dev/null +++ b/Content/Characters/AstronautMixamo/Animations/PlayerMovement.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d7467b660b75c526cef1939e17b7b85157e9c339b8b470c79b12cf40f6c48957 +size 8088 diff --git a/Content/Characters/AstronautMixamo/Animations/Running.uasset b/Content/Characters/AstronautMixamo/Animations/Running.uasset new file mode 100644 index 0000000..d130cc8 --- /dev/null +++ b/Content/Characters/AstronautMixamo/Animations/Running.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b941a53cfa2fb5607f8ba5e452451c4d63201fde31fc289f5dabe467136f2730 +size 177594 diff --git a/Content/Characters/AstronautMixamo/AstronautModel.uasset b/Content/Characters/AstronautMixamo/AstronautModel.uasset new file mode 100644 index 0000000..1c0cb7a --- /dev/null +++ b/Content/Characters/AstronautMixamo/AstronautModel.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:6e80dae710ce6ab383c7d82e6274bc4fff3355e1287d9e69c18029abcbd90172 +size 140054110 diff --git a/Content/Characters/AstronautMixamo/AstronautModel_Anim.uasset b/Content/Characters/AstronautMixamo/AstronautModel_Anim.uasset new file mode 100644 index 0000000..609038d --- /dev/null +++ b/Content/Characters/AstronautMixamo/AstronautModel_Anim.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:5f1dff29125d79c7b2b0e26520d4b53d141134ed913a06d6d1d5b710fb4f2c7c +size 338594 diff --git a/Content/Characters/AstronautMixamo/AstronautModel_PhysicsAsset.uasset b/Content/Characters/AstronautMixamo/AstronautModel_PhysicsAsset.uasset new file mode 100644 index 0000000..48f8f74 --- /dev/null +++ b/Content/Characters/AstronautMixamo/AstronautModel_PhysicsAsset.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:7ed53258f856e949146105b596b5a4c5d6c9dc026350cf09ae8bed859bd2550a +size 33565 diff --git a/Content/Characters/AstronautMixamo/AstronautModel_Skeleton.uasset b/Content/Characters/AstronautMixamo/AstronautModel_Skeleton.uasset new file mode 100644 index 0000000..b039783 --- /dev/null +++ b/Content/Characters/AstronautMixamo/AstronautModel_Skeleton.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:08200db48e7fcd0ca4e0a9a71fd2fb986d2d57606d7e81a7829d6708fb94d079 +size 23689 diff --git a/Content/Characters/AstronautMixamo/SubModels/AstronautShoes.uasset b/Content/Characters/AstronautMixamo/SubModels/AstronautShoes.uasset new file mode 100644 index 0000000..f1a778b --- /dev/null +++ b/Content/Characters/AstronautMixamo/SubModels/AstronautShoes.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:51afcf50ba2db591fee2e09d1e13ae1ff9d71a5f825b759e01cca9f5471fa514 +size 17243031 diff --git a/Content/Characters/AstronautMixamo/SubModels/Degradable_Metal.uasset b/Content/Characters/AstronautMixamo/SubModels/Degradable_Metal.uasset new file mode 100644 index 0000000..096bca3 --- /dev/null +++ b/Content/Characters/AstronautMixamo/SubModels/Degradable_Metal.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:1df19977b7f08bca1b3a3339d89bd64d2341abbc82a91931fcaa252343c3e217 +size 9120 diff --git a/Content/Characters/AstronautMixamo/SubModels/Fluffy_White_Towel.uasset b/Content/Characters/AstronautMixamo/SubModels/Fluffy_White_Towel.uasset new file mode 100644 index 0000000..98aead9 --- /dev/null +++ b/Content/Characters/AstronautMixamo/SubModels/Fluffy_White_Towel.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:2c6dfcf763da532aa5d168f20fdbc3130eb810f7f5b6b3db8a31c9856cb72eb0 +size 9138 diff --git a/Content/Characters/AstronautMixamo/SubModels/Helmet_Solo.uasset b/Content/Characters/AstronautMixamo/SubModels/Helmet_Solo.uasset new file mode 100644 index 0000000..0f238b5 --- /dev/null +++ b/Content/Characters/AstronautMixamo/SubModels/Helmet_Solo.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:6b8efa3451b06869874e96092229802df89ff539409bf0fb734ff5bee95b7efa +size 537856 diff --git a/Content/Characters/AstronautMixamo/SubModels/Leather.uasset b/Content/Characters/AstronautMixamo/SubModels/Leather.uasset new file mode 100644 index 0000000..d48fb45 --- /dev/null +++ b/Content/Characters/AstronautMixamo/SubModels/Leather.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:4a28e215d367652caa9e30c20b5483292c72110fd8320d53da4320e1f3ed6889 +size 9072 diff --git a/Content/Characters/AstronautMixamo/SubModels/Material_002.uasset b/Content/Characters/AstronautMixamo/SubModels/Material_002.uasset new file mode 100644 index 0000000..ead8617 --- /dev/null +++ b/Content/Characters/AstronautMixamo/SubModels/Material_002.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:fc70a85fe75612a166f80f37a47636d67fbf28d455983d53f40a8ecc2cd53bba +size 8136 diff --git a/Content/Characters/AstronautMixamo/SubModels/Material_003.uasset b/Content/Characters/AstronautMixamo/SubModels/Material_003.uasset new file mode 100644 index 0000000..fcb8c13 --- /dev/null +++ b/Content/Characters/AstronautMixamo/SubModels/Material_003.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:14be67a8f044bd771ea790481ebd437059adc46042203f82df07881ab64b476c +size 8136 diff --git a/Content/Characters/AstronautMixamo/SubModels/Material_010.uasset b/Content/Characters/AstronautMixamo/SubModels/Material_010.uasset new file mode 100644 index 0000000..7fcf0a7 --- /dev/null +++ b/Content/Characters/AstronautMixamo/SubModels/Material_010.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:4b1d1a52c7d19eb17f629ab3ffb109580744455d1e9eb4470cf841c5f806c7bb +size 8789 diff --git a/Content/Characters/AstronautMixamo/SubModels/Metal.uasset b/Content/Characters/AstronautMixamo/SubModels/Metal.uasset new file mode 100644 index 0000000..1c80c85 --- /dev/null +++ b/Content/Characters/AstronautMixamo/SubModels/Metal.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:1c2532dffcd47ace33c52d07996a7c36e762ffb7b8bea071051945e772c706c8 +size 9054 diff --git a/Content/Characters/AstronautMixamo/SubModels/helmet_glass.uasset b/Content/Characters/AstronautMixamo/SubModels/helmet_glass.uasset new file mode 100644 index 0000000..d0f575e --- /dev/null +++ b/Content/Characters/AstronautMixamo/SubModels/helmet_glass.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a7572d0afca45fc578f30454ac79aaa714f9df1a4b2bd3efca5694e475775a98 +size 9101 diff --git a/Content/ThirdPerson/Blueprints/BP_ThirdPersonCharacter.uasset b/Content/ThirdPerson/Blueprints/BP_ThirdPersonCharacter.uasset index 5f109c4..70c501c 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:d606427d6a0b1d698d75da0239f6a16a9521819712867b8cbf868082747b3c9a -size 37124 +oid sha256:89e7d68428d067566eee62140116b5f0abe7565908ee00fba5c81ff07b01b8b8 +size 42749 diff --git a/Content/__ExternalActors__/ThirdPerson/Maps/ThirdPersonMap/4/OC/3JHRHDU7V1MJQESAE0AYBA.uasset b/Content/__ExternalActors__/ThirdPerson/Maps/ThirdPersonMap/4/OC/3JHRHDU7V1MJQESAE0AYBA.uasset deleted file mode 100644 index 01cfac3..0000000 --- a/Content/__ExternalActors__/ThirdPerson/Maps/ThirdPersonMap/4/OC/3JHRHDU7V1MJQESAE0AYBA.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:3f98964b64a4318b11f2609333cedfac3ca338fab20d1224c94327fc595dacbb -size 5905 diff --git a/Content/__ExternalActors__/ThirdPerson/Maps/ThirdPersonMap/D/DE/SWSI13675DVYIZ0N4NF7Y3.uasset b/Content/__ExternalActors__/ThirdPerson/Maps/ThirdPersonMap/D/DE/SWSI13675DVYIZ0N4NF7Y3.uasset index 7f8018a..50d8a6a 100644 --- a/Content/__ExternalActors__/ThirdPerson/Maps/ThirdPersonMap/D/DE/SWSI13675DVYIZ0N4NF7Y3.uasset +++ b/Content/__ExternalActors__/ThirdPerson/Maps/ThirdPersonMap/D/DE/SWSI13675DVYIZ0N4NF7Y3.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:155efc55358d86b7b7017b683862030b83481f5dbb4551c9d759694bb112232b -size 4064 +oid sha256:c203e30ed7283642935698f9636d6f0a4c1fe19a08d75b300db64e7a407ec1da +size 4404