From 15e56412faff6cf6510c9bf53f79b89053a69bdb Mon Sep 17 00:00:00 2001 From: Rowland Rowland Date: Thu, 11 May 2023 11:18:24 +0100 Subject: [PATCH 01/18] Changed final room Changed final room to a circular arena --- .../Level_1_Blockout_improvement_textured_Cylinder_004.uasset | 4 ++-- Content/Levels/Build.umap | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Content/Assets/Objects/Updated_level_map/Level_1_Blockout_improvement_textured_Cylinder_004.uasset b/Content/Assets/Objects/Updated_level_map/Level_1_Blockout_improvement_textured_Cylinder_004.uasset index fb08b32..77a0bcd 100644 --- a/Content/Assets/Objects/Updated_level_map/Level_1_Blockout_improvement_textured_Cylinder_004.uasset +++ b/Content/Assets/Objects/Updated_level_map/Level_1_Blockout_improvement_textured_Cylinder_004.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4065a88d9e62dcad5b66c87f41376c8b542a2006597efdd155e812e93b589cbd -size 43335 +oid sha256:68bb67b87d8656eba9aa3a01e5abfa9629b4a506e1f1ee0a4458b2969d784e86 +size 27337 diff --git a/Content/Levels/Build.umap b/Content/Levels/Build.umap index c640827..e9b8e2e 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:68e971da64c020713e1a94799292bb7c0ea575bf17584b69b96714aa99c2ba9b -size 3466781 +oid sha256:ff98e10e6cf23061099c2518075d96c20903a54184f746077830207953c9ebe3 +size 3403556 From 067bb41820d24175fcfa22ac0c3d128589478668 Mon Sep 17 00:00:00 2001 From: PHILIP White Date: Thu, 11 May 2023 11:27:54 +0100 Subject: [PATCH 02/18] Bugfix Stack Overflow on Adding Reward Items --- Source/the_twilight_abyss/Quest/QuestSystem.cpp | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/Source/the_twilight_abyss/Quest/QuestSystem.cpp b/Source/the_twilight_abyss/Quest/QuestSystem.cpp index cf23d06..216d284 100644 --- a/Source/the_twilight_abyss/Quest/QuestSystem.cpp +++ b/Source/the_twilight_abyss/Quest/QuestSystem.cpp @@ -54,12 +54,13 @@ void UQuestSystem::TickComponent(float DeltaTime, ELevelTick TickType, FActorCom void UQuestSystem::CheckActiveQuestConditions() { + TArray JustCompletedQuests; for (UQuest* Quest : ActiveQuests) { if (Quest->CheckConditions(GetWorldState())) { CompletedQuests.Add(Quest); - Quest->ApplyRewards(PlayerInventory); + JustCompletedQuests.Add(Quest); for (TTuple QuestFlag : Quest->QuestFlagsOnComplete) { QuestFlags.Add(QuestFlag.Key, QuestFlag.Value); @@ -79,6 +80,11 @@ void UQuestSystem::CheckActiveQuestConditions() } UpdateQuestGoalsUI(Quest); } + for (UQuest* Quest : JustCompletedQuests) + { + ActiveQuests.Remove(Quest); + Quest->ApplyRewards(PlayerInventory); + } } UWorldState* UQuestSystem::GetWorldState() const From 0741c63162997a3e211a67b19af30c78cd254839 Mon Sep 17 00:00:00 2001 From: EMILY TAYLOR Date: Thu, 11 May 2023 11:42:41 +0100 Subject: [PATCH 03/18] Imported Shop textures Decorated merchant shop and added textures --- .../Assets/Objects/MerchantShop/Lamp_lamp_BaseColor.uasset | 3 +++ Content/Assets/Objects/MerchantShop/Lamp_lamp_Emissive.uasset | 3 +++ Content/Assets/Objects/MerchantShop/Lamp_lamp_Normal.uasset | 3 +++ .../MerchantShop/Lamp_lamp_OcclusionRoughnessMetallic.uasset | 3 +++ Content/Assets/Objects/MerchantShop/M_Lamp.uasset | 3 +++ Content/Assets/Objects/MerchantShop/M_shopDecoObjects.uasset | 3 +++ Content/Assets/Objects/MerchantShop/M_shopWoodObjects.uasset | 3 +++ .../Objects/MerchantShop/MerchantShopModular_Bag_low.uasset | 4 ++-- .../Objects/MerchantShop/MerchantShopModular_Coins_low.uasset | 4 ++-- .../Objects/MerchantShop/MerchantShopModular_Crate_low.uasset | 4 ++-- .../MerchantShop/MerchantShopModular_JellyCube_low.uasset | 4 ++-- .../MerchantShop/MerchantShopModular_JellyJar_low.uasset | 4 ++-- .../Objects/MerchantShop/MerchantShopModular_Lamp_low.uasset | 4 ++-- .../MerchantShop/MerchantShopModular_PotionLong_low.uasset | 4 ++-- .../MerchantShop/MerchantShopModular_PotionRoundB_low.uasset | 4 ++-- .../MerchantShop/MerchantShopModular_Shelves1_low.uasset | 4 ++-- .../Objects/MerchantShop/MerchantShopModular_Table_low.uasset | 4 ++-- .../MerchantShop/MerchantShopModular_barrel2_low.uasset | 4 ++-- .../Objects/MerchantShop/MerchantShopModular_box_low.uasset | 4 ++-- .../Objects/MerchantShop/MerchantShopModular_sac_low.uasset | 4 ++-- .../MerchantShop/MerchantShop_low_Deco_BaseColor.uasset | 3 +++ .../Objects/MerchantShop/MerchantShop_low_Deco_Normal.uasset | 3 +++ .../MerchantShop_low_Deco_OcclusionRoughnessMetallic.uasset | 3 +++ .../MerchantShop/MerchantShop_low_Wood_BaseColor.uasset | 3 +++ .../Objects/MerchantShop/MerchantShop_low_Wood_Normal.uasset | 3 +++ .../MerchantShop_low_Wood_OcclusionRoughnessMetallic.uasset | 3 +++ Content/Levels/Build.umap | 4 ++-- 27 files changed, 67 insertions(+), 28 deletions(-) create mode 100644 Content/Assets/Objects/MerchantShop/Lamp_lamp_BaseColor.uasset create mode 100644 Content/Assets/Objects/MerchantShop/Lamp_lamp_Emissive.uasset create mode 100644 Content/Assets/Objects/MerchantShop/Lamp_lamp_Normal.uasset create mode 100644 Content/Assets/Objects/MerchantShop/Lamp_lamp_OcclusionRoughnessMetallic.uasset create mode 100644 Content/Assets/Objects/MerchantShop/M_Lamp.uasset create mode 100644 Content/Assets/Objects/MerchantShop/M_shopDecoObjects.uasset create mode 100644 Content/Assets/Objects/MerchantShop/M_shopWoodObjects.uasset create mode 100644 Content/Assets/Objects/MerchantShop/MerchantShop_low_Deco_BaseColor.uasset create mode 100644 Content/Assets/Objects/MerchantShop/MerchantShop_low_Deco_Normal.uasset create mode 100644 Content/Assets/Objects/MerchantShop/MerchantShop_low_Deco_OcclusionRoughnessMetallic.uasset create mode 100644 Content/Assets/Objects/MerchantShop/MerchantShop_low_Wood_BaseColor.uasset create mode 100644 Content/Assets/Objects/MerchantShop/MerchantShop_low_Wood_Normal.uasset create mode 100644 Content/Assets/Objects/MerchantShop/MerchantShop_low_Wood_OcclusionRoughnessMetallic.uasset diff --git a/Content/Assets/Objects/MerchantShop/Lamp_lamp_BaseColor.uasset b/Content/Assets/Objects/MerchantShop/Lamp_lamp_BaseColor.uasset new file mode 100644 index 0000000..16fc3a9 --- /dev/null +++ b/Content/Assets/Objects/MerchantShop/Lamp_lamp_BaseColor.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:2877b7619c575fa552569ecfe1059ebbdc4b3bbb582b06304c2e4c68f8a22b1c +size 2713612 diff --git a/Content/Assets/Objects/MerchantShop/Lamp_lamp_Emissive.uasset b/Content/Assets/Objects/MerchantShop/Lamp_lamp_Emissive.uasset new file mode 100644 index 0000000..f3b4e46 --- /dev/null +++ b/Content/Assets/Objects/MerchantShop/Lamp_lamp_Emissive.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:4369c47e8acf52a461b1da1dda37a2f1d4d80909cc39e687ace12c47cfd61a59 +size 16489 diff --git a/Content/Assets/Objects/MerchantShop/Lamp_lamp_Normal.uasset b/Content/Assets/Objects/MerchantShop/Lamp_lamp_Normal.uasset new file mode 100644 index 0000000..87b4040 --- /dev/null +++ b/Content/Assets/Objects/MerchantShop/Lamp_lamp_Normal.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:98c1a2d9f4ce3636ee664fd1388d90f014126d3de02cb34dec45a9aa1faeda45 +size 1439506 diff --git a/Content/Assets/Objects/MerchantShop/Lamp_lamp_OcclusionRoughnessMetallic.uasset b/Content/Assets/Objects/MerchantShop/Lamp_lamp_OcclusionRoughnessMetallic.uasset new file mode 100644 index 0000000..154007d --- /dev/null +++ b/Content/Assets/Objects/MerchantShop/Lamp_lamp_OcclusionRoughnessMetallic.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:bdf7f9d624ffbca670d2a4b38e3503c9daa4537f7a95fd42794d56263181cb3f +size 3020285 diff --git a/Content/Assets/Objects/MerchantShop/M_Lamp.uasset b/Content/Assets/Objects/MerchantShop/M_Lamp.uasset new file mode 100644 index 0000000..7ee7bd2 --- /dev/null +++ b/Content/Assets/Objects/MerchantShop/M_Lamp.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:4c78dd40740810f7c24e07ca7029c4ab2abd897d23a262e9fdacd3ad6e3e3ecb +size 14996 diff --git a/Content/Assets/Objects/MerchantShop/M_shopDecoObjects.uasset b/Content/Assets/Objects/MerchantShop/M_shopDecoObjects.uasset new file mode 100644 index 0000000..62dfa04 --- /dev/null +++ b/Content/Assets/Objects/MerchantShop/M_shopDecoObjects.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ec1bbcb50052f5d2f537765bb655afd5bf081768ec031d84d276579d08a02505 +size 13673 diff --git a/Content/Assets/Objects/MerchantShop/M_shopWoodObjects.uasset b/Content/Assets/Objects/MerchantShop/M_shopWoodObjects.uasset new file mode 100644 index 0000000..d3e8793 --- /dev/null +++ b/Content/Assets/Objects/MerchantShop/M_shopWoodObjects.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:7efb8e1a1d64103fc7ac2acde8bb5bf470d3ab2a9c49c7b5336422abaa2ba748 +size 12294 diff --git a/Content/Assets/Objects/MerchantShop/MerchantShopModular_Bag_low.uasset b/Content/Assets/Objects/MerchantShop/MerchantShopModular_Bag_low.uasset index 718d3a5..6ac4ae8 100644 --- a/Content/Assets/Objects/MerchantShop/MerchantShopModular_Bag_low.uasset +++ b/Content/Assets/Objects/MerchantShop/MerchantShopModular_Bag_low.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:1f6b2b37720adf408908f5e4fa9d0e7fdb374b163de8324d83be0cb52991145d -size 51796 +oid sha256:1491afb891696fb763845aa9db6c6c0f481deb41560f4a4aa8b29fd49776a132 +size 52405 diff --git a/Content/Assets/Objects/MerchantShop/MerchantShopModular_Coins_low.uasset b/Content/Assets/Objects/MerchantShop/MerchantShopModular_Coins_low.uasset index 1daf1d8..6fff799 100644 --- a/Content/Assets/Objects/MerchantShop/MerchantShopModular_Coins_low.uasset +++ b/Content/Assets/Objects/MerchantShop/MerchantShopModular_Coins_low.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:fa5a61732a2262b353644b769430c9761ff82e9ed5ca8d630d355d94125a8953 -size 27141 +oid sha256:8eee9b7c1d5b9de556fa91191f4f982354f44b3a6733338e9b48cd722adac920 +size 27115 diff --git a/Content/Assets/Objects/MerchantShop/MerchantShopModular_Crate_low.uasset b/Content/Assets/Objects/MerchantShop/MerchantShopModular_Crate_low.uasset index 4c5ec29..29731b7 100644 --- a/Content/Assets/Objects/MerchantShop/MerchantShopModular_Crate_low.uasset +++ b/Content/Assets/Objects/MerchantShop/MerchantShopModular_Crate_low.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:0344078b2321f8137df168613de73d0943fb6cc8c3d51a7a484e4df12af4a610 -size 48935 +oid sha256:f32b00ab1f9ee362aad9c1bd7bb0a4514bcb0a69594910c1937f86a49b0ae6c3 +size 49000 diff --git a/Content/Assets/Objects/MerchantShop/MerchantShopModular_JellyCube_low.uasset b/Content/Assets/Objects/MerchantShop/MerchantShopModular_JellyCube_low.uasset index da8ae10..3fbfc77 100644 --- a/Content/Assets/Objects/MerchantShop/MerchantShopModular_JellyCube_low.uasset +++ b/Content/Assets/Objects/MerchantShop/MerchantShopModular_JellyCube_low.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:1c96de59b0974abd801a7315d2dfc4a0240e886955546dd8a858c1726a02217d -size 23022 +oid sha256:b2603c7b923d58ecd4586117e0f7bb15fbc2c2e7c9810f6d9477ba0d18f271dc +size 22195 diff --git a/Content/Assets/Objects/MerchantShop/MerchantShopModular_JellyJar_low.uasset b/Content/Assets/Objects/MerchantShop/MerchantShopModular_JellyJar_low.uasset index 1f29c3b..4ab0745 100644 --- a/Content/Assets/Objects/MerchantShop/MerchantShopModular_JellyJar_low.uasset +++ b/Content/Assets/Objects/MerchantShop/MerchantShopModular_JellyJar_low.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:7e63166802d9289b2e2fec1445a76dbe195aa05e10e26a74840b71dde4360b01 -size 41905 +oid sha256:40b6a98f583413be047669bd34b6ba7a55c0c863ff3a95ed3c55dfb52ca2ed4b +size 36224 diff --git a/Content/Assets/Objects/MerchantShop/MerchantShopModular_Lamp_low.uasset b/Content/Assets/Objects/MerchantShop/MerchantShopModular_Lamp_low.uasset index 59e0d25..50e5ab8 100644 --- a/Content/Assets/Objects/MerchantShop/MerchantShopModular_Lamp_low.uasset +++ b/Content/Assets/Objects/MerchantShop/MerchantShopModular_Lamp_low.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:98e87bced2c5cb3300fd5d5971e91c33c58556a17ab657d532c5b036e5449438 -size 216395 +oid sha256:65ef93d55e907250b0acd497f975915852919af5c0c23954fd15de1ccc7342d6 +size 151278 diff --git a/Content/Assets/Objects/MerchantShop/MerchantShopModular_PotionLong_low.uasset b/Content/Assets/Objects/MerchantShop/MerchantShopModular_PotionLong_low.uasset index 8787c52..7c621bd 100644 --- a/Content/Assets/Objects/MerchantShop/MerchantShopModular_PotionLong_low.uasset +++ b/Content/Assets/Objects/MerchantShop/MerchantShopModular_PotionLong_low.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:303b4b55e1dea3dec3467908f7fd6c2c626b2bfba89810fd9c22f866dd4562dd -size 41587 +oid sha256:5cbaeec980f547e4a67704657df7ca1f2110fdeafac212a85ed74f38afeeb1f0 +size 41464 diff --git a/Content/Assets/Objects/MerchantShop/MerchantShopModular_PotionRoundB_low.uasset b/Content/Assets/Objects/MerchantShop/MerchantShopModular_PotionRoundB_low.uasset index a9c092e..ff6d82c 100644 --- a/Content/Assets/Objects/MerchantShop/MerchantShopModular_PotionRoundB_low.uasset +++ b/Content/Assets/Objects/MerchantShop/MerchantShopModular_PotionRoundB_low.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:1c93bb951d8ec9914e8438c3a2cceb691c8cdde82038fb862f80b3aade2a2583 -size 50006 +oid sha256:983cb42d95f0cf400ad36b2cca8c4a5663737d1d5652732a2457f0cca7e678e4 +size 49787 diff --git a/Content/Assets/Objects/MerchantShop/MerchantShopModular_Shelves1_low.uasset b/Content/Assets/Objects/MerchantShop/MerchantShopModular_Shelves1_low.uasset index e28271c..77227d2 100644 --- a/Content/Assets/Objects/MerchantShop/MerchantShopModular_Shelves1_low.uasset +++ b/Content/Assets/Objects/MerchantShop/MerchantShopModular_Shelves1_low.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:225592daa7a25679d240c6cc04766fa370d454cb0f7488e0a5913e2421b848a4 -size 60277 +oid sha256:83ff644bcb72a98cff11acc3ec7da07826be9039d0a540bffa71f781676adff6 +size 60021 diff --git a/Content/Assets/Objects/MerchantShop/MerchantShopModular_Table_low.uasset b/Content/Assets/Objects/MerchantShop/MerchantShopModular_Table_low.uasset index c69abf1..1e4b675 100644 --- a/Content/Assets/Objects/MerchantShop/MerchantShopModular_Table_low.uasset +++ b/Content/Assets/Objects/MerchantShop/MerchantShopModular_Table_low.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d80697161fe1cb09332c9e8d755ec4bed77e9d369820a4a0ada587635077f885 -size 42056 +oid sha256:397e6c730a7f7ed4909e19efe0b02c201229ca02d8ad07c60b4bdb9d55745f0e +size 41919 diff --git a/Content/Assets/Objects/MerchantShop/MerchantShopModular_barrel2_low.uasset b/Content/Assets/Objects/MerchantShop/MerchantShopModular_barrel2_low.uasset index 8f8a1f7..7207e2e 100644 --- a/Content/Assets/Objects/MerchantShop/MerchantShopModular_barrel2_low.uasset +++ b/Content/Assets/Objects/MerchantShop/MerchantShopModular_barrel2_low.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:dd6f424d1ccc32a61f85632dc9af580f32f8d137f8fb31a6e253a5e72823a102 -size 56639 +oid sha256:c0ec1a0f9e6a8092f6683987c4fa62b77511cdd1f4e30309b3ba66e3b1c40934 +size 56703 diff --git a/Content/Assets/Objects/MerchantShop/MerchantShopModular_box_low.uasset b/Content/Assets/Objects/MerchantShop/MerchantShopModular_box_low.uasset index dfd2497..7cf003e 100644 --- a/Content/Assets/Objects/MerchantShop/MerchantShopModular_box_low.uasset +++ b/Content/Assets/Objects/MerchantShop/MerchantShopModular_box_low.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:16346f6da3c30cdbe153ef3504040df11bb90ae9327900b545457581d166ddfc -size 19502 +oid sha256:8a822fe6b1bbf688f46c11746f6db152547bde952b394d58b387bbf39d48b2dd +size 19122 diff --git a/Content/Assets/Objects/MerchantShop/MerchantShopModular_sac_low.uasset b/Content/Assets/Objects/MerchantShop/MerchantShopModular_sac_low.uasset index 8e1b579..3a43f75 100644 --- a/Content/Assets/Objects/MerchantShop/MerchantShopModular_sac_low.uasset +++ b/Content/Assets/Objects/MerchantShop/MerchantShopModular_sac_low.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d45e30bfa9282e263786243bb7b1839e2168f5d6079569b86612b833bcccc4cf -size 62792 +oid sha256:bf64461ec08eba9c539d5c6a3e29a4bb363fe69981a9bfc6554c06369fcd78ec +size 63415 diff --git a/Content/Assets/Objects/MerchantShop/MerchantShop_low_Deco_BaseColor.uasset b/Content/Assets/Objects/MerchantShop/MerchantShop_low_Deco_BaseColor.uasset new file mode 100644 index 0000000..484b2a7 --- /dev/null +++ b/Content/Assets/Objects/MerchantShop/MerchantShop_low_Deco_BaseColor.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:62383fb608543d51237de82415a2dac27f3c210b976d974eba7edcae4c4e37dc +size 2671654 diff --git a/Content/Assets/Objects/MerchantShop/MerchantShop_low_Deco_Normal.uasset b/Content/Assets/Objects/MerchantShop/MerchantShop_low_Deco_Normal.uasset new file mode 100644 index 0000000..6b80332 --- /dev/null +++ b/Content/Assets/Objects/MerchantShop/MerchantShop_low_Deco_Normal.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:219ea11950fdf331d6ea019947376a0de483d56333916b1cec098c6ce3e7aa24 +size 2192178 diff --git a/Content/Assets/Objects/MerchantShop/MerchantShop_low_Deco_OcclusionRoughnessMetallic.uasset b/Content/Assets/Objects/MerchantShop/MerchantShop_low_Deco_OcclusionRoughnessMetallic.uasset new file mode 100644 index 0000000..9327b52 --- /dev/null +++ b/Content/Assets/Objects/MerchantShop/MerchantShop_low_Deco_OcclusionRoughnessMetallic.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:2a539090ef0e41d6d211296acd0803ac01339212112ba9d3bed9bcc649470719 +size 3048910 diff --git a/Content/Assets/Objects/MerchantShop/MerchantShop_low_Wood_BaseColor.uasset b/Content/Assets/Objects/MerchantShop/MerchantShop_low_Wood_BaseColor.uasset new file mode 100644 index 0000000..960278a --- /dev/null +++ b/Content/Assets/Objects/MerchantShop/MerchantShop_low_Wood_BaseColor.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:789e9eb2f8baa374249f2b6b776740dc3dacfa9d06f6f167d05402d9cfddf1ec +size 838534 diff --git a/Content/Assets/Objects/MerchantShop/MerchantShop_low_Wood_Normal.uasset b/Content/Assets/Objects/MerchantShop/MerchantShop_low_Wood_Normal.uasset new file mode 100644 index 0000000..2b5856f --- /dev/null +++ b/Content/Assets/Objects/MerchantShop/MerchantShop_low_Wood_Normal.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:118464164ff779a44c99cc3a68abb9e61646e6195a03e3f729fc35aa0540a523 +size 991134 diff --git a/Content/Assets/Objects/MerchantShop/MerchantShop_low_Wood_OcclusionRoughnessMetallic.uasset b/Content/Assets/Objects/MerchantShop/MerchantShop_low_Wood_OcclusionRoughnessMetallic.uasset new file mode 100644 index 0000000..e59922c --- /dev/null +++ b/Content/Assets/Objects/MerchantShop/MerchantShop_low_Wood_OcclusionRoughnessMetallic.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a04a8319a5676fc9a61f3f39b7baeb792d0e23398ea7dfebb65aef4a69c561d1 +size 2076675 diff --git a/Content/Levels/Build.umap b/Content/Levels/Build.umap index c640827..5c0b371 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:68e971da64c020713e1a94799292bb7c0ea575bf17584b69b96714aa99c2ba9b -size 3466781 +oid sha256:f8f3b8d12a8db009c3a1592bfe9b9278934454f228864bcfb2fa006deea15275 +size 3479967 From 5bf8d73d21f894fc6df80745b02c98bee277c971 Mon Sep 17 00:00:00 2001 From: MARCEL HARA Date: Thu, 11 May 2023 11:56:03 +0100 Subject: [PATCH 04/18] Fixed UI not being interactable --- Content/Assets/Characters/Merchant/AMerchant.uasset | 4 ++-- Source/the_twilight_abyss/PlayerTemp/TempCharacter.h | 2 ++ 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/Content/Assets/Characters/Merchant/AMerchant.uasset b/Content/Assets/Characters/Merchant/AMerchant.uasset index 926a431..56591b8 100644 --- a/Content/Assets/Characters/Merchant/AMerchant.uasset +++ b/Content/Assets/Characters/Merchant/AMerchant.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:2f600ced864f7a102cf58d11ea26742ee91fb11649a561d28cce90d1044947b1 -size 122614 +oid sha256:c050a646fcf2a871733320d3444d94fa6ac57589c5aa378c353c2adc2d018698 +size 133467 diff --git a/Source/the_twilight_abyss/PlayerTemp/TempCharacter.h b/Source/the_twilight_abyss/PlayerTemp/TempCharacter.h index 1a8b284..3bb60c9 100644 --- a/Source/the_twilight_abyss/PlayerTemp/TempCharacter.h +++ b/Source/the_twilight_abyss/PlayerTemp/TempCharacter.h @@ -55,7 +55,9 @@ public: UPROPERTY(EditAnyWhere) float TraceDistance = 200; + UFUNCTION(BlueprintCallable) void InputDisabler(); + void LineTraceLogic(); UPROPERTY() From 3059e56eb8f813ad9d279181d76d318d4c28466b Mon Sep 17 00:00:00 2001 From: EMILY TAYLOR Date: Thu, 11 May 2023 12:10:33 +0100 Subject: [PATCH 05/18] Added UV map for tunnel UV Mapped tunnel --- .../Level_1_Blockout_improvement_textured_Cube_021.uasset | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Content/Assets/Objects/Updated_level_map/Level_1_Blockout_improvement_textured_Cube_021.uasset b/Content/Assets/Objects/Updated_level_map/Level_1_Blockout_improvement_textured_Cube_021.uasset index 4f08480..217cdf5 100644 --- a/Content/Assets/Objects/Updated_level_map/Level_1_Blockout_improvement_textured_Cube_021.uasset +++ b/Content/Assets/Objects/Updated_level_map/Level_1_Blockout_improvement_textured_Cube_021.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:faafdd2adc0975e80d82635b1861a998585286899e4c5251be87ad898fa713bf -size 3025070 +oid sha256:e3a276afd9bbeec219ffc9e2c6a251da5e1d03dff88de62add501ab490180bf4 +size 3033922 From 2279582438fff52588cb529e773da1d084d2899f Mon Sep 17 00:00:00 2001 From: MARCEL HARA Date: Thu, 11 May 2023 12:11:44 +0100 Subject: [PATCH 06/18] Duplicated build to fix merge --- Content/Levels/Build1.umap | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 Content/Levels/Build1.umap diff --git a/Content/Levels/Build1.umap b/Content/Levels/Build1.umap new file mode 100644 index 0000000..1cf4f72 --- /dev/null +++ b/Content/Levels/Build1.umap @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:3dcd6725cae15728675778ef6b354e65afeac29b4d17244d19c27cf8db49d025 +size 3394495 From 5727ccfb73882a71ec0b05f741500aa9acd1e9bf Mon Sep 17 00:00:00 2001 From: Rowland Rowland Date: Thu, 11 May 2023 12:13:13 +0100 Subject: [PATCH 07/18] Fixed collisions in final room. Added Textures to floor. Added Boss --- .../Level_1_Blockout_improvement_textured_Cylinder_004.uasset | 4 ++-- Content/Levels/Build.umap | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Content/Assets/Objects/Updated_level_map/Level_1_Blockout_improvement_textured_Cylinder_004.uasset b/Content/Assets/Objects/Updated_level_map/Level_1_Blockout_improvement_textured_Cylinder_004.uasset index fb08b32..133a201 100644 --- a/Content/Assets/Objects/Updated_level_map/Level_1_Blockout_improvement_textured_Cylinder_004.uasset +++ b/Content/Assets/Objects/Updated_level_map/Level_1_Blockout_improvement_textured_Cylinder_004.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4065a88d9e62dcad5b66c87f41376c8b542a2006597efdd155e812e93b589cbd -size 43335 +oid sha256:aa26993fafa80e0b3df9266e9ac67f4d9801f1727d9c519e28373ca3c20ae10d +size 43314 diff --git a/Content/Levels/Build.umap b/Content/Levels/Build.umap index c640827..71ad57c 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:68e971da64c020713e1a94799292bb7c0ea575bf17584b69b96714aa99c2ba9b -size 3466781 +oid sha256:64ababceb4703d8b7bd4d3bdcca435b412fd8c95851ec9fde192c2f28759bdc2 +size 3469768 From 094d89bc927b070bf80c4a08dfc3f5db830497d0 Mon Sep 17 00:00:00 2001 From: George Taylor Date: Thu, 11 May 2023 12:16:18 +0100 Subject: [PATCH 08/18] Changed the height of the Boss Room --- .../Level_Environment/Adaptions/boss_room_shorter.uasset | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 Content/Environment/Level_Environment/Adaptions/boss_room_shorter.uasset diff --git a/Content/Environment/Level_Environment/Adaptions/boss_room_shorter.uasset b/Content/Environment/Level_Environment/Adaptions/boss_room_shorter.uasset new file mode 100644 index 0000000..0cac583 --- /dev/null +++ b/Content/Environment/Level_Environment/Adaptions/boss_room_shorter.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:69ca3655c092d3e6e7e51b292b468d990dbb95ad4536326bf46aca18a437bcd1 +size 46246 From d499682a93df84850c03027a66e4f01dd5de1009 Mon Sep 17 00:00:00 2001 From: MARCEL HARA Date: Thu, 11 May 2023 13:54:50 +0100 Subject: [PATCH 09/18] Re-duplicated build --- Content/Levels/Build1.umap | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Content/Levels/Build1.umap b/Content/Levels/Build1.umap index 1cf4f72..0be72e2 100644 --- a/Content/Levels/Build1.umap +++ b/Content/Levels/Build1.umap @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3dcd6725cae15728675778ef6b354e65afeac29b4d17244d19c27cf8db49d025 +oid sha256:67bb6d1de08867bf22bae27d9912c35e28fe5fa558cb496676e2168c6ec56147 size 3394495 From 29b7e9c9e2963252c3d79bfc955d7f33a0b2c0a2 Mon Sep 17 00:00:00 2001 From: MARCEL HARA Date: Thu, 11 May 2023 14:11:08 +0100 Subject: [PATCH 10/18] Fixed Merchant asset merge to dev --- Content/Levels/Build.umap | 4 ++-- Content/Levels/Build1.umap | 3 --- 2 files changed, 2 insertions(+), 5 deletions(-) delete mode 100644 Content/Levels/Build1.umap diff --git a/Content/Levels/Build.umap b/Content/Levels/Build.umap index 5c0b371..6bdee4b 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:f8f3b8d12a8db009c3a1592bfe9b9278934454f228864bcfb2fa006deea15275 -size 3479967 +oid sha256:fa241e4a36861c0bf26afb3a46c865bdba22b97be70da7088f61acab0cdcd9fe +size 3408759 diff --git a/Content/Levels/Build1.umap b/Content/Levels/Build1.umap deleted file mode 100644 index 0be72e2..0000000 --- a/Content/Levels/Build1.umap +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:67bb6d1de08867bf22bae27d9912c35e28fe5fa558cb496676e2168c6ec56147 -size 3394495 From e58cc309fa6626032794ef99d615141fab381bf4 Mon Sep 17 00:00:00 2001 From: MARCEL HARA Date: Thu, 11 May 2023 14:12:12 +0100 Subject: [PATCH 11/18] Duplicated current build for new merges --- Content/Levels/Build1.umap | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 Content/Levels/Build1.umap diff --git a/Content/Levels/Build1.umap b/Content/Levels/Build1.umap new file mode 100644 index 0000000..3ad8f37 --- /dev/null +++ b/Content/Levels/Build1.umap @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d1c210927cab5abe98aae8c2ed2ef0f94ff7637ec7660e6b90aa6f477257118b +size 3408767 From a3d232726e2d8bf09dd506f6f39c010828510d4a Mon Sep 17 00:00:00 2001 From: MARCEL HARA Date: Thu, 11 May 2023 14:37:24 +0100 Subject: [PATCH 12/18] Fixed Merging to Dev --- Content/Assets/Characters/Merchant/AMerchant.uasset | 4 ++-- Content/Levels/Build.umap | 4 ++-- Content/Levels/Build1.umap | 3 --- 3 files changed, 4 insertions(+), 7 deletions(-) delete mode 100644 Content/Levels/Build1.umap diff --git a/Content/Assets/Characters/Merchant/AMerchant.uasset b/Content/Assets/Characters/Merchant/AMerchant.uasset index 56591b8..9a36ca4 100644 --- a/Content/Assets/Characters/Merchant/AMerchant.uasset +++ b/Content/Assets/Characters/Merchant/AMerchant.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c050a646fcf2a871733320d3444d94fa6ac57589c5aa378c353c2adc2d018698 -size 133467 +oid sha256:89570e03c33a6f45c4bb9e5304c526929035264d67e03f44e13548e06aee4392 +size 131048 diff --git a/Content/Levels/Build.umap b/Content/Levels/Build.umap index 71ad57c..4379b1e 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:64ababceb4703d8b7bd4d3bdcca435b412fd8c95851ec9fde192c2f28759bdc2 -size 3469768 +oid sha256:6864b4977e086fe6a5fa8f247f4fe9872c6eb4d6d9d59afebd30783f585dab5e +size 3483440 diff --git a/Content/Levels/Build1.umap b/Content/Levels/Build1.umap deleted file mode 100644 index 3ad8f37..0000000 --- a/Content/Levels/Build1.umap +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:d1c210927cab5abe98aae8c2ed2ef0f94ff7637ec7660e6b90aa6f477257118b -size 3408767 From a54eae08b84ef464274fdc4233b7e4bd677f87c5 Mon Sep 17 00:00:00 2001 From: MARCEL HARA Date: Thu, 11 May 2023 14:38:21 +0100 Subject: [PATCH 13/18] Shadow rebuild to dev --- 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 4379b1e..43b833c 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:6864b4977e086fe6a5fa8f247f4fe9872c6eb4d6d9d59afebd30783f585dab5e +oid sha256:40bdafd3c48be3ea11f497fc68f6f03850282225af2508cdf1fbe37868b51d09 size 3483440 From 2b66a5f804de77a5ff56024446456b400702bef6 Mon Sep 17 00:00:00 2001 From: PHILIP White Date: Thu, 11 May 2023 14:39:40 +0100 Subject: [PATCH 14/18] Updated Combat Character for Camera Clipping Enabled Generate Overlap Events During Level Streaming --- Content/Blueprints/Combat_UI/CombatCharacter.uasset | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Content/Blueprints/Combat_UI/CombatCharacter.uasset b/Content/Blueprints/Combat_UI/CombatCharacter.uasset index 719c678..f59564b 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:5d4955d5f8fd084bdfc0eca37a040b6284cfe5cc1c0ce35b6b07ed55de1a503f -size 193514 +oid sha256:6b2ae1a830661730e84b7aeb7bbb8781ac5a78a7e4454692f362dc73715d76f8 +size 192785 From 3a1e065054272ba1ede10fe2a9b3c7e2fa3eb6d9 Mon Sep 17 00:00:00 2001 From: MARCEL HARA Date: Thu, 11 May 2023 14:51:51 +0100 Subject: [PATCH 15/18] Implimented title to mainmenu --- Content/Blueprints/MainMenu/WBP_MainMenu.uasset | 4 ++-- Content/Images/MainMenuAssets/Title.uasset | 3 +++ 2 files changed, 5 insertions(+), 2 deletions(-) create mode 100644 Content/Images/MainMenuAssets/Title.uasset diff --git a/Content/Blueprints/MainMenu/WBP_MainMenu.uasset b/Content/Blueprints/MainMenu/WBP_MainMenu.uasset index 2e3f53a..0fe6d48 100644 --- a/Content/Blueprints/MainMenu/WBP_MainMenu.uasset +++ b/Content/Blueprints/MainMenu/WBP_MainMenu.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ad378117504d9f7ece28b2dfb0cfb153be8e22a0bb0781bc5f4b83b2e176dd19 -size 253293 +oid sha256:fa2ed80b0b9119b03431e5052eaef34d9cca1b355f90980e864d17917b444fe6 +size 258409 diff --git a/Content/Images/MainMenuAssets/Title.uasset b/Content/Images/MainMenuAssets/Title.uasset new file mode 100644 index 0000000..6dd9dc9 --- /dev/null +++ b/Content/Images/MainMenuAssets/Title.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:af92e54e5cf088355a2ee874c541d79c220a4f3ee5a2b5140c4b237cec858ddb +size 772846 From e687e67242568d6381df2312d3d393923aa1aa5d Mon Sep 17 00:00:00 2001 From: MARCEL HARA Date: Thu, 11 May 2023 15:14:50 +0100 Subject: [PATCH 16/18] Added Credits to MainMenu and QOL changes --- Content/Blueprints/MainMenu/WBP_MainMenu.uasset | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Content/Blueprints/MainMenu/WBP_MainMenu.uasset b/Content/Blueprints/MainMenu/WBP_MainMenu.uasset index 0fe6d48..bbb6e8e 100644 --- a/Content/Blueprints/MainMenu/WBP_MainMenu.uasset +++ b/Content/Blueprints/MainMenu/WBP_MainMenu.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:fa2ed80b0b9119b03431e5052eaef34d9cca1b355f90980e864d17917b444fe6 -size 258409 +oid sha256:7f75413ab24d91c9ef7fb528ccb043e3ff96a3892c2a37634a2bae22608c16af +size 265754 From cda1258df0b07a65a407bf01b41802c53476d607 Mon Sep 17 00:00:00 2001 From: Blue Probert Date: Thu, 11 May 2023 15:54:17 +0100 Subject: [PATCH 17/18] Added Sound Effects and Music Track. Added 15 different sound effects and 1 song with one of the track being the full song as well as having one of each layer seperate. --- Misc/Music Demo/Music/Azure (Bass Melody).wav | 3 +++ Misc/Music Demo/Music/Azure (Bass).wav | 3 +++ Misc/Music Demo/Music/Azure (Guitar).wav | 3 +++ Misc/Music Demo/Music/Azure(Full).wav | 3 +++ Misc/Music Demo/Music/Azure(Heart).wav | 3 +++ Misc/Music Demo/{ => Old Stuff}/GameMusicTest1.wav | 0 Misc/Music Demo/{ => Old Stuff}/GameMusicTest2.wav | 0 Misc/Music Demo/{ => Old Stuff}/Usable Demo Music.wav | 0 Misc/Music Demo/Sound Effects/Ambiance.wav | 3 +++ Misc/Music Demo/Sound Effects/Boss Hit.wav | 3 +++ Misc/Music Demo/Sound Effects/Boss Hitting.wav | 3 +++ Misc/Music Demo/Sound Effects/Boss Noise.wav | 3 +++ Misc/Music Demo/Sound Effects/Crystal Buzz.wav | 3 +++ Misc/Music Demo/Sound Effects/Dry Fire.wav | 3 +++ Misc/Music Demo/Sound Effects/Fire Crackling.wav | 3 +++ Misc/Music Demo/Sound Effects/Goat Hit.wav | 3 +++ Misc/Music Demo/Sound Effects/Mutant Goat Bleet.wav | 3 +++ Misc/Music Demo/Sound Effects/Rope Bridge.wav | 3 +++ Misc/Music Demo/Sound Effects/Sear.wav | 3 +++ Misc/Music Demo/Sound Effects/Shot Fire.wav | 3 +++ Misc/Music Demo/Sound Effects/Sprint.wav | 3 +++ Misc/Music Demo/Sound Effects/Walking.wav | 3 +++ Misc/Music Demo/Sound Effects/Wall Break.wav | 3 +++ 23 files changed, 60 insertions(+) create mode 100644 Misc/Music Demo/Music/Azure (Bass Melody).wav create mode 100644 Misc/Music Demo/Music/Azure (Bass).wav create mode 100644 Misc/Music Demo/Music/Azure (Guitar).wav create mode 100644 Misc/Music Demo/Music/Azure(Full).wav create mode 100644 Misc/Music Demo/Music/Azure(Heart).wav rename Misc/Music Demo/{ => Old Stuff}/GameMusicTest1.wav (100%) rename Misc/Music Demo/{ => Old Stuff}/GameMusicTest2.wav (100%) rename Misc/Music Demo/{ => Old Stuff}/Usable Demo Music.wav (100%) create mode 100644 Misc/Music Demo/Sound Effects/Ambiance.wav create mode 100644 Misc/Music Demo/Sound Effects/Boss Hit.wav create mode 100644 Misc/Music Demo/Sound Effects/Boss Hitting.wav create mode 100644 Misc/Music Demo/Sound Effects/Boss Noise.wav create mode 100644 Misc/Music Demo/Sound Effects/Crystal Buzz.wav create mode 100644 Misc/Music Demo/Sound Effects/Dry Fire.wav create mode 100644 Misc/Music Demo/Sound Effects/Fire Crackling.wav create mode 100644 Misc/Music Demo/Sound Effects/Goat Hit.wav create mode 100644 Misc/Music Demo/Sound Effects/Mutant Goat Bleet.wav create mode 100644 Misc/Music Demo/Sound Effects/Rope Bridge.wav create mode 100644 Misc/Music Demo/Sound Effects/Sear.wav create mode 100644 Misc/Music Demo/Sound Effects/Shot Fire.wav create mode 100644 Misc/Music Demo/Sound Effects/Sprint.wav create mode 100644 Misc/Music Demo/Sound Effects/Walking.wav create mode 100644 Misc/Music Demo/Sound Effects/Wall Break.wav diff --git a/Misc/Music Demo/Music/Azure (Bass Melody).wav b/Misc/Music Demo/Music/Azure (Bass Melody).wav new file mode 100644 index 0000000..4646a75 --- /dev/null +++ b/Misc/Music Demo/Music/Azure (Bass Melody).wav @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:37d20ad1fa2385bc398fa9acc49414efd10369bd4d5b059c66f18742e76098af +size 50522678 diff --git a/Misc/Music Demo/Music/Azure (Bass).wav b/Misc/Music Demo/Music/Azure (Bass).wav new file mode 100644 index 0000000..482bff5 --- /dev/null +++ b/Misc/Music Demo/Music/Azure (Bass).wav @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c42b4e8dce3db8e79c3ce8a06ccf7c6c68367ed0b68267c4cb3f21bf798e049d +size 50522666 diff --git a/Misc/Music Demo/Music/Azure (Guitar).wav b/Misc/Music Demo/Music/Azure (Guitar).wav new file mode 100644 index 0000000..798ad2f --- /dev/null +++ b/Misc/Music Demo/Music/Azure (Guitar).wav @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:edeaff9897ea7ea1087700572dd62afebd23241263705900f05110167172d331 +size 50522670 diff --git a/Misc/Music Demo/Music/Azure(Full).wav b/Misc/Music Demo/Music/Azure(Full).wav new file mode 100644 index 0000000..aa3b188 --- /dev/null +++ b/Misc/Music Demo/Music/Azure(Full).wav @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:499a86b058b663303026da01417463c3f98604c8c49d57ada5984944cec8c750 +size 50522666 diff --git a/Misc/Music Demo/Music/Azure(Heart).wav b/Misc/Music Demo/Music/Azure(Heart).wav new file mode 100644 index 0000000..7c16d17 --- /dev/null +++ b/Misc/Music Demo/Music/Azure(Heart).wav @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:49c6ceeef79e3b046ed140da6930665b249f7defa717b82a5693886895e55748 +size 50522666 diff --git a/Misc/Music Demo/GameMusicTest1.wav b/Misc/Music Demo/Old Stuff/GameMusicTest1.wav similarity index 100% rename from Misc/Music Demo/GameMusicTest1.wav rename to Misc/Music Demo/Old Stuff/GameMusicTest1.wav diff --git a/Misc/Music Demo/GameMusicTest2.wav b/Misc/Music Demo/Old Stuff/GameMusicTest2.wav similarity index 100% rename from Misc/Music Demo/GameMusicTest2.wav rename to Misc/Music Demo/Old Stuff/GameMusicTest2.wav diff --git a/Misc/Music Demo/Usable Demo Music.wav b/Misc/Music Demo/Old Stuff/Usable Demo Music.wav similarity index 100% rename from Misc/Music Demo/Usable Demo Music.wav rename to Misc/Music Demo/Old Stuff/Usable Demo Music.wav diff --git a/Misc/Music Demo/Sound Effects/Ambiance.wav b/Misc/Music Demo/Sound Effects/Ambiance.wav new file mode 100644 index 0000000..d29dc83 --- /dev/null +++ b/Misc/Music Demo/Sound Effects/Ambiance.wav @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:39a75164dcb2797dff931131c9d7d8ad51d3c4013af75a2e4ebe738eb8b4f850 +size 97484042 diff --git a/Misc/Music Demo/Sound Effects/Boss Hit.wav b/Misc/Music Demo/Sound Effects/Boss Hit.wav new file mode 100644 index 0000000..613dd43 --- /dev/null +++ b/Misc/Music Demo/Sound Effects/Boss Hit.wav @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ab9370dfa87b8c77d58015685bd9ea34e747e8e038494453c5351896ee8bbc0b +size 864962 diff --git a/Misc/Music Demo/Sound Effects/Boss Hitting.wav b/Misc/Music Demo/Sound Effects/Boss Hitting.wav new file mode 100644 index 0000000..a2657ac --- /dev/null +++ b/Misc/Music Demo/Sound Effects/Boss Hitting.wav @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:3a60fb9ac4bb2f347eba3b4094256480bd3ead2fea6a88fe3d2329d1c7257cee +size 649484 diff --git a/Misc/Music Demo/Sound Effects/Boss Noise.wav b/Misc/Music Demo/Sound Effects/Boss Noise.wav new file mode 100644 index 0000000..f27d2f8 --- /dev/null +++ b/Misc/Music Demo/Sound Effects/Boss Noise.wav @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a13e3f5aece37446bcf8f7148cf66c14404463da626044b92cb0cb61827a10db +size 1688576 diff --git a/Misc/Music Demo/Sound Effects/Crystal Buzz.wav b/Misc/Music Demo/Sound Effects/Crystal Buzz.wav new file mode 100644 index 0000000..edca5b4 --- /dev/null +++ b/Misc/Music Demo/Sound Effects/Crystal Buzz.wav @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c2c629ef91ad241d80ed19e7d70499c02cc371790a72ab031a0f7b09c949be34 +size 6051644 diff --git a/Misc/Music Demo/Sound Effects/Dry Fire.wav b/Misc/Music Demo/Sound Effects/Dry Fire.wav new file mode 100644 index 0000000..709f44b --- /dev/null +++ b/Misc/Music Demo/Sound Effects/Dry Fire.wav @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:8862639c05bcfee0603c7a0fbe10c6be258a697b2c8d507ef0092902fba2a034 +size 60476 diff --git a/Misc/Music Demo/Sound Effects/Fire Crackling.wav b/Misc/Music Demo/Sound Effects/Fire Crackling.wav new file mode 100644 index 0000000..bd08268 --- /dev/null +++ b/Misc/Music Demo/Sound Effects/Fire Crackling.wav @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a7d9c7786e6ab636810e5ec22cb0136afce4315562b041f7b07b8c9c01635306 +size 28824092 diff --git a/Misc/Music Demo/Sound Effects/Goat Hit.wav b/Misc/Music Demo/Sound Effects/Goat Hit.wav new file mode 100644 index 0000000..a51f7a4 --- /dev/null +++ b/Misc/Music Demo/Sound Effects/Goat Hit.wav @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:305216c78678307c2fa161997e3a9140b45ebec447548a6fbc9eadb0f3215086 +size 194318 diff --git a/Misc/Music Demo/Sound Effects/Mutant Goat Bleet.wav b/Misc/Music Demo/Sound Effects/Mutant Goat Bleet.wav new file mode 100644 index 0000000..5c05c55 --- /dev/null +++ b/Misc/Music Demo/Sound Effects/Mutant Goat Bleet.wav @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:271e62bda225a16e13bd036f5b5c2feaa7e918fa7a374f555053cef4dbcd3592 +size 1190504 diff --git a/Misc/Music Demo/Sound Effects/Rope Bridge.wav b/Misc/Music Demo/Sound Effects/Rope Bridge.wav new file mode 100644 index 0000000..2dbd37b --- /dev/null +++ b/Misc/Music Demo/Sound Effects/Rope Bridge.wav @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:50539974ac96b41e26930d9def97c28f1445fbab9be02353ce08020cb3366d46 +size 32957684 diff --git a/Misc/Music Demo/Sound Effects/Sear.wav b/Misc/Music Demo/Sound Effects/Sear.wav new file mode 100644 index 0000000..7fa4b70 --- /dev/null +++ b/Misc/Music Demo/Sound Effects/Sear.wav @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:bf0636613fb992f734bbdfce98b68489bf961350571e5c14ea811edd2e18bc75 +size 456716 diff --git a/Misc/Music Demo/Sound Effects/Shot Fire.wav b/Misc/Music Demo/Sound Effects/Shot Fire.wav new file mode 100644 index 0000000..71058d2 --- /dev/null +++ b/Misc/Music Demo/Sound Effects/Shot Fire.wav @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:056d64b027aaacdc7bae7994b36cbb9cee9554db2533c2c49e69f99aa9469927 +size 635264 diff --git a/Misc/Music Demo/Sound Effects/Sprint.wav b/Misc/Music Demo/Sound Effects/Sprint.wav new file mode 100644 index 0000000..88a12d1 --- /dev/null +++ b/Misc/Music Demo/Sound Effects/Sprint.wav @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:15c9857419ab65823ae2f67f8bb9852c4f9695356c08f61f58c858cd081b8f54 +size 338150 diff --git a/Misc/Music Demo/Sound Effects/Walking.wav b/Misc/Music Demo/Sound Effects/Walking.wav new file mode 100644 index 0000000..24cb695 --- /dev/null +++ b/Misc/Music Demo/Sound Effects/Walking.wav @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:8f951bd5305859f940cd89b7de59d2e1d58bdf473c84605353f53f5b40d8f54c +size 704114 diff --git a/Misc/Music Demo/Sound Effects/Wall Break.wav b/Misc/Music Demo/Sound Effects/Wall Break.wav new file mode 100644 index 0000000..e1ae4ed --- /dev/null +++ b/Misc/Music Demo/Sound Effects/Wall Break.wav @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:3f753e8b2ad610dbaaf3f28ef4684681ef03098e3e32cc899224ce98b8552e0d +size 1628564 From 5089d7a72dd1eb096eeb14401d8fb88970fcb8da Mon Sep 17 00:00:00 2001 From: Phoebe Harris-Wilson Date: Thu, 11 May 2023 16:31:55 +0100 Subject: [PATCH 18/18] UI health and buff png's and cave in studios the health and buff pngs r in the ui content folder and the team logo is in the team logo folder. --- Team logo/Cave in studios.png | 3 +++ UI designs/ui buff/UI buff.png | 3 +++ UI designs/ui health/UI health.png | 3 +++ 3 files changed, 9 insertions(+) create mode 100644 Team logo/Cave in studios.png create mode 100644 UI designs/ui buff/UI buff.png create mode 100644 UI designs/ui health/UI health.png diff --git a/Team logo/Cave in studios.png b/Team logo/Cave in studios.png new file mode 100644 index 0000000..4190cef --- /dev/null +++ b/Team logo/Cave in studios.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ef0e3b701471afbc0211b22af8d17d9ff0ec6b0ca0121240009b9ba07cd541db +size 17396 diff --git a/UI designs/ui buff/UI buff.png b/UI designs/ui buff/UI buff.png new file mode 100644 index 0000000..1dc33b8 --- /dev/null +++ b/UI designs/ui buff/UI buff.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f9bdc8f6dd0be947aad5029c5c5a6d65f9cad04df2f1c89152baad2f800b32fd +size 17593 diff --git a/UI designs/ui health/UI health.png b/UI designs/ui health/UI health.png new file mode 100644 index 0000000..b65e342 --- /dev/null +++ b/UI designs/ui health/UI health.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e505c02cef88e9691b13c28101a6025e2b08ccde85107198bb123d8996f070bc +size 18859