From d44ef7e770474f5746ae786910df8c11eae7be38 Mon Sep 17 00:00:00 2001 From: Connor Elsworth Date: Mon, 22 Jan 2024 17:21:30 -0500 Subject: [PATCH] Add helmet and axe to player BP --- Content/Blueprints/BP_BrokenGlass.uasset | 4 ++-- Content/Blueprints/Player/BP_ThirdPersonCharacter.uasset | 4 ++-- Content/Blueprints/Projectile/BP_ThrownProjectile.uasset | 4 ++-- Content/Characters/Insurrectionist/ABP_Insurrectionist.uasset | 3 +++ .../Characters/Insurrectionist/Animations/anim_idle.uasset | 4 ++-- Content/Characters/Insurrectionist/Materials/M_Body.uasset | 3 +++ Content/Characters/Insurrectionist/Materials/mat_axe.uasset | 3 --- Content/Characters/Insurrectionist/Materials/mat_body.uasset | 3 --- .../Insurrectionist/Meshes/PA_Insurrectionist.uasset | 3 +++ .../Insurrectionist/Meshes/SKM_Insurrectionist.uasset | 3 +++ .../Insurrectionist/Meshes/SK_Insurrectionist.uasset | 3 +++ Content/Characters/Insurrectionist/Meshes/SM_Helmet.uasset | 3 +++ Content/Characters/Insurrectionist/Rigs/mesh_axe.uasset | 3 --- Content/Characters/Insurrectionist/Rigs/mesh_helmet.uasset | 3 --- .../Insurrectionist/Rigs/rig_insurrectionist.uasset | 3 --- .../Rigs/rig_insurrectionist_PhysicsAsset.uasset | 3 --- .../Insurrectionist/Rigs/rig_insurrectionist_Skeleton.uasset | 3 --- .../Characters/Insurrectionist/Textures/mat_axe_arm.uasset | 3 --- .../Insurrectionist/Textures/mat_axe_basecolor.uasset | 3 --- .../Characters/Insurrectionist/Textures/mat_axe_normal.uasset | 3 --- .../Characters/Insurrectionist/animbp_insurrectionist.uasset | 3 --- Content/GC_Glass.uasset | 3 --- Content/Materials/M_Axe.uasset | 4 ++-- Content/Meshes/GC_Glass.uasset | 3 +++ Content/Meshes/SM_Axe.uasset | 4 ++-- Content/Textures/Axe/M_Axe_ARM.uasset | 3 +++ Content/Textures/Axe/M_Axe_Basecolor.uasset | 3 +++ Content/Textures/Axe/M_Axe_Normal.uasset | 3 +++ Content/Textures/Axe/T_Axe_BaseColor.uasset | 3 --- Content/Textures/Axe/T_Axe_Metalic.uasset | 3 --- Content/Textures/Axe/T_Axe_Normal.uasset | 3 --- Content/Textures/Axe/T_Axe_Roughness.uasset | 3 --- 32 files changed, 42 insertions(+), 60 deletions(-) create mode 100644 Content/Characters/Insurrectionist/ABP_Insurrectionist.uasset create mode 100644 Content/Characters/Insurrectionist/Materials/M_Body.uasset delete mode 100644 Content/Characters/Insurrectionist/Materials/mat_axe.uasset delete mode 100644 Content/Characters/Insurrectionist/Materials/mat_body.uasset create mode 100644 Content/Characters/Insurrectionist/Meshes/PA_Insurrectionist.uasset create mode 100644 Content/Characters/Insurrectionist/Meshes/SKM_Insurrectionist.uasset create mode 100644 Content/Characters/Insurrectionist/Meshes/SK_Insurrectionist.uasset create mode 100644 Content/Characters/Insurrectionist/Meshes/SM_Helmet.uasset delete mode 100644 Content/Characters/Insurrectionist/Rigs/mesh_axe.uasset delete mode 100644 Content/Characters/Insurrectionist/Rigs/mesh_helmet.uasset delete mode 100644 Content/Characters/Insurrectionist/Rigs/rig_insurrectionist.uasset delete mode 100644 Content/Characters/Insurrectionist/Rigs/rig_insurrectionist_PhysicsAsset.uasset delete mode 100644 Content/Characters/Insurrectionist/Rigs/rig_insurrectionist_Skeleton.uasset delete mode 100644 Content/Characters/Insurrectionist/Textures/mat_axe_arm.uasset delete mode 100644 Content/Characters/Insurrectionist/Textures/mat_axe_basecolor.uasset delete mode 100644 Content/Characters/Insurrectionist/Textures/mat_axe_normal.uasset delete mode 100644 Content/Characters/Insurrectionist/animbp_insurrectionist.uasset delete mode 100644 Content/GC_Glass.uasset create mode 100644 Content/Meshes/GC_Glass.uasset create mode 100644 Content/Textures/Axe/M_Axe_ARM.uasset create mode 100644 Content/Textures/Axe/M_Axe_Basecolor.uasset create mode 100644 Content/Textures/Axe/M_Axe_Normal.uasset delete mode 100644 Content/Textures/Axe/T_Axe_BaseColor.uasset delete mode 100644 Content/Textures/Axe/T_Axe_Metalic.uasset delete mode 100644 Content/Textures/Axe/T_Axe_Normal.uasset delete mode 100644 Content/Textures/Axe/T_Axe_Roughness.uasset diff --git a/Content/Blueprints/BP_BrokenGlass.uasset b/Content/Blueprints/BP_BrokenGlass.uasset index 94186db..7446ce3 100644 --- a/Content/Blueprints/BP_BrokenGlass.uasset +++ b/Content/Blueprints/BP_BrokenGlass.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c25a5ea01d8b60bcc20a9ee7c8d343ec224864a6d243fd64d540a6fe80dd1363 -size 36443 +oid sha256:dd78dce0e10e7d5396997cd8562a91ea71d8087b52a9f5376ecf28a23f1b390b +size 35590 diff --git a/Content/Blueprints/Player/BP_ThirdPersonCharacter.uasset b/Content/Blueprints/Player/BP_ThirdPersonCharacter.uasset index 82349e3..4f49d5a 100644 --- a/Content/Blueprints/Player/BP_ThirdPersonCharacter.uasset +++ b/Content/Blueprints/Player/BP_ThirdPersonCharacter.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d47bbda462ef86ec74743efc7e78816a0ed93ac27211644af00201a365158b6e -size 2630975 +oid sha256:9497ac73f039ac31ad5edc439f91fba89e9e87b7f22e9fa55ddc0b57ae7b31a2 +size 2623015 diff --git a/Content/Blueprints/Projectile/BP_ThrownProjectile.uasset b/Content/Blueprints/Projectile/BP_ThrownProjectile.uasset index d222373..c71afb4 100644 --- a/Content/Blueprints/Projectile/BP_ThrownProjectile.uasset +++ b/Content/Blueprints/Projectile/BP_ThrownProjectile.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:7fdc22018c07f9e0be152e84db54e534584f782444c36942d2f242189c8506bf -size 161051 +oid sha256:ca09724dbee32f82044719877bcf8b59354a6313aa3fbc74870ffbae6b678a83 +size 159554 diff --git a/Content/Characters/Insurrectionist/ABP_Insurrectionist.uasset b/Content/Characters/Insurrectionist/ABP_Insurrectionist.uasset new file mode 100644 index 0000000..5b445bf --- /dev/null +++ b/Content/Characters/Insurrectionist/ABP_Insurrectionist.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:20cf11b5ef179cd30c945657c328751fef06a9e027b10c0e8ca3e39a18835383 +size 47952 diff --git a/Content/Characters/Insurrectionist/Animations/anim_idle.uasset b/Content/Characters/Insurrectionist/Animations/anim_idle.uasset index e752a68..b8fa5dd 100644 --- a/Content/Characters/Insurrectionist/Animations/anim_idle.uasset +++ b/Content/Characters/Insurrectionist/Animations/anim_idle.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:6152ee07f65a2efb1171cb511a18b3f7148f148f8d7182902d025ef13e9a2c0e -size 14378120 +oid sha256:f7438c1d4061f15216f070939be8bf11b7c7ae490dd5d2898a78b18eb9b85abe +size 14378084 diff --git a/Content/Characters/Insurrectionist/Materials/M_Body.uasset b/Content/Characters/Insurrectionist/Materials/M_Body.uasset new file mode 100644 index 0000000..34ba3b1 --- /dev/null +++ b/Content/Characters/Insurrectionist/Materials/M_Body.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e9f1d1226b3906e6e6e0675bbb26f4cf51f920a70bdea2d6120f2843af842a5e +size 7815 diff --git a/Content/Characters/Insurrectionist/Materials/mat_axe.uasset b/Content/Characters/Insurrectionist/Materials/mat_axe.uasset deleted file mode 100644 index fb4cbb6..0000000 --- a/Content/Characters/Insurrectionist/Materials/mat_axe.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:a1820cc8b6704afcfb506fdc1c45bf6f5f16a8de21997e2840c494a8a9be94c2 -size 13632 diff --git a/Content/Characters/Insurrectionist/Materials/mat_body.uasset b/Content/Characters/Insurrectionist/Materials/mat_body.uasset deleted file mode 100644 index e7b13a9..0000000 --- a/Content/Characters/Insurrectionist/Materials/mat_body.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:74fb676265ba73074d52a8b7424d2e2792bdd416c111ce7916d2a671ece41f4b -size 7827 diff --git a/Content/Characters/Insurrectionist/Meshes/PA_Insurrectionist.uasset b/Content/Characters/Insurrectionist/Meshes/PA_Insurrectionist.uasset new file mode 100644 index 0000000..3844533 --- /dev/null +++ b/Content/Characters/Insurrectionist/Meshes/PA_Insurrectionist.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:cc9d0bd8378988ebc6b81031f8ab32447bc8eb793035029739fc9ee45f8a467f +size 16764 diff --git a/Content/Characters/Insurrectionist/Meshes/SKM_Insurrectionist.uasset b/Content/Characters/Insurrectionist/Meshes/SKM_Insurrectionist.uasset new file mode 100644 index 0000000..e3a3e42 --- /dev/null +++ b/Content/Characters/Insurrectionist/Meshes/SKM_Insurrectionist.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:010c5c56ec961eec2bcd0f2b02a371944f2160a8f928efee421a971c80934bb8 +size 1862666 diff --git a/Content/Characters/Insurrectionist/Meshes/SK_Insurrectionist.uasset b/Content/Characters/Insurrectionist/Meshes/SK_Insurrectionist.uasset new file mode 100644 index 0000000..b1370ac --- /dev/null +++ b/Content/Characters/Insurrectionist/Meshes/SK_Insurrectionist.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b1f79556d0f7fcb3c7994a35470de298013e42cca33e16de91d411a732310463 +size 27530 diff --git a/Content/Characters/Insurrectionist/Meshes/SM_Helmet.uasset b/Content/Characters/Insurrectionist/Meshes/SM_Helmet.uasset new file mode 100644 index 0000000..c4d76b3 --- /dev/null +++ b/Content/Characters/Insurrectionist/Meshes/SM_Helmet.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:47cb400e79260d66de7ccdcb504d4a3d0e93bdf529909d7735e0122060bacf8e +size 89757 diff --git a/Content/Characters/Insurrectionist/Rigs/mesh_axe.uasset b/Content/Characters/Insurrectionist/Rigs/mesh_axe.uasset deleted file mode 100644 index 4930e7a..0000000 --- a/Content/Characters/Insurrectionist/Rigs/mesh_axe.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:08654f2b199aa6e0fa6d241aeb28f3974baa473ddf90ecbb473a495af5b8e912 -size 153454 diff --git a/Content/Characters/Insurrectionist/Rigs/mesh_helmet.uasset b/Content/Characters/Insurrectionist/Rigs/mesh_helmet.uasset deleted file mode 100644 index 99eae8f..0000000 --- a/Content/Characters/Insurrectionist/Rigs/mesh_helmet.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:07a132d2543de4448607507d65406cbf671b82060d36cd3d404802d699e9c749 -size 89831 diff --git a/Content/Characters/Insurrectionist/Rigs/rig_insurrectionist.uasset b/Content/Characters/Insurrectionist/Rigs/rig_insurrectionist.uasset deleted file mode 100644 index a1b7c82..0000000 --- a/Content/Characters/Insurrectionist/Rigs/rig_insurrectionist.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:983da41c722baa2565dcb940f7d936c95d2b44983cbfbb6bb70984e1ccc59db6 -size 1862662 diff --git a/Content/Characters/Insurrectionist/Rigs/rig_insurrectionist_PhysicsAsset.uasset b/Content/Characters/Insurrectionist/Rigs/rig_insurrectionist_PhysicsAsset.uasset deleted file mode 100644 index 22bcac3..0000000 --- a/Content/Characters/Insurrectionist/Rigs/rig_insurrectionist_PhysicsAsset.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:67980055bf8550019d28a76ab410fdcb295360a8c8da93c5623f6b4f11fc70ac -size 15603 diff --git a/Content/Characters/Insurrectionist/Rigs/rig_insurrectionist_Skeleton.uasset b/Content/Characters/Insurrectionist/Rigs/rig_insurrectionist_Skeleton.uasset deleted file mode 100644 index 456504c..0000000 --- a/Content/Characters/Insurrectionist/Rigs/rig_insurrectionist_Skeleton.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:04971d4a7cbfced3598a926cf7bf314f0d249c59f2b7ea358bace2dde76b7ee5 -size 27629 diff --git a/Content/Characters/Insurrectionist/Textures/mat_axe_arm.uasset b/Content/Characters/Insurrectionist/Textures/mat_axe_arm.uasset deleted file mode 100644 index c3eac40..0000000 --- a/Content/Characters/Insurrectionist/Textures/mat_axe_arm.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:da0fd349dc23cc23c175c1b7d094269207f7b5da81c0812735a2d07dcc024499 -size 5195781 diff --git a/Content/Characters/Insurrectionist/Textures/mat_axe_basecolor.uasset b/Content/Characters/Insurrectionist/Textures/mat_axe_basecolor.uasset deleted file mode 100644 index ce16d35..0000000 --- a/Content/Characters/Insurrectionist/Textures/mat_axe_basecolor.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:338a49788b8db357a1b56ef1bd589f616e09ece99c16ff8c76c09e5b92d79266 -size 4629141 diff --git a/Content/Characters/Insurrectionist/Textures/mat_axe_normal.uasset b/Content/Characters/Insurrectionist/Textures/mat_axe_normal.uasset deleted file mode 100644 index 98b3eaf..0000000 --- a/Content/Characters/Insurrectionist/Textures/mat_axe_normal.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:1f4b886d57c16b513c1e3c788d33fea78e3f87d86e436751eff61905cef0123e -size 19827416 diff --git a/Content/Characters/Insurrectionist/animbp_insurrectionist.uasset b/Content/Characters/Insurrectionist/animbp_insurrectionist.uasset deleted file mode 100644 index 8cd931e..0000000 --- a/Content/Characters/Insurrectionist/animbp_insurrectionist.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:d2a0ce26823a6f9c25275153dc4719211d3bd123d4479ce0ddbdf827ff5eae73 -size 47778 diff --git a/Content/GC_Glass.uasset b/Content/GC_Glass.uasset deleted file mode 100644 index 7924feb..0000000 --- a/Content/GC_Glass.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:232aba78d7b87274c200b87cda2df147a6f26381ca26a2f8bf49bd862e066434 -size 9652775 diff --git a/Content/Materials/M_Axe.uasset b/Content/Materials/M_Axe.uasset index 51c7d93..ca6460e 100644 --- a/Content/Materials/M_Axe.uasset +++ b/Content/Materials/M_Axe.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:da9c6dc40020d9cb8f8bc9fabb81514b39e050ee90119b78b3380dc4577cdab9 -size 14769 +oid sha256:b2ac089ffdaaef0c53754f361e47549f507962b4cc581477cc3a79a84a61c0a0 +size 13094 diff --git a/Content/Meshes/GC_Glass.uasset b/Content/Meshes/GC_Glass.uasset new file mode 100644 index 0000000..e1dfdb8 --- /dev/null +++ b/Content/Meshes/GC_Glass.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:4cfc80626c9f40837a2ce2803bfedb714b7c8b389c8bae09aa030cd012405321 +size 9652789 diff --git a/Content/Meshes/SM_Axe.uasset b/Content/Meshes/SM_Axe.uasset index 36d8a48..9c8bfc1 100644 --- a/Content/Meshes/SM_Axe.uasset +++ b/Content/Meshes/SM_Axe.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:9dfa4fc9e5817c565b0b440778764f082d941ebd751404794bd9d3a5a63c421c -size 155825 +oid sha256:5e87d2745178deea35dab34e17a9e20242f4190c410db3b2255a27ac786ca044 +size 153870 diff --git a/Content/Textures/Axe/M_Axe_ARM.uasset b/Content/Textures/Axe/M_Axe_ARM.uasset new file mode 100644 index 0000000..f54205d --- /dev/null +++ b/Content/Textures/Axe/M_Axe_ARM.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:24e0784f1ecc042301a69d47b71bc25d20534b821e1bad93b8b5b1ab5bfad67c +size 5195696 diff --git a/Content/Textures/Axe/M_Axe_Basecolor.uasset b/Content/Textures/Axe/M_Axe_Basecolor.uasset new file mode 100644 index 0000000..8df1245 --- /dev/null +++ b/Content/Textures/Axe/M_Axe_Basecolor.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:bd5e27b1254b7c2699bf90e7644d120226e6f2944c4ff0e2b4475eaa71c712cd +size 4629050 diff --git a/Content/Textures/Axe/M_Axe_Normal.uasset b/Content/Textures/Axe/M_Axe_Normal.uasset new file mode 100644 index 0000000..4422046 --- /dev/null +++ b/Content/Textures/Axe/M_Axe_Normal.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:342d16d9357a7d17f2317475c673356ccc0e3edde157b8d98140a154d208dd1f +size 19827354 diff --git a/Content/Textures/Axe/T_Axe_BaseColor.uasset b/Content/Textures/Axe/T_Axe_BaseColor.uasset deleted file mode 100644 index 7284dca..0000000 --- a/Content/Textures/Axe/T_Axe_BaseColor.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:ae6c5e1a259f7a8076bf427e82ede71e45ee04be37a55007b990ad7ba02b32af -size 15796875 diff --git a/Content/Textures/Axe/T_Axe_Metalic.uasset b/Content/Textures/Axe/T_Axe_Metalic.uasset deleted file mode 100644 index fd3b3e4..0000000 --- a/Content/Textures/Axe/T_Axe_Metalic.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:2a9c00df1408f67cef218a2834ee6b9b64c60b7511bea53f226da4aebeafacdd -size 2663677 diff --git a/Content/Textures/Axe/T_Axe_Normal.uasset b/Content/Textures/Axe/T_Axe_Normal.uasset deleted file mode 100644 index ab675b0..0000000 --- a/Content/Textures/Axe/T_Axe_Normal.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:3b8a140a67414279249ae5db853cf1839ab1e5af30f8dd283fb0fe97e5762ea9 -size 68863642 diff --git a/Content/Textures/Axe/T_Axe_Roughness.uasset b/Content/Textures/Axe/T_Axe_Roughness.uasset deleted file mode 100644 index 77e6219..0000000 --- a/Content/Textures/Axe/T_Axe_Roughness.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:956a04843a81c768540e9d2d0469745e4fde316793deba43cbcadf38a4162ae2 -size 8559988