From 5a357ada998608a541397b1048738b22e4e61ca3 Mon Sep 17 00:00:00 2001 From: MarcoHampel Date: Sun, 17 Sep 2023 17:31:27 -0400 Subject: [PATCH 1/4] Imported animations into astronaut in Unreal. Some animations are integrated with the player model. The player model has been added to the scene and is playable. Not all animations work and some slight changes need to be made. --- Config/DefaultEditor.ini | 2 ++ .../Characters/Astronaut/Animations/AstronautMovement.uasset | 3 +++ .../Characters/Astronaut/Animations/Idle/PlayerIdle.uasset | 3 +++ .../Astronaut/Animations/Idle/PlayerPistolIdle.uasset | 3 +++ .../Astronaut/Animations/Idle/X_Bot_Pistol_Idle_Up.uasset | 3 +++ .../Astronaut/Animations/PlayerAnimationBlueprint.uasset | 3 +++ .../Astronaut/Animations/Running/PlayerPistol.uasset | 3 +++ .../Animations/Running/PlayerRunning_Anim_Take_001.uasset | 3 +++ .../Animations/Running/PlayerRunning_Anim_mixamo_com.uasset | 3 +++ .../Astronaut/Astronaut_with_skeleton_updated_no_feet.uasset | 4 ++-- .../Astronaut_with_skeleton_updated_no_feet_Skeleton.uasset | 4 ++-- .../Characters/Astronaut/SubModels/Degradable_Metal.uasset | 3 +++ Content/Characters/Astronaut/SubModels/Helmet_Solo.uasset | 3 +++ Content/Characters/Astronaut/SubModels/Material_010.uasset | 3 +++ Content/Characters/Astronaut/SubModels/Metal.uasset | 3 +++ Content/Characters/Astronaut/SubModels/helmet_glass.uasset | 3 +++ Content/ThirdPerson/Blueprints/BP_ThirdPersonCharacter.uasset | 4 ++-- .../Maps/ThirdPersonMap/4/OC/3JHRHDU7V1MJQESAE0AYBA.uasset | 3 --- .../Maps/ThirdPersonMap/B/GO/GSZS9U51PZF6MFXLDD4EIV.uasset | 3 +++ .../Maps/ThirdPersonMap/D/DE/SWSI13675DVYIZ0N4NF7Y3.uasset | 4 ++-- 20 files changed, 52 insertions(+), 11 deletions(-) create mode 100644 Content/Characters/Astronaut/Animations/AstronautMovement.uasset create mode 100644 Content/Characters/Astronaut/Animations/Idle/PlayerIdle.uasset create mode 100644 Content/Characters/Astronaut/Animations/Idle/PlayerPistolIdle.uasset create mode 100644 Content/Characters/Astronaut/Animations/Idle/X_Bot_Pistol_Idle_Up.uasset create mode 100644 Content/Characters/Astronaut/Animations/PlayerAnimationBlueprint.uasset create mode 100644 Content/Characters/Astronaut/Animations/Running/PlayerPistol.uasset create mode 100644 Content/Characters/Astronaut/Animations/Running/PlayerRunning_Anim_Take_001.uasset create mode 100644 Content/Characters/Astronaut/Animations/Running/PlayerRunning_Anim_mixamo_com.uasset create mode 100644 Content/Characters/Astronaut/SubModels/Degradable_Metal.uasset create mode 100644 Content/Characters/Astronaut/SubModels/Helmet_Solo.uasset create mode 100644 Content/Characters/Astronaut/SubModels/Material_010.uasset create mode 100644 Content/Characters/Astronaut/SubModels/Metal.uasset create mode 100644 Content/Characters/Astronaut/SubModels/helmet_glass.uasset delete mode 100644 Content/__ExternalActors__/ThirdPerson/Maps/ThirdPersonMap/4/OC/3JHRHDU7V1MJQESAE0AYBA.uasset create mode 100644 Content/__ExternalActors__/ThirdPerson/Maps/ThirdPersonMap/B/GO/GSZS9U51PZF6MFXLDD4EIV.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/Animations/AstronautMovement.uasset b/Content/Characters/Astronaut/Animations/AstronautMovement.uasset new file mode 100644 index 0000000..6bd79fc --- /dev/null +++ b/Content/Characters/Astronaut/Animations/AstronautMovement.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:126526c996c7c4eae6ea3789bbdb303b90ce5e8dba4202232f31517cd513da9e +size 8015 diff --git a/Content/Characters/Astronaut/Animations/Idle/PlayerIdle.uasset b/Content/Characters/Astronaut/Animations/Idle/PlayerIdle.uasset new file mode 100644 index 0000000..9b14355 --- /dev/null +++ b/Content/Characters/Astronaut/Animations/Idle/PlayerIdle.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a1a1cb06051cfcf9f15d0245ae8f6f853fe051e827402b07f1d3ff51f0f23977 +size 337208 diff --git a/Content/Characters/Astronaut/Animations/Idle/PlayerPistolIdle.uasset b/Content/Characters/Astronaut/Animations/Idle/PlayerPistolIdle.uasset new file mode 100644 index 0000000..a25b018 --- /dev/null +++ b/Content/Characters/Astronaut/Animations/Idle/PlayerPistolIdle.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c1de63458352107ce087e3b3e188ea025d47bfc632a5eab8d5183094932124d4 +size 166969 diff --git a/Content/Characters/Astronaut/Animations/Idle/X_Bot_Pistol_Idle_Up.uasset b/Content/Characters/Astronaut/Animations/Idle/X_Bot_Pistol_Idle_Up.uasset new file mode 100644 index 0000000..6b8763b --- /dev/null +++ b/Content/Characters/Astronaut/Animations/Idle/X_Bot_Pistol_Idle_Up.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b496e5d4a511202c0fbbc906291c4418bce2df967c0fafb6b341ef1b586d55d0 +size 176191 diff --git a/Content/Characters/Astronaut/Animations/PlayerAnimationBlueprint.uasset b/Content/Characters/Astronaut/Animations/PlayerAnimationBlueprint.uasset new file mode 100644 index 0000000..b513898 --- /dev/null +++ b/Content/Characters/Astronaut/Animations/PlayerAnimationBlueprint.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:7396c9b9952fb4416005e27ac9b7430c36fab223bfc46674c42a8e956d18b178 +size 82922 diff --git a/Content/Characters/Astronaut/Animations/Running/PlayerPistol.uasset b/Content/Characters/Astronaut/Animations/Running/PlayerPistol.uasset new file mode 100644 index 0000000..1acb981 --- /dev/null +++ b/Content/Characters/Astronaut/Animations/Running/PlayerPistol.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:90b12b2323341a44c3605d6f612e5fcf3997988636b8a8fb9156cf8b690d8b2a +size 163862 diff --git a/Content/Characters/Astronaut/Animations/Running/PlayerRunning_Anim_Take_001.uasset b/Content/Characters/Astronaut/Animations/Running/PlayerRunning_Anim_Take_001.uasset new file mode 100644 index 0000000..4020d32 --- /dev/null +++ b/Content/Characters/Astronaut/Animations/Running/PlayerRunning_Anim_Take_001.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:417cf003e249a285c31e76f828e8f2698836f30a03aeef955eaf3309a2ec7536 +size 98600 diff --git a/Content/Characters/Astronaut/Animations/Running/PlayerRunning_Anim_mixamo_com.uasset b/Content/Characters/Astronaut/Animations/Running/PlayerRunning_Anim_mixamo_com.uasset new file mode 100644 index 0000000..0806895 --- /dev/null +++ b/Content/Characters/Astronaut/Animations/Running/PlayerRunning_Anim_mixamo_com.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b6ee2b7cfa6334452321c3dbb9d5b39d4ca11c8313f2ebd5a4e0d2d5577a8e1d +size 203460 diff --git a/Content/Characters/Astronaut/Astronaut_with_skeleton_updated_no_feet.uasset b/Content/Characters/Astronaut/Astronaut_with_skeleton_updated_no_feet.uasset index 6d4b709..9ea1d94 100644 --- a/Content/Characters/Astronaut/Astronaut_with_skeleton_updated_no_feet.uasset +++ b/Content/Characters/Astronaut/Astronaut_with_skeleton_updated_no_feet.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e8752bc6fc7ee33d5e9908978ad5915a2625550daabf0ce9cb9d7ab3ed9473ba -size 143512384 +oid sha256:ccd28b2c7af0e3ded93f8781da48e0257fbe238130de675b23c5c02f586b3e06 +size 143512404 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 index 7bee6bd..8c168f5 100644 --- a/Content/Characters/Astronaut/Astronaut_with_skeleton_updated_no_feet_Skeleton.uasset +++ b/Content/Characters/Astronaut/Astronaut_with_skeleton_updated_no_feet_Skeleton.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3da4c951b1679afcfcb1464fe909e7b902fc75b30595d5a76f77dc4da9709ee8 -size 27215 +oid sha256:007c016a7cb36fb0c27617497db8d341a65c85edf12d841bc95ee312823a13f5 +size 37420 diff --git a/Content/Characters/Astronaut/SubModels/Degradable_Metal.uasset b/Content/Characters/Astronaut/SubModels/Degradable_Metal.uasset new file mode 100644 index 0000000..d543718 --- /dev/null +++ b/Content/Characters/Astronaut/SubModels/Degradable_Metal.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c2d088a0a43b781ba7977510effc4b10befdd105b6b3212aaa34962a1352796e +size 9075 diff --git a/Content/Characters/Astronaut/SubModels/Helmet_Solo.uasset b/Content/Characters/Astronaut/SubModels/Helmet_Solo.uasset new file mode 100644 index 0000000..5256e12 --- /dev/null +++ b/Content/Characters/Astronaut/SubModels/Helmet_Solo.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f40cc7c09703b632c0103eec8f3cfb318f8fbb619f35ec99c89ad599a6d23fce +size 537820 diff --git a/Content/Characters/Astronaut/SubModels/Material_010.uasset b/Content/Characters/Astronaut/SubModels/Material_010.uasset new file mode 100644 index 0000000..aa19c1b --- /dev/null +++ b/Content/Characters/Astronaut/SubModels/Material_010.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:038a790a9693dd96f195e73abea792ca2df9b74e45411bc1c636f2b6ba1e86c3 +size 8744 diff --git a/Content/Characters/Astronaut/SubModels/Metal.uasset b/Content/Characters/Astronaut/SubModels/Metal.uasset new file mode 100644 index 0000000..0c0ccc3 --- /dev/null +++ b/Content/Characters/Astronaut/SubModels/Metal.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:82c937ed26d6e6711469d5cbf3e4e4c1298f1e2b4654fb6d5ea7ea6c4142e228 +size 9009 diff --git a/Content/Characters/Astronaut/SubModels/helmet_glass.uasset b/Content/Characters/Astronaut/SubModels/helmet_glass.uasset new file mode 100644 index 0000000..50ef641 --- /dev/null +++ b/Content/Characters/Astronaut/SubModels/helmet_glass.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:2588abeefbc71b66068aa5c07954a85e1e9d1c20e088b8c64b8cdd9135bf0c2e +size 9056 diff --git a/Content/ThirdPerson/Blueprints/BP_ThirdPersonCharacter.uasset b/Content/ThirdPerson/Blueprints/BP_ThirdPersonCharacter.uasset index 5f109c4..bb6db95 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:61766d6e8321ab56a1ee00aa5856d49fb5b3c01f7c6ad7b496a4ba5adb0db5be +size 39409 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/B/GO/GSZS9U51PZF6MFXLDD4EIV.uasset b/Content/__ExternalActors__/ThirdPerson/Maps/ThirdPersonMap/B/GO/GSZS9U51PZF6MFXLDD4EIV.uasset new file mode 100644 index 0000000..7c0255f --- /dev/null +++ b/Content/__ExternalActors__/ThirdPerson/Maps/ThirdPersonMap/B/GO/GSZS9U51PZF6MFXLDD4EIV.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:44cb6086582ad2ccf0b58c38cb6edbeeec36aadf690aa417beef17984ca84ee4 +size 3872 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 From 630f2e1d5b7d3fa3b5ef6a453df7ba88ae1e69de Mon Sep 17 00:00:00 2001 From: MarcoHampel Date: Sun, 17 Sep 2023 21:39:53 -0400 Subject: [PATCH 2/4] Working Animation integration. WIP. - Working animation system integrated with player movement - Fixing poor weights with a newly reskinned model. --- .../Characters/Astronaut/Animations/AstronautMovement.uasset | 4 ++-- .../Characters/Astronaut/Animations/Idle/PlayerIdle.uasset | 4 ++-- .../Astronaut/Animations/PlayerAnimationBlueprint.uasset | 4 ++-- .../Astronaut/Animations/Running/PlayerPistol.uasset | 3 --- .../Astronaut/Animations/Running/PlayerRunning.uasset | 3 +++ .../Animations/Running/PlayerRunning_Anim_Take_001.uasset | 3 --- .../Animations/Running/PlayerRunning_Anim_mixamo_com.uasset | 3 --- .../Astronaut/Astronaut_with_skeleton_updated_no_feet.uasset | 4 ++-- .../Astronaut_with_skeleton_updated_no_feet_Skeleton.uasset | 4 ++-- Content/Characters/Astronaut/SubModels/AstronautShoes.uasset | 3 +++ .../Characters/Astronaut/SubModels/Fluffy_White_Towel.uasset | 3 +++ Content/Characters/Astronaut/SubModels/Leather.uasset | 3 +++ Content/Characters/Astronaut/SubModels/Material_002.uasset | 3 +++ Content/Characters/Astronaut/SubModels/Material_003.uasset | 3 +++ .../AstronautMixamo/Animations/PlayerMovement2.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 +++ Content/ThirdPerson/Blueprints/BP_ThirdPersonCharacter.uasset | 4 ++-- .../Maps/ThirdPersonMap/B/GO/GSZS9U51PZF6MFXLDD4EIV.uasset | 3 --- 22 files changed, 48 insertions(+), 24 deletions(-) delete mode 100644 Content/Characters/Astronaut/Animations/Running/PlayerPistol.uasset create mode 100644 Content/Characters/Astronaut/Animations/Running/PlayerRunning.uasset delete mode 100644 Content/Characters/Astronaut/Animations/Running/PlayerRunning_Anim_Take_001.uasset delete mode 100644 Content/Characters/Astronaut/Animations/Running/PlayerRunning_Anim_mixamo_com.uasset create mode 100644 Content/Characters/Astronaut/SubModels/AstronautShoes.uasset create mode 100644 Content/Characters/Astronaut/SubModels/Fluffy_White_Towel.uasset create mode 100644 Content/Characters/Astronaut/SubModels/Leather.uasset create mode 100644 Content/Characters/Astronaut/SubModels/Material_002.uasset create mode 100644 Content/Characters/Astronaut/SubModels/Material_003.uasset create mode 100644 Content/Characters/AstronautMixamo/Animations/PlayerMovement2.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 delete mode 100644 Content/__ExternalActors__/ThirdPerson/Maps/ThirdPersonMap/B/GO/GSZS9U51PZF6MFXLDD4EIV.uasset diff --git a/Content/Characters/Astronaut/Animations/AstronautMovement.uasset b/Content/Characters/Astronaut/Animations/AstronautMovement.uasset index 6bd79fc..125b255 100644 --- a/Content/Characters/Astronaut/Animations/AstronautMovement.uasset +++ b/Content/Characters/Astronaut/Animations/AstronautMovement.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:126526c996c7c4eae6ea3789bbdb303b90ce5e8dba4202232f31517cd513da9e -size 8015 +oid sha256:dbede40a6637ed6fdd6331c1863e2b67874e339971fb0dce0f205cd1aa61a1a7 +size 7966 diff --git a/Content/Characters/Astronaut/Animations/Idle/PlayerIdle.uasset b/Content/Characters/Astronaut/Animations/Idle/PlayerIdle.uasset index 9b14355..773c1ce 100644 --- a/Content/Characters/Astronaut/Animations/Idle/PlayerIdle.uasset +++ b/Content/Characters/Astronaut/Animations/Idle/PlayerIdle.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a1a1cb06051cfcf9f15d0245ae8f6f853fe051e827402b07f1d3ff51f0f23977 -size 337208 +oid sha256:1a8270f136035eee63f77bef1dcc1b42b3bf918ad4fcca1f8c5129d08fe06d2c +size 337021 diff --git a/Content/Characters/Astronaut/Animations/PlayerAnimationBlueprint.uasset b/Content/Characters/Astronaut/Animations/PlayerAnimationBlueprint.uasset index b513898..fdc0414 100644 --- a/Content/Characters/Astronaut/Animations/PlayerAnimationBlueprint.uasset +++ b/Content/Characters/Astronaut/Animations/PlayerAnimationBlueprint.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:7396c9b9952fb4416005e27ac9b7430c36fab223bfc46674c42a8e956d18b178 -size 82922 +oid sha256:b42f5e79092dc17a6db630a2a83743b9c680cad28c2fc3b7a670a84a1f45a5c9 +size 81070 diff --git a/Content/Characters/Astronaut/Animations/Running/PlayerPistol.uasset b/Content/Characters/Astronaut/Animations/Running/PlayerPistol.uasset deleted file mode 100644 index 1acb981..0000000 --- a/Content/Characters/Astronaut/Animations/Running/PlayerPistol.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:90b12b2323341a44c3605d6f612e5fcf3997988636b8a8fb9156cf8b690d8b2a -size 163862 diff --git a/Content/Characters/Astronaut/Animations/Running/PlayerRunning.uasset b/Content/Characters/Astronaut/Animations/Running/PlayerRunning.uasset new file mode 100644 index 0000000..c5ef562 --- /dev/null +++ b/Content/Characters/Astronaut/Animations/Running/PlayerRunning.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:4bd73e5e8d274edd8bc03469b78ee4855af41b46a68cddada988ca2b42913236 +size 175966 diff --git a/Content/Characters/Astronaut/Animations/Running/PlayerRunning_Anim_Take_001.uasset b/Content/Characters/Astronaut/Animations/Running/PlayerRunning_Anim_Take_001.uasset deleted file mode 100644 index 4020d32..0000000 --- a/Content/Characters/Astronaut/Animations/Running/PlayerRunning_Anim_Take_001.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:417cf003e249a285c31e76f828e8f2698836f30a03aeef955eaf3309a2ec7536 -size 98600 diff --git a/Content/Characters/Astronaut/Animations/Running/PlayerRunning_Anim_mixamo_com.uasset b/Content/Characters/Astronaut/Animations/Running/PlayerRunning_Anim_mixamo_com.uasset deleted file mode 100644 index 0806895..0000000 --- a/Content/Characters/Astronaut/Animations/Running/PlayerRunning_Anim_mixamo_com.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:b6ee2b7cfa6334452321c3dbb9d5b39d4ca11c8313f2ebd5a4e0d2d5577a8e1d -size 203460 diff --git a/Content/Characters/Astronaut/Astronaut_with_skeleton_updated_no_feet.uasset b/Content/Characters/Astronaut/Astronaut_with_skeleton_updated_no_feet.uasset index 9ea1d94..4ff45ab 100644 --- a/Content/Characters/Astronaut/Astronaut_with_skeleton_updated_no_feet.uasset +++ b/Content/Characters/Astronaut/Astronaut_with_skeleton_updated_no_feet.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ccd28b2c7af0e3ded93f8781da48e0257fbe238130de675b23c5c02f586b3e06 -size 143512404 +oid sha256:70db59fb02c5887e90be66c7fbc6dbca977462611906064e1c80e2716a40c134 +size 143512408 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 index 8c168f5..069899d 100644 --- a/Content/Characters/Astronaut/Astronaut_with_skeleton_updated_no_feet_Skeleton.uasset +++ b/Content/Characters/Astronaut/Astronaut_with_skeleton_updated_no_feet_Skeleton.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:007c016a7cb36fb0c27617497db8d341a65c85edf12d841bc95ee312823a13f5 -size 37420 +oid sha256:0b0f09cfaeb469a38efa777ba94686305e4d7de88e7c2345c8407e8fb059ebdf +size 38158 diff --git a/Content/Characters/Astronaut/SubModels/AstronautShoes.uasset b/Content/Characters/Astronaut/SubModels/AstronautShoes.uasset new file mode 100644 index 0000000..096c663 --- /dev/null +++ b/Content/Characters/Astronaut/SubModels/AstronautShoes.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:70af41a0314a2ce655ac18209a56cde397611acc0fe0ca03439f40b3243c4d8f +size 17242989 diff --git a/Content/Characters/Astronaut/SubModels/Fluffy_White_Towel.uasset b/Content/Characters/Astronaut/SubModels/Fluffy_White_Towel.uasset new file mode 100644 index 0000000..4017e5c --- /dev/null +++ b/Content/Characters/Astronaut/SubModels/Fluffy_White_Towel.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a79c0ea1f0a7c8c877a5c6d310f79be2959126ad79a20e865fe5abad310ff1b0 +size 9093 diff --git a/Content/Characters/Astronaut/SubModels/Leather.uasset b/Content/Characters/Astronaut/SubModels/Leather.uasset new file mode 100644 index 0000000..a1bf2c1 --- /dev/null +++ b/Content/Characters/Astronaut/SubModels/Leather.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:2e596191951f917435bf3a280002e67b787b8e1de034f267873c317b168509bb +size 9027 diff --git a/Content/Characters/Astronaut/SubModels/Material_002.uasset b/Content/Characters/Astronaut/SubModels/Material_002.uasset new file mode 100644 index 0000000..709aa8f --- /dev/null +++ b/Content/Characters/Astronaut/SubModels/Material_002.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ba13b1594571990315ee1d2bdab304e2ffc4280e2bf7d2ada8eb2b3b773f471d +size 8091 diff --git a/Content/Characters/Astronaut/SubModels/Material_003.uasset b/Content/Characters/Astronaut/SubModels/Material_003.uasset new file mode 100644 index 0000000..e2c699a --- /dev/null +++ b/Content/Characters/Astronaut/SubModels/Material_003.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:4c167e16faa2f951a84e549f510e88cfcb75396ed23b44162af75427c2f9a1db +size 8091 diff --git a/Content/Characters/AstronautMixamo/Animations/PlayerMovement2.uasset b/Content/Characters/AstronautMixamo/Animations/PlayerMovement2.uasset new file mode 100644 index 0000000..7401a43 --- /dev/null +++ b/Content/Characters/AstronautMixamo/Animations/PlayerMovement2.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:045f11abce600ae5e9c562b867a24710c0e54c012fbedbbdd338f36895e6323a +size 9192 diff --git a/Content/Characters/AstronautMixamo/Animations/Running.uasset b/Content/Characters/AstronautMixamo/Animations/Running.uasset new file mode 100644 index 0000000..768b8e2 --- /dev/null +++ b/Content/Characters/AstronautMixamo/Animations/Running.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:7bbc1fdeca47a7ced9bfa10da3e5931a1d2eff829d929cebcb754507d2b5f09d +size 177594 diff --git a/Content/Characters/AstronautMixamo/AstronautModel.uasset b/Content/Characters/AstronautMixamo/AstronautModel.uasset new file mode 100644 index 0000000..19f7bc7 --- /dev/null +++ b/Content/Characters/AstronautMixamo/AstronautModel.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:33314fecffadeca31e66a2f2a60cac9e1eb3086310d14874a52d18dec7f4a894 +size 140054110 diff --git a/Content/Characters/AstronautMixamo/AstronautModel_Anim.uasset b/Content/Characters/AstronautMixamo/AstronautModel_Anim.uasset new file mode 100644 index 0000000..0338955 --- /dev/null +++ b/Content/Characters/AstronautMixamo/AstronautModel_Anim.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:cfcd54b615c76a21e252c1de2d0b0ff82b26c41aa76c81fa17c7b58df80c79e1 +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..95232e1 --- /dev/null +++ b/Content/Characters/AstronautMixamo/AstronautModel_Skeleton.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:2530df22fe51f1bde9ae8f4e140bec5902ecaf55d1038e7d98ad739eff5f1f67 +size 23677 diff --git a/Content/ThirdPerson/Blueprints/BP_ThirdPersonCharacter.uasset b/Content/ThirdPerson/Blueprints/BP_ThirdPersonCharacter.uasset index bb6db95..2b8bade 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:61766d6e8321ab56a1ee00aa5856d49fb5b3c01f7c6ad7b496a4ba5adb0db5be -size 39409 +oid sha256:771d9e600a1f4a1b8bfaa82136e444110f28af07fe75bc0ad1364fb39fd2b250 +size 43410 diff --git a/Content/__ExternalActors__/ThirdPerson/Maps/ThirdPersonMap/B/GO/GSZS9U51PZF6MFXLDD4EIV.uasset b/Content/__ExternalActors__/ThirdPerson/Maps/ThirdPersonMap/B/GO/GSZS9U51PZF6MFXLDD4EIV.uasset deleted file mode 100644 index 7c0255f..0000000 --- a/Content/__ExternalActors__/ThirdPerson/Maps/ThirdPersonMap/B/GO/GSZS9U51PZF6MFXLDD4EIV.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:44cb6086582ad2ccf0b58c38cb6edbeeec36aadf690aa417beef17984ca84ee4 -size 3872 From 34ffb3e64daf84dc5953aeee0eec7ae7c12d8c62 Mon Sep 17 00:00:00 2001 From: MarcoHampel Date: Sun, 17 Sep 2023 22:10:41 -0400 Subject: [PATCH 3/4] Finished base line Animation System for Astronaut. - Usable player that can run with a working camera is complete. --- .../Characters/Astronaut/Animations/AstronautMovement.uasset | 3 --- .../Characters/Astronaut/Animations/Idle/PlayerIdle.uasset | 3 --- .../Astronaut/Animations/Idle/PlayerPistolIdle.uasset | 3 --- .../Astronaut/Animations/Idle/X_Bot_Pistol_Idle_Up.uasset | 3 --- .../Astronaut/Animations/PlayerAnimationBlueprint.uasset | 3 --- .../Astronaut/Animations/Running/PlayerRunning.uasset | 3 --- .../AstronautMixamo/Animations/PlayerAnimation.uasset | 3 +++ .../AstronautMixamo/Animations/PlayerMovement.uasset | 3 +++ .../AstronautMixamo/Animations/PlayerMovement2.uasset | 3 --- Content/Characters/AstronautMixamo/Animations/Running.uasset | 2 +- Content/Characters/AstronautMixamo/AstronautModel.uasset | 2 +- Content/Characters/AstronautMixamo/AstronautModel_Anim.uasset | 2 +- .../Characters/AstronautMixamo/AstronautModel_Skeleton.uasset | 2 +- Content/ThirdPerson/Blueprints/BP_ThirdPersonCharacter.uasset | 4 ++-- 14 files changed, 12 insertions(+), 27 deletions(-) delete mode 100644 Content/Characters/Astronaut/Animations/AstronautMovement.uasset delete mode 100644 Content/Characters/Astronaut/Animations/Idle/PlayerIdle.uasset delete mode 100644 Content/Characters/Astronaut/Animations/Idle/PlayerPistolIdle.uasset delete mode 100644 Content/Characters/Astronaut/Animations/Idle/X_Bot_Pistol_Idle_Up.uasset delete mode 100644 Content/Characters/Astronaut/Animations/PlayerAnimationBlueprint.uasset delete mode 100644 Content/Characters/Astronaut/Animations/Running/PlayerRunning.uasset create mode 100644 Content/Characters/AstronautMixamo/Animations/PlayerAnimation.uasset create mode 100644 Content/Characters/AstronautMixamo/Animations/PlayerMovement.uasset delete mode 100644 Content/Characters/AstronautMixamo/Animations/PlayerMovement2.uasset diff --git a/Content/Characters/Astronaut/Animations/AstronautMovement.uasset b/Content/Characters/Astronaut/Animations/AstronautMovement.uasset deleted file mode 100644 index 125b255..0000000 --- a/Content/Characters/Astronaut/Animations/AstronautMovement.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:dbede40a6637ed6fdd6331c1863e2b67874e339971fb0dce0f205cd1aa61a1a7 -size 7966 diff --git a/Content/Characters/Astronaut/Animations/Idle/PlayerIdle.uasset b/Content/Characters/Astronaut/Animations/Idle/PlayerIdle.uasset deleted file mode 100644 index 773c1ce..0000000 --- a/Content/Characters/Astronaut/Animations/Idle/PlayerIdle.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:1a8270f136035eee63f77bef1dcc1b42b3bf918ad4fcca1f8c5129d08fe06d2c -size 337021 diff --git a/Content/Characters/Astronaut/Animations/Idle/PlayerPistolIdle.uasset b/Content/Characters/Astronaut/Animations/Idle/PlayerPistolIdle.uasset deleted file mode 100644 index a25b018..0000000 --- a/Content/Characters/Astronaut/Animations/Idle/PlayerPistolIdle.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:c1de63458352107ce087e3b3e188ea025d47bfc632a5eab8d5183094932124d4 -size 166969 diff --git a/Content/Characters/Astronaut/Animations/Idle/X_Bot_Pistol_Idle_Up.uasset b/Content/Characters/Astronaut/Animations/Idle/X_Bot_Pistol_Idle_Up.uasset deleted file mode 100644 index 6b8763b..0000000 --- a/Content/Characters/Astronaut/Animations/Idle/X_Bot_Pistol_Idle_Up.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:b496e5d4a511202c0fbbc906291c4418bce2df967c0fafb6b341ef1b586d55d0 -size 176191 diff --git a/Content/Characters/Astronaut/Animations/PlayerAnimationBlueprint.uasset b/Content/Characters/Astronaut/Animations/PlayerAnimationBlueprint.uasset deleted file mode 100644 index fdc0414..0000000 --- a/Content/Characters/Astronaut/Animations/PlayerAnimationBlueprint.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:b42f5e79092dc17a6db630a2a83743b9c680cad28c2fc3b7a670a84a1f45a5c9 -size 81070 diff --git a/Content/Characters/Astronaut/Animations/Running/PlayerRunning.uasset b/Content/Characters/Astronaut/Animations/Running/PlayerRunning.uasset deleted file mode 100644 index c5ef562..0000000 --- a/Content/Characters/Astronaut/Animations/Running/PlayerRunning.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:4bd73e5e8d274edd8bc03469b78ee4855af41b46a68cddada988ca2b42913236 -size 175966 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/PlayerMovement2.uasset b/Content/Characters/AstronautMixamo/Animations/PlayerMovement2.uasset deleted file mode 100644 index 7401a43..0000000 --- a/Content/Characters/AstronautMixamo/Animations/PlayerMovement2.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:045f11abce600ae5e9c562b867a24710c0e54c012fbedbbdd338f36895e6323a -size 9192 diff --git a/Content/Characters/AstronautMixamo/Animations/Running.uasset b/Content/Characters/AstronautMixamo/Animations/Running.uasset index 768b8e2..d130cc8 100644 --- a/Content/Characters/AstronautMixamo/Animations/Running.uasset +++ b/Content/Characters/AstronautMixamo/Animations/Running.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:7bbc1fdeca47a7ced9bfa10da3e5931a1d2eff829d929cebcb754507d2b5f09d +oid sha256:b941a53cfa2fb5607f8ba5e452451c4d63201fde31fc289f5dabe467136f2730 size 177594 diff --git a/Content/Characters/AstronautMixamo/AstronautModel.uasset b/Content/Characters/AstronautMixamo/AstronautModel.uasset index 19f7bc7..1c0cb7a 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:33314fecffadeca31e66a2f2a60cac9e1eb3086310d14874a52d18dec7f4a894 +oid sha256:6e80dae710ce6ab383c7d82e6274bc4fff3355e1287d9e69c18029abcbd90172 size 140054110 diff --git a/Content/Characters/AstronautMixamo/AstronautModel_Anim.uasset b/Content/Characters/AstronautMixamo/AstronautModel_Anim.uasset index 0338955..609038d 100644 --- a/Content/Characters/AstronautMixamo/AstronautModel_Anim.uasset +++ b/Content/Characters/AstronautMixamo/AstronautModel_Anim.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:cfcd54b615c76a21e252c1de2d0b0ff82b26c41aa76c81fa17c7b58df80c79e1 +oid sha256:5f1dff29125d79c7b2b0e26520d4b53d141134ed913a06d6d1d5b710fb4f2c7c size 338594 diff --git a/Content/Characters/AstronautMixamo/AstronautModel_Skeleton.uasset b/Content/Characters/AstronautMixamo/AstronautModel_Skeleton.uasset index 95232e1..89ab3fe 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:2530df22fe51f1bde9ae8f4e140bec5902ecaf55d1038e7d98ad739eff5f1f67 +oid sha256:e44a7583b3a6ea107ad49cf81dbd4400664bd8c64f3981d6dc22df3d31fe0ec5 size 23677 diff --git a/Content/ThirdPerson/Blueprints/BP_ThirdPersonCharacter.uasset b/Content/ThirdPerson/Blueprints/BP_ThirdPersonCharacter.uasset index 2b8bade..d4dba4f 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:771d9e600a1f4a1b8bfaa82136e444110f28af07fe75bc0ad1364fb39fd2b250 -size 43410 +oid sha256:0296c0494cc933a837084a829abc541baef7574ec228dcc12474b7219961d117 +size 42737 From a6f161820bb48ff14aef90eeb86296001ba2716f Mon Sep 17 00:00:00 2001 From: MarcoHampel Date: Sun, 17 Sep 2023 22:15:40 -0400 Subject: [PATCH 4/4] Cleaned up Characters folder. Removed old blueprints and imports from first animation attempt. --- 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 --- Content/Characters/Astronaut/SubModels/AstronautShoes.uasset | 3 --- .../Characters/Astronaut/SubModels/Degradable_Metal.uasset | 3 --- .../Characters/Astronaut/SubModels/Fluffy_White_Towel.uasset | 3 --- Content/Characters/Astronaut/SubModels/Helmet_Solo.uasset | 3 --- Content/Characters/Astronaut/SubModels/Leather.uasset | 3 --- Content/Characters/Astronaut/SubModels/Material_002.uasset | 3 --- Content/Characters/Astronaut/SubModels/Material_003.uasset | 3 --- Content/Characters/Astronaut/SubModels/Material_010.uasset | 3 --- Content/Characters/Astronaut/SubModels/Metal.uasset | 3 --- Content/Characters/Astronaut/SubModels/helmet_glass.uasset | 3 --- .../Characters/AstronautMixamo/AstronautModel_Skeleton.uasset | 4 ++-- .../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 ++-- 30 files changed, 34 insertions(+), 58 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 delete mode 100644 Content/Characters/Astronaut/SubModels/AstronautShoes.uasset delete mode 100644 Content/Characters/Astronaut/SubModels/Degradable_Metal.uasset delete mode 100644 Content/Characters/Astronaut/SubModels/Fluffy_White_Towel.uasset delete mode 100644 Content/Characters/Astronaut/SubModels/Helmet_Solo.uasset delete mode 100644 Content/Characters/Astronaut/SubModels/Leather.uasset delete mode 100644 Content/Characters/Astronaut/SubModels/Material_002.uasset delete mode 100644 Content/Characters/Astronaut/SubModels/Material_003.uasset delete mode 100644 Content/Characters/Astronaut/SubModels/Material_010.uasset delete mode 100644 Content/Characters/Astronaut/SubModels/Metal.uasset delete mode 100644 Content/Characters/Astronaut/SubModels/helmet_glass.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 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 4ff45ab..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:70db59fb02c5887e90be66c7fbc6dbca977462611906064e1c80e2716a40c134 -size 143512408 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 069899d..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:0b0f09cfaeb469a38efa777ba94686305e4d7de88e7c2345c8407e8fb059ebdf -size 38158 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/Astronaut/SubModels/AstronautShoes.uasset b/Content/Characters/Astronaut/SubModels/AstronautShoes.uasset deleted file mode 100644 index 096c663..0000000 --- a/Content/Characters/Astronaut/SubModels/AstronautShoes.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:70af41a0314a2ce655ac18209a56cde397611acc0fe0ca03439f40b3243c4d8f -size 17242989 diff --git a/Content/Characters/Astronaut/SubModels/Degradable_Metal.uasset b/Content/Characters/Astronaut/SubModels/Degradable_Metal.uasset deleted file mode 100644 index d543718..0000000 --- a/Content/Characters/Astronaut/SubModels/Degradable_Metal.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:c2d088a0a43b781ba7977510effc4b10befdd105b6b3212aaa34962a1352796e -size 9075 diff --git a/Content/Characters/Astronaut/SubModels/Fluffy_White_Towel.uasset b/Content/Characters/Astronaut/SubModels/Fluffy_White_Towel.uasset deleted file mode 100644 index 4017e5c..0000000 --- a/Content/Characters/Astronaut/SubModels/Fluffy_White_Towel.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:a79c0ea1f0a7c8c877a5c6d310f79be2959126ad79a20e865fe5abad310ff1b0 -size 9093 diff --git a/Content/Characters/Astronaut/SubModels/Helmet_Solo.uasset b/Content/Characters/Astronaut/SubModels/Helmet_Solo.uasset deleted file mode 100644 index 5256e12..0000000 --- a/Content/Characters/Astronaut/SubModels/Helmet_Solo.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:f40cc7c09703b632c0103eec8f3cfb318f8fbb619f35ec99c89ad599a6d23fce -size 537820 diff --git a/Content/Characters/Astronaut/SubModels/Leather.uasset b/Content/Characters/Astronaut/SubModels/Leather.uasset deleted file mode 100644 index a1bf2c1..0000000 --- a/Content/Characters/Astronaut/SubModels/Leather.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:2e596191951f917435bf3a280002e67b787b8e1de034f267873c317b168509bb -size 9027 diff --git a/Content/Characters/Astronaut/SubModels/Material_002.uasset b/Content/Characters/Astronaut/SubModels/Material_002.uasset deleted file mode 100644 index 709aa8f..0000000 --- a/Content/Characters/Astronaut/SubModels/Material_002.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:ba13b1594571990315ee1d2bdab304e2ffc4280e2bf7d2ada8eb2b3b773f471d -size 8091 diff --git a/Content/Characters/Astronaut/SubModels/Material_003.uasset b/Content/Characters/Astronaut/SubModels/Material_003.uasset deleted file mode 100644 index e2c699a..0000000 --- a/Content/Characters/Astronaut/SubModels/Material_003.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:4c167e16faa2f951a84e549f510e88cfcb75396ed23b44162af75427c2f9a1db -size 8091 diff --git a/Content/Characters/Astronaut/SubModels/Material_010.uasset b/Content/Characters/Astronaut/SubModels/Material_010.uasset deleted file mode 100644 index aa19c1b..0000000 --- a/Content/Characters/Astronaut/SubModels/Material_010.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:038a790a9693dd96f195e73abea792ca2df9b74e45411bc1c636f2b6ba1e86c3 -size 8744 diff --git a/Content/Characters/Astronaut/SubModels/Metal.uasset b/Content/Characters/Astronaut/SubModels/Metal.uasset deleted file mode 100644 index 0c0ccc3..0000000 --- a/Content/Characters/Astronaut/SubModels/Metal.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:82c937ed26d6e6711469d5cbf3e4e4c1298f1e2b4654fb6d5ea7ea6c4142e228 -size 9009 diff --git a/Content/Characters/Astronaut/SubModels/helmet_glass.uasset b/Content/Characters/Astronaut/SubModels/helmet_glass.uasset deleted file mode 100644 index 50ef641..0000000 --- a/Content/Characters/Astronaut/SubModels/helmet_glass.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:2588abeefbc71b66068aa5c07954a85e1e9d1c20e088b8c64b8cdd9135bf0c2e -size 9056 diff --git a/Content/Characters/AstronautMixamo/AstronautModel_Skeleton.uasset b/Content/Characters/AstronautMixamo/AstronautModel_Skeleton.uasset index 89ab3fe..b039783 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:e44a7583b3a6ea107ad49cf81dbd4400664bd8c64f3981d6dc22df3d31fe0ec5 -size 23677 +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 d4dba4f..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:0296c0494cc933a837084a829abc541baef7574ec228dcc12474b7219961d117 -size 42737 +oid sha256:89e7d68428d067566eee62140116b5f0abe7565908ee00fba5c81ff07b01b8b8 +size 42749