From 5307c9c02d5f7694e6198b280222bbc0ec2f114d Mon Sep 17 00:00:00 2001 From: CHARLIE SEYMOUR Date: Wed, 29 Mar 2023 15:48:08 +0100 Subject: [PATCH 1/4] Added combat and material bars --- Content/Blueprints/Combat_UI/Combat_UI.uasset | 4 ++-- Content/Blueprints/Combat_UI/Health_bar_empty.uasset | 4 ++-- Content/Blueprints/Combat_UI/Health_bar_full.uasset | 4 ++-- Content/Blueprints/Combat_UI/material_empty.uasset | 3 +++ Content/Blueprints/Combat_UI/material_full.uasset | 3 +++ Content/Levels/Build.umap | 4 ++-- 6 files changed, 14 insertions(+), 8 deletions(-) create mode 100644 Content/Blueprints/Combat_UI/material_empty.uasset create mode 100644 Content/Blueprints/Combat_UI/material_full.uasset diff --git a/Content/Blueprints/Combat_UI/Combat_UI.uasset b/Content/Blueprints/Combat_UI/Combat_UI.uasset index 4a5afb5..31b7af3 100644 --- a/Content/Blueprints/Combat_UI/Combat_UI.uasset +++ b/Content/Blueprints/Combat_UI/Combat_UI.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:2a6bb861d2cf59083490093f17787023d879998208033bd39bb24650a6efae91 -size 81335 +oid sha256:31f21c1e4bc1c7554c74708b138c993d12ff7f2a811099eabc2120a3394e7b25 +size 83299 diff --git a/Content/Blueprints/Combat_UI/Health_bar_empty.uasset b/Content/Blueprints/Combat_UI/Health_bar_empty.uasset index 25f11fe..f697ccf 100644 --- a/Content/Blueprints/Combat_UI/Health_bar_empty.uasset +++ b/Content/Blueprints/Combat_UI/Health_bar_empty.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:be8e877ecb5cece153db6706263fd7b59c8dc80269ecbfb095849b9de996f330 -size 13307 +oid sha256:4d11107407bb69c5dca102ec4fbe60d678eca9536f788709239d650eac97b02b +size 21909 diff --git a/Content/Blueprints/Combat_UI/Health_bar_full.uasset b/Content/Blueprints/Combat_UI/Health_bar_full.uasset index 6e21581..996daff 100644 --- a/Content/Blueprints/Combat_UI/Health_bar_full.uasset +++ b/Content/Blueprints/Combat_UI/Health_bar_full.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d36158697963d721d98386e8384d1051518a59dbb54bd5bf6353cad50f540c06 -size 29103 +oid sha256:17aeefcc36640697bae4c01d56ef8493b129cd43b5a5dab939822a09141ebaea +size 37324 diff --git a/Content/Blueprints/Combat_UI/material_empty.uasset b/Content/Blueprints/Combat_UI/material_empty.uasset new file mode 100644 index 0000000..d79cb3d --- /dev/null +++ b/Content/Blueprints/Combat_UI/material_empty.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:5f3eaa4e025efcfbc35225c0562527199146b5a6dd4dc5e512501cf4971556c8 +size 18221 diff --git a/Content/Blueprints/Combat_UI/material_full.uasset b/Content/Blueprints/Combat_UI/material_full.uasset new file mode 100644 index 0000000..1c80e73 --- /dev/null +++ b/Content/Blueprints/Combat_UI/material_full.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:6f5e36cb14509f50b71326e57283af11fba2ce9e8ff5910d29980d8b247719fe +size 31800 diff --git a/Content/Levels/Build.umap b/Content/Levels/Build.umap index b8e51cb..794fb8f 100644 --- a/Content/Levels/Build.umap +++ b/Content/Levels/Build.umap @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a5d06e03b062da9234d1031908a1fa3c338d3783545004c83604516663388532 -size 1198477 +oid sha256:6137937a80ba2e5d217c252d5ec28f63f58b50e7e1b729d6d965007fded6a04f +size 3402315 From 7ec5c4442f2602fb16807f5eda06d45259d4d715 Mon Sep 17 00:00:00 2001 From: EMILY TAYLOR Date: Wed, 29 Mar 2023 16:19:37 +0100 Subject: [PATCH 2/4] Added Book and Material Implemented book asset in game and material. --- Content/Blueprints/Combat_UI/CombatCharacter.uasset | 4 ++-- Content/Blueprints/Combat_UI/Gun/Book_Open.uasset | 3 +++ .../Combat_UI/Gun/Book_Open_low_Book_Open_BaseColor.uasset | 3 +++ .../Combat_UI/Gun/Book_Open_low_Book_Open_Normal.uasset | 3 +++ .../Book_Open_low_Book_Open_OcclusionRoughnessMetallic.uasset | 3 +++ Content/Blueprints/Combat_UI/Gun/M_BookOpen.uasset | 3 +++ 6 files changed, 17 insertions(+), 2 deletions(-) create mode 100644 Content/Blueprints/Combat_UI/Gun/Book_Open.uasset create mode 100644 Content/Blueprints/Combat_UI/Gun/Book_Open_low_Book_Open_BaseColor.uasset create mode 100644 Content/Blueprints/Combat_UI/Gun/Book_Open_low_Book_Open_Normal.uasset create mode 100644 Content/Blueprints/Combat_UI/Gun/Book_Open_low_Book_Open_OcclusionRoughnessMetallic.uasset create mode 100644 Content/Blueprints/Combat_UI/Gun/M_BookOpen.uasset diff --git a/Content/Blueprints/Combat_UI/CombatCharacter.uasset b/Content/Blueprints/Combat_UI/CombatCharacter.uasset index 95dfb71..4be3828 100644 --- a/Content/Blueprints/Combat_UI/CombatCharacter.uasset +++ b/Content/Blueprints/Combat_UI/CombatCharacter.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c562b5c67776321cede72ee09e73f191ddc303ff9872f5f20a8af35b115b359e -size 125203 +oid sha256:53b60b2458380f120780090e71f866a33d619573bccaaad07a535138f5f78dd0 +size 126459 diff --git a/Content/Blueprints/Combat_UI/Gun/Book_Open.uasset b/Content/Blueprints/Combat_UI/Gun/Book_Open.uasset new file mode 100644 index 0000000..3edf73b --- /dev/null +++ b/Content/Blueprints/Combat_UI/Gun/Book_Open.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:08cbf2f49eb920dc0e4a0129c681b562ba37a86662112e3413523c76d9804683 +size 89671 diff --git a/Content/Blueprints/Combat_UI/Gun/Book_Open_low_Book_Open_BaseColor.uasset b/Content/Blueprints/Combat_UI/Gun/Book_Open_low_Book_Open_BaseColor.uasset new file mode 100644 index 0000000..3a09525 --- /dev/null +++ b/Content/Blueprints/Combat_UI/Gun/Book_Open_low_Book_Open_BaseColor.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:25b34c2142e6eaaa6438f5315d255f33c615bf81fc02fad727cc9cde8b66d26e +size 454630 diff --git a/Content/Blueprints/Combat_UI/Gun/Book_Open_low_Book_Open_Normal.uasset b/Content/Blueprints/Combat_UI/Gun/Book_Open_low_Book_Open_Normal.uasset new file mode 100644 index 0000000..31387d5 --- /dev/null +++ b/Content/Blueprints/Combat_UI/Gun/Book_Open_low_Book_Open_Normal.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:721c6c2397182d489ae0eff8b9a816899b51451c0ee6ae9eef7d1e4495b4472f +size 751581 diff --git a/Content/Blueprints/Combat_UI/Gun/Book_Open_low_Book_Open_OcclusionRoughnessMetallic.uasset b/Content/Blueprints/Combat_UI/Gun/Book_Open_low_Book_Open_OcclusionRoughnessMetallic.uasset new file mode 100644 index 0000000..0f1b32e --- /dev/null +++ b/Content/Blueprints/Combat_UI/Gun/Book_Open_low_Book_Open_OcclusionRoughnessMetallic.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:4c9cbc5778727d4d7c4b1f1cbab2ad8608f8ebc87d2e73a970754185b9ed677b +size 438544 diff --git a/Content/Blueprints/Combat_UI/Gun/M_BookOpen.uasset b/Content/Blueprints/Combat_UI/Gun/M_BookOpen.uasset new file mode 100644 index 0000000..df4aaa4 --- /dev/null +++ b/Content/Blueprints/Combat_UI/Gun/M_BookOpen.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:2ca4ad422d60a8880d24d95fb59ac21203242852c9462cdf8f1e7958e90afaab +size 11605 From 25e20d53f7f27c2a93485a926163f8c8ba29ed0b Mon Sep 17 00:00:00 2001 From: EMILY TAYLOR Date: Wed, 29 Mar 2023 16:22:00 +0100 Subject: [PATCH 3/4] Added Lamp Asset for Tutorial Level --- Content/Assets/TutorialAssets/Lamp.uasset | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 Content/Assets/TutorialAssets/Lamp.uasset diff --git a/Content/Assets/TutorialAssets/Lamp.uasset b/Content/Assets/TutorialAssets/Lamp.uasset new file mode 100644 index 0000000..5ce064b --- /dev/null +++ b/Content/Assets/TutorialAssets/Lamp.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e4a52fb7b198fe08a37539e3dbfc347da172fab12541ba1995b6b549ceab18e1 +size 197683 From 2787f29e165abe43e8ebd6d23bd02616dc59cfed Mon Sep 17 00:00:00 2001 From: Phoebe Date: Wed, 29 Mar 2023 16:59:07 +0100 Subject: [PATCH 4/4] mushrooms added and textures --- .../mushrooms/Skinny_Mushroom/M_Skinny_mushrooms.uasset | 3 +++ .../skinny_mushrooms_uved_lambert1_Roughness.uasset | 3 +++ Content/Environment/mushrooms/skiny_mushrooms.uasset | 3 --- Content/Levels/Build.umap | 4 ++-- 4 files changed, 8 insertions(+), 5 deletions(-) create mode 100644 Content/Environment/mushrooms/Skinny_Mushroom/M_Skinny_mushrooms.uasset create mode 100644 Content/Environment/mushrooms/Skinny_Mushroom/skinny_mushrooms_uved_lambert1_Roughness.uasset delete mode 100644 Content/Environment/mushrooms/skiny_mushrooms.uasset diff --git a/Content/Environment/mushrooms/Skinny_Mushroom/M_Skinny_mushrooms.uasset b/Content/Environment/mushrooms/Skinny_Mushroom/M_Skinny_mushrooms.uasset new file mode 100644 index 0000000..6427f62 --- /dev/null +++ b/Content/Environment/mushrooms/Skinny_Mushroom/M_Skinny_mushrooms.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:bb690e85c5639e990be4eb6ff0c1c43f5ad18de5944f70adc0ef6b62e0f4c5ef +size 14225 diff --git a/Content/Environment/mushrooms/Skinny_Mushroom/skinny_mushrooms_uved_lambert1_Roughness.uasset b/Content/Environment/mushrooms/Skinny_Mushroom/skinny_mushrooms_uved_lambert1_Roughness.uasset new file mode 100644 index 0000000..e6e5cfc --- /dev/null +++ b/Content/Environment/mushrooms/Skinny_Mushroom/skinny_mushrooms_uved_lambert1_Roughness.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:5cb2fb7f6984df5023a9daabaef22cde55b2a2ab367c73bf14f7f119b4f934eb +size 16229 diff --git a/Content/Environment/mushrooms/skiny_mushrooms.uasset b/Content/Environment/mushrooms/skiny_mushrooms.uasset deleted file mode 100644 index 91bfc0d..0000000 --- a/Content/Environment/mushrooms/skiny_mushrooms.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:1af5cbc3706c507e008d3c3c020921011199ebd8b9892078b6286d200c25145f -size 78542 diff --git a/Content/Levels/Build.umap b/Content/Levels/Build.umap index 794fb8f..8c85134 100644 --- a/Content/Levels/Build.umap +++ b/Content/Levels/Build.umap @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:6137937a80ba2e5d217c252d5ec28f63f58b50e7e1b729d6d965007fded6a04f -size 3402315 +oid sha256:44077b4fd3ee8a3dc106e6a004ed983b804d2401af3afe0862a45923cd0e29e9 +size 3402648