From 5307c9c02d5f7694e6198b280222bbc0ec2f114d Mon Sep 17 00:00:00 2001 From: CHARLIE SEYMOUR Date: Wed, 29 Mar 2023 15:48:08 +0100 Subject: [PATCH 01/11] 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 02/11] 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 03/11] 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 04/11] 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 From 00677164b3cf1191bbec310db9ff4c2423ac90e3 Mon Sep 17 00:00:00 2001 From: MARCEL HARA Date: Wed, 29 Mar 2023 17:03:00 +0100 Subject: [PATCH 05/11] Updated all lighting to whole scene Changed the lighting and crystal placements in the starter place and the hub world --- Config/DefaultEngine.ini | 8 ++++++++ .../Assets/Objects/Crystal/CrystalMatGlow_Instance.uasset | 3 +++ Content/Assets/Objects/Crystal/Crystal_texture.uasset | 4 ++-- Content/Assets/Objects/Sign/Material/rough_wood.uasset | 4 ++-- Content/Levels/Build.umap | 4 ++-- 5 files changed, 17 insertions(+), 6 deletions(-) create mode 100644 Content/Assets/Objects/Crystal/CrystalMatGlow_Instance.uasset diff --git a/Config/DefaultEngine.ini b/Config/DefaultEngine.ini index 87a68f8..b374b7a 100644 --- a/Config/DefaultEngine.ini +++ b/Config/DefaultEngine.ini @@ -140,3 +140,11 @@ CategorySlot8=Eight CategorySlot9=Nine CategorySlot0=Zero +[/Script/Engine.RendererSettings] +r.ReflectionMethod=1 +r.GenerateMeshDistanceFields=True +r.DynamicGlobalIlluminationMethod=1 +r.Lumen.TraceMeshSDFs=0 +r.SkinCache.CompileShaders=True +r.RayTracing=True + diff --git a/Content/Assets/Objects/Crystal/CrystalMatGlow_Instance.uasset b/Content/Assets/Objects/Crystal/CrystalMatGlow_Instance.uasset new file mode 100644 index 0000000..6809679 --- /dev/null +++ b/Content/Assets/Objects/Crystal/CrystalMatGlow_Instance.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:09b24ff9aba5e1304e34ddd86d500d1de67e62afee6a142585cdb49a62544ca0 +size 8749 diff --git a/Content/Assets/Objects/Crystal/Crystal_texture.uasset b/Content/Assets/Objects/Crystal/Crystal_texture.uasset index 8f1cac6..7074cfb 100644 --- a/Content/Assets/Objects/Crystal/Crystal_texture.uasset +++ b/Content/Assets/Objects/Crystal/Crystal_texture.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a27fea9563381f5a89d5e658b18507b745735b8c9b2266600d441472797eba02 -size 9506 +oid sha256:28de67b82c60640426a175dffb94274044cb52a5ae18b216faffdbee4ecd1a71 +size 10404 diff --git a/Content/Assets/Objects/Sign/Material/rough_wood.uasset b/Content/Assets/Objects/Sign/Material/rough_wood.uasset index ea506c0..1d5683b 100644 --- a/Content/Assets/Objects/Sign/Material/rough_wood.uasset +++ b/Content/Assets/Objects/Sign/Material/rough_wood.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:2c544090ba3727b412fd68ee8999d99c6f257234d0beee77163e93429451fe07 -size 39353 +oid sha256:8adf108edd36b7443f578679f364a8c65144b7327246a0717ff21944a179002b +size 38671 diff --git a/Content/Levels/Build.umap b/Content/Levels/Build.umap index b8e51cb..c731d46 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:667c7d82cd2b957544ca321f7e9e53a2be74bbe550ad79ec1c4836aef8c08f51 +size 3446428 From 5e534b3af998369e9bc5974132f4eec138f52863 Mon Sep 17 00:00:00 2001 From: MARCEL HARA Date: Wed, 29 Mar 2023 17:16:11 +0100 Subject: [PATCH 06/11] Updated Flashlight brightness --- Content/Assets/Objects/Crystal/Crystal.uasset | 4 ++-- Content/Assets/Objects/Crystal/Crystal_texture.uasset | 4 ++-- Content/Assets/Objects/Crystal/Small_Crystal_1.uasset | 4 ++-- Content/Assets/Objects/Crystal/Small_Crystal_2.uasset | 4 ++-- Content/Assets/Objects/Crystal/Small_Crystal_3.uasset | 4 ++-- Content/Assets/Objects/Crystal/crystal_1.uasset | 4 ++-- Content/Assets/Objects/Crystal/crystal_2.uasset | 4 ++-- Content/Assets/Objects/Crystal/crystal_3.uasset | 4 ++-- Content/Blueprints/Combat_UI/CombatCharacter.uasset | 4 ++-- Content/Blueprints/Combat_UI/Gun/Book_Open.uasset | 4 ++-- Content/Blueprints/Combat_UI/Gun/M_BookOpen.uasset | 4 ++-- 11 files changed, 22 insertions(+), 22 deletions(-) diff --git a/Content/Assets/Objects/Crystal/Crystal.uasset b/Content/Assets/Objects/Crystal/Crystal.uasset index 4e104f7..4b03528 100644 --- a/Content/Assets/Objects/Crystal/Crystal.uasset +++ b/Content/Assets/Objects/Crystal/Crystal.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:093650f378e4fab301594aab264cee1ad6f499c6cf3bbe985a00564e1bb55e05 -size 22867 +oid sha256:98d22dbed24662e2f3a52d3c952f538a544d2421d18e08ec787519eb9ff0c02a +size 22894 diff --git a/Content/Assets/Objects/Crystal/Crystal_texture.uasset b/Content/Assets/Objects/Crystal/Crystal_texture.uasset index 7074cfb..03f8bd7 100644 --- a/Content/Assets/Objects/Crystal/Crystal_texture.uasset +++ b/Content/Assets/Objects/Crystal/Crystal_texture.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:28de67b82c60640426a175dffb94274044cb52a5ae18b216faffdbee4ecd1a71 -size 10404 +oid sha256:c0ca4508b3b3651863c31a2cc306c1ff4fa5832dce7df0ed98c0896fb4f6bf07 +size 10454 diff --git a/Content/Assets/Objects/Crystal/Small_Crystal_1.uasset b/Content/Assets/Objects/Crystal/Small_Crystal_1.uasset index 44df2d8..26aef4d 100644 --- a/Content/Assets/Objects/Crystal/Small_Crystal_1.uasset +++ b/Content/Assets/Objects/Crystal/Small_Crystal_1.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:10c9dc771f21d3c53189e495b50e14dc085ec19747eb9ac94b7c333c95984e6c -size 19617 +oid sha256:add49bfd7ef841f1f641ff08c49499b14d6b60d1808edbe2318ba36142fca879 +size 19534 diff --git a/Content/Assets/Objects/Crystal/Small_Crystal_2.uasset b/Content/Assets/Objects/Crystal/Small_Crystal_2.uasset index 73a42bd..cb34782 100644 --- a/Content/Assets/Objects/Crystal/Small_Crystal_2.uasset +++ b/Content/Assets/Objects/Crystal/Small_Crystal_2.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:12d7a594328c6ff503bb84394e0231763e43e16bce860c1cdd2693d1d803688d -size 19602 +oid sha256:6339ad6c38ac857c2382ab3d3f838f941456208133afd38ea73fc0ce4fd20eed +size 19571 diff --git a/Content/Assets/Objects/Crystal/Small_Crystal_3.uasset b/Content/Assets/Objects/Crystal/Small_Crystal_3.uasset index c62c333..310e164 100644 --- a/Content/Assets/Objects/Crystal/Small_Crystal_3.uasset +++ b/Content/Assets/Objects/Crystal/Small_Crystal_3.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d13be982df3d62ec7e21a47564954f081b3fc9c6d10f35895106f3c33913baa7 -size 19700 +oid sha256:3c0f8139e945c0817354e3d64393fa7f2c700674944f72c366531861fdf666ea +size 19709 diff --git a/Content/Assets/Objects/Crystal/crystal_1.uasset b/Content/Assets/Objects/Crystal/crystal_1.uasset index c132ee5..7130816 100644 --- a/Content/Assets/Objects/Crystal/crystal_1.uasset +++ b/Content/Assets/Objects/Crystal/crystal_1.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:dc9138d1b2aa0945e176a7906f652546d469e943bfa14ce70b737aca8a2609ca -size 21074 +oid sha256:e484f4e87edc7e00a561c93d375ab56442bd311120d742662b3fbfb67af2ed8e +size 21049 diff --git a/Content/Assets/Objects/Crystal/crystal_2.uasset b/Content/Assets/Objects/Crystal/crystal_2.uasset index c041dfe..4291c15 100644 --- a/Content/Assets/Objects/Crystal/crystal_2.uasset +++ b/Content/Assets/Objects/Crystal/crystal_2.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:8d4702e4920c0fc3c32388f9befe28d44f0b592e5330c7a3cbf8af8450d944b0 -size 19797 +oid sha256:2223b444c883bb6ed7dbee2168a39682bd4566c98902e284840f29d05121c27d +size 19774 diff --git a/Content/Assets/Objects/Crystal/crystal_3.uasset b/Content/Assets/Objects/Crystal/crystal_3.uasset index abe236d..e9badc8 100644 --- a/Content/Assets/Objects/Crystal/crystal_3.uasset +++ b/Content/Assets/Objects/Crystal/crystal_3.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f89927cfc267c514b9c03e39844592830505301d93497ae81db87fc0e003d91d -size 19977 +oid sha256:1b6a63d510de9d05b718c0f0bbb9cd68217a2fb44e36a71470ae6061dcc12e20 +size 19944 diff --git a/Content/Blueprints/Combat_UI/CombatCharacter.uasset b/Content/Blueprints/Combat_UI/CombatCharacter.uasset index 4be3828..b599a92 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:53b60b2458380f120780090e71f866a33d619573bccaaad07a535138f5f78dd0 -size 126459 +oid sha256:13244003e16fee1d9448cfcc2f21c65656d5aba104dd404ba8e8165c38d88465 +size 126545 diff --git a/Content/Blueprints/Combat_UI/Gun/Book_Open.uasset b/Content/Blueprints/Combat_UI/Gun/Book_Open.uasset index 3edf73b..3ac9c26 100644 --- a/Content/Blueprints/Combat_UI/Gun/Book_Open.uasset +++ b/Content/Blueprints/Combat_UI/Gun/Book_Open.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:08cbf2f49eb920dc0e4a0129c681b562ba37a86662112e3413523c76d9804683 -size 89671 +oid sha256:17e54174c9308c93c2666c625ee13b1e22718899b391bcc213cdc8ccf0877853 +size 90378 diff --git a/Content/Blueprints/Combat_UI/Gun/M_BookOpen.uasset b/Content/Blueprints/Combat_UI/Gun/M_BookOpen.uasset index df4aaa4..6eeec71 100644 --- a/Content/Blueprints/Combat_UI/Gun/M_BookOpen.uasset +++ b/Content/Blueprints/Combat_UI/Gun/M_BookOpen.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:2ca4ad422d60a8880d24d95fb59ac21203242852c9462cdf8f1e7958e90afaab -size 11605 +oid sha256:18b97f2b63ac5b7286dfc5299864db9b086c9bc69dcff851cca28fb3353c567c +size 11607 From fd64b18f616208d180a1757706cd61fd783e8520 Mon Sep 17 00:00:00 2001 From: MARCEL HARA Date: Wed, 29 Mar 2023 17:16:50 +0100 Subject: [PATCH 07/11] Updated LOD to all crystals --- Content/Assets/Objects/Crystal/Crystal.uasset | 4 ++-- Content/Assets/Objects/Crystal/Small_Crystal_1.uasset | 4 ++-- Content/Assets/Objects/Crystal/Small_Crystal_2.uasset | 4 ++-- Content/Assets/Objects/Crystal/Small_Crystal_3.uasset | 4 ++-- Content/Assets/Objects/Crystal/crystal_1.uasset | 4 ++-- Content/Assets/Objects/Crystal/crystal_2.uasset | 4 ++-- Content/Assets/Objects/Crystal/crystal_3.uasset | 4 ++-- Content/Levels/Build.umap | 4 ++-- 8 files changed, 16 insertions(+), 16 deletions(-) diff --git a/Content/Assets/Objects/Crystal/Crystal.uasset b/Content/Assets/Objects/Crystal/Crystal.uasset index 4b03528..6af9f6e 100644 --- a/Content/Assets/Objects/Crystal/Crystal.uasset +++ b/Content/Assets/Objects/Crystal/Crystal.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:98d22dbed24662e2f3a52d3c952f538a544d2421d18e08ec787519eb9ff0c02a -size 22894 +oid sha256:cb276f17d8b97323d6b9cb6ac33aa9ab2bf79bc0b92542ed447fbcb4bc5115ac +size 23048 diff --git a/Content/Assets/Objects/Crystal/Small_Crystal_1.uasset b/Content/Assets/Objects/Crystal/Small_Crystal_1.uasset index 26aef4d..7c4e590 100644 --- a/Content/Assets/Objects/Crystal/Small_Crystal_1.uasset +++ b/Content/Assets/Objects/Crystal/Small_Crystal_1.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:add49bfd7ef841f1f641ff08c49499b14d6b60d1808edbe2318ba36142fca879 -size 19534 +oid sha256:6ab50cd703502ae97b3bc9361fd87e5a51f56fa5bf5e4c713702397e5eb042eb +size 19686 diff --git a/Content/Assets/Objects/Crystal/Small_Crystal_2.uasset b/Content/Assets/Objects/Crystal/Small_Crystal_2.uasset index cb34782..8fb8a63 100644 --- a/Content/Assets/Objects/Crystal/Small_Crystal_2.uasset +++ b/Content/Assets/Objects/Crystal/Small_Crystal_2.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:6339ad6c38ac857c2382ab3d3f838f941456208133afd38ea73fc0ce4fd20eed -size 19571 +oid sha256:6fc7ad8ea5e908e93a1d23b3fd8487fe4b3945dc3207143bfc5588383ccf6b5e +size 19723 diff --git a/Content/Assets/Objects/Crystal/Small_Crystal_3.uasset b/Content/Assets/Objects/Crystal/Small_Crystal_3.uasset index 310e164..825b15f 100644 --- a/Content/Assets/Objects/Crystal/Small_Crystal_3.uasset +++ b/Content/Assets/Objects/Crystal/Small_Crystal_3.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3c0f8139e945c0817354e3d64393fa7f2c700674944f72c366531861fdf666ea -size 19709 +oid sha256:ab38cfabbccf41de16305a6625eaff48cf7dd9cfff8d736764f5521bfe8d90a4 +size 19861 diff --git a/Content/Assets/Objects/Crystal/crystal_1.uasset b/Content/Assets/Objects/Crystal/crystal_1.uasset index 7130816..6c1a32e 100644 --- a/Content/Assets/Objects/Crystal/crystal_1.uasset +++ b/Content/Assets/Objects/Crystal/crystal_1.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e484f4e87edc7e00a561c93d375ab56442bd311120d742662b3fbfb67af2ed8e -size 21049 +oid sha256:f13151fe3d1bcdc97ad31c1dce045df1225678f9f83f190db5c561270de05056 +size 21201 diff --git a/Content/Assets/Objects/Crystal/crystal_2.uasset b/Content/Assets/Objects/Crystal/crystal_2.uasset index 4291c15..1e88fae 100644 --- a/Content/Assets/Objects/Crystal/crystal_2.uasset +++ b/Content/Assets/Objects/Crystal/crystal_2.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:2223b444c883bb6ed7dbee2168a39682bd4566c98902e284840f29d05121c27d -size 19774 +oid sha256:8ecc8ebf843b2fa1ba7e72f0ac9fe2750bf2841f2fe26dbc7b42ab43cc5d0d6c +size 19926 diff --git a/Content/Assets/Objects/Crystal/crystal_3.uasset b/Content/Assets/Objects/Crystal/crystal_3.uasset index e9badc8..a5416c2 100644 --- a/Content/Assets/Objects/Crystal/crystal_3.uasset +++ b/Content/Assets/Objects/Crystal/crystal_3.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:1b6a63d510de9d05b718c0f0bbb9cd68217a2fb44e36a71470ae6061dcc12e20 -size 19944 +oid sha256:0c0e7e670ab7b73f5709cbf96a039b6df19790917343af7bf94b6456e40fb3be +size 20096 diff --git a/Content/Levels/Build.umap b/Content/Levels/Build.umap index c731d46..c3fad98 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:667c7d82cd2b957544ca321f7e9e53a2be74bbe550ad79ec1c4836aef8c08f51 -size 3446428 +oid sha256:2017822e0719db4e4ac1f4ba31a14ab2b79277fae78352eb244656e5e926d009 +size 3443629 From 01d90fcb3b51f4cbcd73917450d4addfc6792498 Mon Sep 17 00:00:00 2001 From: Rowland Rowland Date: Thu, 30 Mar 2023 16:03:40 +0100 Subject: [PATCH 08/11] Updated Merchant position and removed an enemy --- Content/Levels/Build.umap | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Content/Levels/Build.umap b/Content/Levels/Build.umap index c3fad98..695bcc0 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:2017822e0719db4e4ac1f4ba31a14ab2b79277fae78352eb244656e5e926d009 -size 3443629 +oid sha256:88966f36eb78e71818b011147ad7453134df4beba3e984307f558c8c8c59916b +size 3445342 From e4187fad253bf941e819b3853a8a6b8bb70afdb4 Mon Sep 17 00:00:00 2001 From: Rowland Rowland Date: Thu, 30 Mar 2023 16:37:05 +0100 Subject: [PATCH 09/11] Removed remnants of hub --- Content/Levels/Build.umap | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Content/Levels/Build.umap b/Content/Levels/Build.umap index 695bcc0..c8004c0 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:88966f36eb78e71818b011147ad7453134df4beba3e984307f558c8c8c59916b -size 3445342 +oid sha256:4e130bb28bbdb003216cf2e86eeb7b7fa93d162c27c4ee6ca5dd3b76588ebb44 +size 3410898 From 574bd4a33d244a5cabe2122aaf8b340a3d3e5490 Mon Sep 17 00:00:00 2001 From: Rowland Rowland Date: Thu, 30 Mar 2023 17:00:22 +0100 Subject: [PATCH 10/11] Added additonal lighting in front of the Merchant's cave The player should now be guided towards the merchant once they enter the cavern --- Content/Levels/Build.umap | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Content/Levels/Build.umap b/Content/Levels/Build.umap index c8004c0..397d738 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:4e130bb28bbdb003216cf2e86eeb7b7fa93d162c27c4ee6ca5dd3b76588ebb44 -size 3410898 +oid sha256:705d7d0200afdd60e9bc619e88c8fad732fd5cec6ff290f60c8fc11e0d865a86 +size 3415724 From fb79fc9bdfd663e931300670083a85c40904fd36 Mon Sep 17 00:00:00 2001 From: Rowland Rowland Date: Thu, 30 Mar 2023 17:01:18 +0100 Subject: [PATCH 11/11] Forgot to save the last change appropriatley --- Content/Levels/Build.umap | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Content/Levels/Build.umap b/Content/Levels/Build.umap index 397d738..57d8b9a 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:705d7d0200afdd60e9bc619e88c8fad732fd5cec6ff290f60c8fc11e0d865a86 +oid sha256:8dd7e8cc00554f32ab41d7dc557d9443f4dbc8896dcc6f48b6c689b6aae2813f size 3415724