From df2d1031847672bf1adcdd6086d41ac961b6a945 Mon Sep 17 00:00:00 2001 From: Alicia Date: Wed, 26 Apr 2023 18:21:11 +0100 Subject: [PATCH 01/12] changed the walking cycle --- ALICIA/NEW/GOAT.mb | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 ALICIA/NEW/GOAT.mb diff --git a/ALICIA/NEW/GOAT.mb b/ALICIA/NEW/GOAT.mb new file mode 100644 index 0000000..55619a9 --- /dev/null +++ b/ALICIA/NEW/GOAT.mb @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:21b7e3bcea6d2dfb8e2b343c7e6efcba1abe2d9b12167595d8b53a4ea06f5c91 +size 1642132 From 6c3692b9aecdb8ef676075093486f25405c5b5d1 Mon Sep 17 00:00:00 2001 From: Alicia Date: Wed, 26 Apr 2023 18:21:33 +0100 Subject: [PATCH 02/12] merchant rig --- ALICIA/NEW/WETPAINTFINISHED.mb | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 ALICIA/NEW/WETPAINTFINISHED.mb diff --git a/ALICIA/NEW/WETPAINTFINISHED.mb b/ALICIA/NEW/WETPAINTFINISHED.mb new file mode 100644 index 0000000..f5d8b91 --- /dev/null +++ b/ALICIA/NEW/WETPAINTFINISHED.mb @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:70e4e9098b6442b29ab39947649df249efbf99e7ab695f6419550d96f71f26d5 +size 4375900 From 97d0cb25059ff4a0d30da412cd9c013e748ef976 Mon Sep 17 00:00:00 2001 From: Kacper Szelest Date: Thu, 27 Apr 2023 16:15:31 +0100 Subject: [PATCH 03/12] Created collisions for level Added collisions for certain objects which didnt have any --- .../Level_1_Blockout_improvement_textured_Cube_004.uasset | 4 ++-- .../Level_1_Blockout_improvement_textured_Cube_021.uasset | 4 ++-- .../Level_1_Blockout_improvement_textured_Cylinder_001.uasset | 4 ++-- .../Level_1_Blockout_improvement_textured_Cylinder_020.uasset | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/Content/Assets/Objects/Updated_level_map/Level_1_Blockout_improvement_textured_Cube_004.uasset b/Content/Assets/Objects/Updated_level_map/Level_1_Blockout_improvement_textured_Cube_004.uasset index a7d82cb..d1dedca 100644 --- a/Content/Assets/Objects/Updated_level_map/Level_1_Blockout_improvement_textured_Cube_004.uasset +++ b/Content/Assets/Objects/Updated_level_map/Level_1_Blockout_improvement_textured_Cube_004.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:cbce6001129348da67c21c16ab810cece0203419d423247a32162a19de2d11f4 -size 18184 +oid sha256:ae63e2df8cb4309d8f1a5939f271fffae85e686ceb7879c94f8080af2e90c775 +size 18889 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 789d3d1..208201d 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:b92fea7be4de838b3aa32987b95041ef5a63f343200be6a5fe8f8387692ce000 -size 2968604 +oid sha256:cad0ed7ada0701878b4ad795d972b9e9c05ae90d573901c2bc6b12044c8e3fa9 +size 2968621 diff --git a/Content/Assets/Objects/Updated_level_map/Level_1_Blockout_improvement_textured_Cylinder_001.uasset b/Content/Assets/Objects/Updated_level_map/Level_1_Blockout_improvement_textured_Cylinder_001.uasset index 49d6ba5..5a781ab 100644 --- a/Content/Assets/Objects/Updated_level_map/Level_1_Blockout_improvement_textured_Cylinder_001.uasset +++ b/Content/Assets/Objects/Updated_level_map/Level_1_Blockout_improvement_textured_Cylinder_001.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:05ef9d2973bb7f4297f7acdea5790e8ee0d357a16b26c70627b0d9e412f62069 -size 23128 +oid sha256:4a1a6bfac8730409bb0f6d104ec2cdf8797e2189b9e2f8158451b11d36ade561 +size 23755 diff --git a/Content/Assets/Objects/Updated_level_map/Level_1_Blockout_improvement_textured_Cylinder_020.uasset b/Content/Assets/Objects/Updated_level_map/Level_1_Blockout_improvement_textured_Cylinder_020.uasset index 4490d54..23ded3c 100644 --- a/Content/Assets/Objects/Updated_level_map/Level_1_Blockout_improvement_textured_Cylinder_020.uasset +++ b/Content/Assets/Objects/Updated_level_map/Level_1_Blockout_improvement_textured_Cylinder_020.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:dc562d87301710f65585c288f107d60b23ce200c9f60a8626a6ec480b5d0c1df -size 29561 +oid sha256:c46bff4f191dcea47fb842821ff64a1a7e9081d6508842f1813d8eb2b6be2116 +size 29708 From 6c3e3584605309b2cb1f76c8ae5eee77571c302a Mon Sep 17 00:00:00 2001 From: Kacper Szelest Date: Thu, 27 Apr 2023 16:21:21 +0100 Subject: [PATCH 04/12] Updated tunnels I added the improved tunnels which werent in already --- .../Level_1_Blockout_improvement_textured_Cube_005.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_Cube_005.uasset b/Content/Assets/Objects/Updated_level_map/Level_1_Blockout_improvement_textured_Cube_005.uasset index 94657de..fcefec6 100644 --- a/Content/Assets/Objects/Updated_level_map/Level_1_Blockout_improvement_textured_Cube_005.uasset +++ b/Content/Assets/Objects/Updated_level_map/Level_1_Blockout_improvement_textured_Cube_005.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:73bad4234daaab54b5c8add3217c0073d778caccbd85d002efeee4395a4067ab -size 17150 +oid sha256:570724221a91ad586ab2a594f175248beda84b9190848854761eeafe02538b47 +size 17338 diff --git a/Content/Levels/Build.umap b/Content/Levels/Build.umap index 6538cb0..dbc4f15 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:2c4f95034b5002bbd1f6774cddd50b3e24090c174766d140f9083f980de03896 -size 3477301 +oid sha256:e6bd3421c56d0ae55409a89efacf3d4943304d76841b04b9fa298cb2e9c6f0b6 +size 3487167 From e2dd3cfd9c105a12f80173a275fe6a315f8c0fb5 Mon Sep 17 00:00:00 2001 From: Kacper Szelest Date: Thu, 27 Apr 2023 16:25:12 +0100 Subject: [PATCH 05/12] Added quest giver I added the quest giver into the game so we can have quests --- 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 dbc4f15..1ec82f1 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:e6bd3421c56d0ae55409a89efacf3d4943304d76841b04b9fa298cb2e9c6f0b6 -size 3487167 +oid sha256:cd2e6ac88320217af6539d0d887a92c37d29988005b3ced588c7903e44ad7c7b +size 3489162 From f990cd20c932f2b8728dceabadab119b19afdeaf Mon Sep 17 00:00:00 2001 From: Kacper Szelest Date: Thu, 27 Apr 2023 16:40:55 +0100 Subject: [PATCH 06/12] Added quest giver mesh Added the quest giver mesh into the world space so you can recieve quests from her --- 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 1ec82f1..4b632f9 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:cd2e6ac88320217af6539d0d887a92c37d29988005b3ced588c7903e44ad7c7b -size 3489162 +oid sha256:9f5bb6ed402345debdb6b0a965ad591e20dd0b8b0199a939f1ad0b95225baf13 +size 3499955 From 1d076b851bbe6c96dcf997e359ed5920e270235c Mon Sep 17 00:00:00 2001 From: Kacper Szelest Date: Thu, 27 Apr 2023 16:42:40 +0100 Subject: [PATCH 07/12] Implemented the quest system I implemented the quest system into the game --- Content/Dialogue/SM_Merchant_Blueprint.uasset | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 Content/Dialogue/SM_Merchant_Blueprint.uasset diff --git a/Content/Dialogue/SM_Merchant_Blueprint.uasset b/Content/Dialogue/SM_Merchant_Blueprint.uasset new file mode 100644 index 0000000..a94fbbd --- /dev/null +++ b/Content/Dialogue/SM_Merchant_Blueprint.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c8558a29f7d81b3b9c2e4ebf82cd6e08f123f9443b85446a4aec5c53459ef138 +size 73675 From f8e130f7278fb4314352d4a8a7f91293c470357e Mon Sep 17 00:00:00 2001 From: Kacper Szelest Date: Thu, 27 Apr 2023 16:47:26 +0100 Subject: [PATCH 08/12] Fixed quest system I fixed the quest system and made it interactable --- Content/Blueprints/Combat_UI/CombatCharacter.uasset | 4 ++-- Content/Levels/Build.umap | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Content/Blueprints/Combat_UI/CombatCharacter.uasset b/Content/Blueprints/Combat_UI/CombatCharacter.uasset index 1b1d3f6..5e5fb42 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:d1cede40c31d3cb3cde60064203ae42e0035f14885f2d48f361ac9f0f8a754cd -size 157935 +oid sha256:03e8bd4b7be18b121bff5df6c1f758d4322e78b21a7f5a6f8c9f842690b095aa +size 158030 diff --git a/Content/Levels/Build.umap b/Content/Levels/Build.umap index 4b632f9..9598dfb 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:9f5bb6ed402345debdb6b0a965ad591e20dd0b8b0199a939f1ad0b95225baf13 -size 3499955 +oid sha256:a0ed2bd7421a1a47279c538157de1d31a5ba596027e96809f533401451099457 +size 3500025 From 4579c739298222573d8c48f09e42e4d1a0e10d36 Mon Sep 17 00:00:00 2001 From: Rowland Rowland Date: Thu, 27 Apr 2023 17:20:07 +0100 Subject: [PATCH 09/12] Fixed collision issues Had an issue on Monday, seems to be fixed and pushed now --- .../Level_1_Blockout_improvement_textured_Cube.uasset | 4 ++-- .../Level_1_Blockout_improvement_textured_Cube_001.uasset | 4 ++-- .../Level_1_Blockout_improvement_textured_Cube_002.uasset | 4 ++-- .../Level_1_Blockout_improvement_textured_Cube_003.uasset | 4 ++-- .../Level_1_Blockout_improvement_textured_Cube_004.uasset | 4 ++-- .../Level_1_Blockout_improvement_textured_Plane.uasset | 4 ++-- 6 files changed, 12 insertions(+), 12 deletions(-) diff --git a/Content/Assets/Objects/Updated_level_map/Level_1_Blockout_improvement_textured_Cube.uasset b/Content/Assets/Objects/Updated_level_map/Level_1_Blockout_improvement_textured_Cube.uasset index 6e6caa2..700391f 100644 --- a/Content/Assets/Objects/Updated_level_map/Level_1_Blockout_improvement_textured_Cube.uasset +++ b/Content/Assets/Objects/Updated_level_map/Level_1_Blockout_improvement_textured_Cube.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3ed66ce0b17f4e50bf58d52b2bb5e1dfc21be12bef0966cfcc531c4556b4baa8 -size 17136 +oid sha256:c4958b921c298a2989b518c702132ff3b6400a1e3d36ba33b3951de9e1f9fda8 +size 17250 diff --git a/Content/Assets/Objects/Updated_level_map/Level_1_Blockout_improvement_textured_Cube_001.uasset b/Content/Assets/Objects/Updated_level_map/Level_1_Blockout_improvement_textured_Cube_001.uasset index 26738c7..3c03f67 100644 --- a/Content/Assets/Objects/Updated_level_map/Level_1_Blockout_improvement_textured_Cube_001.uasset +++ b/Content/Assets/Objects/Updated_level_map/Level_1_Blockout_improvement_textured_Cube_001.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:381f5e614c751c0bed140539fac43063a7f193be6abee9f8e82939206ce89805 -size 17378 +oid sha256:1c0dee0cbc2207338e24fe2aafcd9866ee2b71b746a9f58f28010451398b43cd +size 17522 diff --git a/Content/Assets/Objects/Updated_level_map/Level_1_Blockout_improvement_textured_Cube_002.uasset b/Content/Assets/Objects/Updated_level_map/Level_1_Blockout_improvement_textured_Cube_002.uasset index 9a66d2b..4c051e2 100644 --- a/Content/Assets/Objects/Updated_level_map/Level_1_Blockout_improvement_textured_Cube_002.uasset +++ b/Content/Assets/Objects/Updated_level_map/Level_1_Blockout_improvement_textured_Cube_002.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:7c85a783b1c3993f8037f90b662fc9cb353129035db8cb9171161dc46e24c5bb -size 17462 +oid sha256:84d954bc4a7b75a649b486c165017611ad0205d69289622e2c18578c2a7d0665 +size 17585 diff --git a/Content/Assets/Objects/Updated_level_map/Level_1_Blockout_improvement_textured_Cube_003.uasset b/Content/Assets/Objects/Updated_level_map/Level_1_Blockout_improvement_textured_Cube_003.uasset index 8c67c3a..5f67b33 100644 --- a/Content/Assets/Objects/Updated_level_map/Level_1_Blockout_improvement_textured_Cube_003.uasset +++ b/Content/Assets/Objects/Updated_level_map/Level_1_Blockout_improvement_textured_Cube_003.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a129cc01ee788f0228a6199d396cdcc44f1d7f85aa000f4fe34ff1612bdc7491 -size 17601 +oid sha256:61489e36869d37cf4c1d4b5fc1611a738d4dd807eafcbd369e73f806c70eb9ab +size 17714 diff --git a/Content/Assets/Objects/Updated_level_map/Level_1_Blockout_improvement_textured_Cube_004.uasset b/Content/Assets/Objects/Updated_level_map/Level_1_Blockout_improvement_textured_Cube_004.uasset index a7d82cb..af3e7aa 100644 --- a/Content/Assets/Objects/Updated_level_map/Level_1_Blockout_improvement_textured_Cube_004.uasset +++ b/Content/Assets/Objects/Updated_level_map/Level_1_Blockout_improvement_textured_Cube_004.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:cbce6001129348da67c21c16ab810cece0203419d423247a32162a19de2d11f4 -size 18184 +oid sha256:abbc5f0479834de902a1c10c0f7602f60642538e0085bf346c15f3055e413f80 +size 19438 diff --git a/Content/Assets/Objects/Updated_level_map/Level_1_Blockout_improvement_textured_Plane.uasset b/Content/Assets/Objects/Updated_level_map/Level_1_Blockout_improvement_textured_Plane.uasset index 4c183f7..15ff9d6 100644 --- a/Content/Assets/Objects/Updated_level_map/Level_1_Blockout_improvement_textured_Plane.uasset +++ b/Content/Assets/Objects/Updated_level_map/Level_1_Blockout_improvement_textured_Plane.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:107e926c6d5b7c9f9efcb5e5ed02d84dd361b9f79adefc9c5c7ac643a7eff6a8 -size 234506 +oid sha256:113b68a6fc4908f0e339c8d6605704c1e8a9b8a19ae6e8d4ba5325ec897e22e7 +size 232738 From b4a8af9d43a2c9ef62f570f386035d5ad45cae40 Mon Sep 17 00:00:00 2001 From: Rowland Rowland Date: Thu, 27 Apr 2023 17:28:49 +0100 Subject: [PATCH 10/12] Added platform for quest giver Copied temporary platform at rope bridge and placed one next to it for the guest giver --- 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 6538cb0..ad6c3ad 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:2c4f95034b5002bbd1f6774cddd50b3e24090c174766d140f9083f980de03896 -size 3477301 +oid sha256:143a10a51a3efdab3c44d0db18be4ecaa59c1666225fcac3e04e4dabf8db5b15 +size 3463988 From 6865b506b865aa8d91ddb29fd03df097b98e6f74 Mon Sep 17 00:00:00 2001 From: Rowland Rowland Date: Thu, 27 Apr 2023 17:35:46 +0100 Subject: [PATCH 11/12] Added quest giver Quest giver is now placed to the side of the cave entrance --- 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 ad6c3ad..15f213a 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:143a10a51a3efdab3c44d0db18be4ecaa59c1666225fcac3e04e4dabf8db5b15 -size 3463988 +oid sha256:27e816d312fe15c3120d3ba984b37fc00919e51f79387e3e30c320b0ea526c20 +size 3469983 From e666ed28fbf022be944463d131c5834b67f69e91 Mon Sep 17 00:00:00 2001 From: Phoebe Harris-Wilson Date: Thu, 27 Apr 2023 18:00:30 +0100 Subject: [PATCH 12/12] Rope and talisman and textures --- Content/Assets/Objects/Loose_Rope/Rope_1/Rope1_low.uasset | 3 +++ .../Loose_Rope/Rope_1/Rope1_low_lambert1_BaseColor.uasset | 3 +++ .../Objects/Loose_Rope/Rope_1/Rope1_low_lambert1_Height.uasset | 3 +++ .../Loose_Rope/Rope_1/Rope1_low_lambert1_Metallic.uasset | 3 +++ .../Objects/Loose_Rope/Rope_1/Rope1_low_lambert1_Normal.uasset | 3 +++ .../Loose_Rope/Rope_1/Rope1_low_lambert1_Roughness.uasset | 3 +++ Content/Assets/Objects/Loose_Rope/Rope_1/m_rope1.uasset | 3 +++ Content/Assets/Objects/Loose_Rope/Rope_2/Rope2_low.uasset | 3 +++ .../Loose_Rope/Rope_2/Rope2_low_lambert1_BaseColor.uasset | 3 +++ .../Objects/Loose_Rope/Rope_2/Rope2_low_lambert1_Height.uasset | 3 +++ .../Loose_Rope/Rope_2/Rope2_low_lambert1_Metallic.uasset | 3 +++ .../Objects/Loose_Rope/Rope_2/Rope2_low_lambert1_Normal.uasset | 3 +++ .../Loose_Rope/Rope_2/Rope2_low_lambert1_Roughness.uasset | 3 +++ Content/Assets/Objects/Loose_Rope/Rope_2/m_rope2.uasset | 3 +++ Content/Assets/Objects/Loose_Rope/Rope_3/Rope3_low.uasset | 3 +++ .../Loose_Rope/Rope_3/Rope4_low_lambert1_BaseColor.uasset | 3 +++ .../Objects/Loose_Rope/Rope_3/Rope4_low_lambert1_Height.uasset | 3 +++ .../Loose_Rope/Rope_3/Rope4_low_lambert1_Metallic.uasset | 3 +++ .../Objects/Loose_Rope/Rope_3/Rope4_low_lambert1_Normal.uasset | 3 +++ .../Loose_Rope/Rope_3/Rope4_low_lambert1_Roughness.uasset | 3 +++ Content/Assets/Objects/Loose_Rope/Rope_3/m_rope3.uasset | 3 +++ Content/Assets/Objects/Loose_Rope/lambert1.uasset | 3 +++ Content/Assets/Objects/Talisman/M_talisman.uasset | 3 +++ Content/Assets/Objects/Talisman/lambert1.uasset | 3 +++ Content/Assets/Objects/Talisman/talisman_eye.uasset | 3 +++ .../Objects/Talisman/talisman_eye_lambert1_BaseColor.uasset | 3 +++ .../Objects/Talisman/talisman_eye_lambert1_Height.uasset | 3 +++ .../Objects/Talisman/talisman_eye_lambert1_Metallic.uasset | 3 +++ .../Objects/Talisman/talisman_eye_lambert1_Normal.uasset | 3 +++ .../Objects/Talisman/talisman_eye_lambert1_Roughness.uasset | 3 +++ Content/Levels/Build.umap | 2 +- 31 files changed, 91 insertions(+), 1 deletion(-) create mode 100644 Content/Assets/Objects/Loose_Rope/Rope_1/Rope1_low.uasset create mode 100644 Content/Assets/Objects/Loose_Rope/Rope_1/Rope1_low_lambert1_BaseColor.uasset create mode 100644 Content/Assets/Objects/Loose_Rope/Rope_1/Rope1_low_lambert1_Height.uasset create mode 100644 Content/Assets/Objects/Loose_Rope/Rope_1/Rope1_low_lambert1_Metallic.uasset create mode 100644 Content/Assets/Objects/Loose_Rope/Rope_1/Rope1_low_lambert1_Normal.uasset create mode 100644 Content/Assets/Objects/Loose_Rope/Rope_1/Rope1_low_lambert1_Roughness.uasset create mode 100644 Content/Assets/Objects/Loose_Rope/Rope_1/m_rope1.uasset create mode 100644 Content/Assets/Objects/Loose_Rope/Rope_2/Rope2_low.uasset create mode 100644 Content/Assets/Objects/Loose_Rope/Rope_2/Rope2_low_lambert1_BaseColor.uasset create mode 100644 Content/Assets/Objects/Loose_Rope/Rope_2/Rope2_low_lambert1_Height.uasset create mode 100644 Content/Assets/Objects/Loose_Rope/Rope_2/Rope2_low_lambert1_Metallic.uasset create mode 100644 Content/Assets/Objects/Loose_Rope/Rope_2/Rope2_low_lambert1_Normal.uasset create mode 100644 Content/Assets/Objects/Loose_Rope/Rope_2/Rope2_low_lambert1_Roughness.uasset create mode 100644 Content/Assets/Objects/Loose_Rope/Rope_2/m_rope2.uasset create mode 100644 Content/Assets/Objects/Loose_Rope/Rope_3/Rope3_low.uasset create mode 100644 Content/Assets/Objects/Loose_Rope/Rope_3/Rope4_low_lambert1_BaseColor.uasset create mode 100644 Content/Assets/Objects/Loose_Rope/Rope_3/Rope4_low_lambert1_Height.uasset create mode 100644 Content/Assets/Objects/Loose_Rope/Rope_3/Rope4_low_lambert1_Metallic.uasset create mode 100644 Content/Assets/Objects/Loose_Rope/Rope_3/Rope4_low_lambert1_Normal.uasset create mode 100644 Content/Assets/Objects/Loose_Rope/Rope_3/Rope4_low_lambert1_Roughness.uasset create mode 100644 Content/Assets/Objects/Loose_Rope/Rope_3/m_rope3.uasset create mode 100644 Content/Assets/Objects/Loose_Rope/lambert1.uasset create mode 100644 Content/Assets/Objects/Talisman/M_talisman.uasset create mode 100644 Content/Assets/Objects/Talisman/lambert1.uasset create mode 100644 Content/Assets/Objects/Talisman/talisman_eye.uasset create mode 100644 Content/Assets/Objects/Talisman/talisman_eye_lambert1_BaseColor.uasset create mode 100644 Content/Assets/Objects/Talisman/talisman_eye_lambert1_Height.uasset create mode 100644 Content/Assets/Objects/Talisman/talisman_eye_lambert1_Metallic.uasset create mode 100644 Content/Assets/Objects/Talisman/talisman_eye_lambert1_Normal.uasset create mode 100644 Content/Assets/Objects/Talisman/talisman_eye_lambert1_Roughness.uasset diff --git a/Content/Assets/Objects/Loose_Rope/Rope_1/Rope1_low.uasset b/Content/Assets/Objects/Loose_Rope/Rope_1/Rope1_low.uasset new file mode 100644 index 0000000..048bd99 --- /dev/null +++ b/Content/Assets/Objects/Loose_Rope/Rope_1/Rope1_low.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:dcd12cf54eaa195e3e09845bb417912e87aae1972dfe73e3d736238a87c59bed +size 106089 diff --git a/Content/Assets/Objects/Loose_Rope/Rope_1/Rope1_low_lambert1_BaseColor.uasset b/Content/Assets/Objects/Loose_Rope/Rope_1/Rope1_low_lambert1_BaseColor.uasset new file mode 100644 index 0000000..c7fdb20 --- /dev/null +++ b/Content/Assets/Objects/Loose_Rope/Rope_1/Rope1_low_lambert1_BaseColor.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:babca75b45c5063fb5e88dd10afa2e1a7a4725c48997f00960c60b02b5984235 +size 1520066 diff --git a/Content/Assets/Objects/Loose_Rope/Rope_1/Rope1_low_lambert1_Height.uasset b/Content/Assets/Objects/Loose_Rope/Rope_1/Rope1_low_lambert1_Height.uasset new file mode 100644 index 0000000..e62c27d --- /dev/null +++ b/Content/Assets/Objects/Loose_Rope/Rope_1/Rope1_low_lambert1_Height.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:353d843973c7c99a78595eddcab02096469302a675dff429e81a5db06631b4f7 +size 99801 diff --git a/Content/Assets/Objects/Loose_Rope/Rope_1/Rope1_low_lambert1_Metallic.uasset b/Content/Assets/Objects/Loose_Rope/Rope_1/Rope1_low_lambert1_Metallic.uasset new file mode 100644 index 0000000..d6f60dc --- /dev/null +++ b/Content/Assets/Objects/Loose_Rope/Rope_1/Rope1_low_lambert1_Metallic.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:fa28db72e70b7bbabff82477ab07829e1d316475bea39aa1a271efedfdd6579c +size 11091 diff --git a/Content/Assets/Objects/Loose_Rope/Rope_1/Rope1_low_lambert1_Normal.uasset b/Content/Assets/Objects/Loose_Rope/Rope_1/Rope1_low_lambert1_Normal.uasset new file mode 100644 index 0000000..e329854 --- /dev/null +++ b/Content/Assets/Objects/Loose_Rope/Rope_1/Rope1_low_lambert1_Normal.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:9f01c5c12cee6aa56224a4a8236049027378f612f26afa5196d470531ceb00d7 +size 2085262 diff --git a/Content/Assets/Objects/Loose_Rope/Rope_1/Rope1_low_lambert1_Roughness.uasset b/Content/Assets/Objects/Loose_Rope/Rope_1/Rope1_low_lambert1_Roughness.uasset new file mode 100644 index 0000000..344adcd --- /dev/null +++ b/Content/Assets/Objects/Loose_Rope/Rope_1/Rope1_low_lambert1_Roughness.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:20eda97c55883f6d4fa8cfa02fd4273f3deaee92af7bda1081b96c72084aeab9 +size 305288 diff --git a/Content/Assets/Objects/Loose_Rope/Rope_1/m_rope1.uasset b/Content/Assets/Objects/Loose_Rope/Rope_1/m_rope1.uasset new file mode 100644 index 0000000..b658546 --- /dev/null +++ b/Content/Assets/Objects/Loose_Rope/Rope_1/m_rope1.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:3bcb425202e8a3a8a437e7e13fb932f2f9206b0cd9322be6c238319feba25698 +size 17753 diff --git a/Content/Assets/Objects/Loose_Rope/Rope_2/Rope2_low.uasset b/Content/Assets/Objects/Loose_Rope/Rope_2/Rope2_low.uasset new file mode 100644 index 0000000..e3db667 --- /dev/null +++ b/Content/Assets/Objects/Loose_Rope/Rope_2/Rope2_low.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:5b9efbd74838778ebe5b3d9075ed9791bd3d62c5f51fd5b4069934a14c1ec536 +size 375948 diff --git a/Content/Assets/Objects/Loose_Rope/Rope_2/Rope2_low_lambert1_BaseColor.uasset b/Content/Assets/Objects/Loose_Rope/Rope_2/Rope2_low_lambert1_BaseColor.uasset new file mode 100644 index 0000000..2a93f49 --- /dev/null +++ b/Content/Assets/Objects/Loose_Rope/Rope_2/Rope2_low_lambert1_BaseColor.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:6b0705b7dba2055c911de8c8195e6d411575cacabdcbf679e23bb76ef21ef10e +size 402104 diff --git a/Content/Assets/Objects/Loose_Rope/Rope_2/Rope2_low_lambert1_Height.uasset b/Content/Assets/Objects/Loose_Rope/Rope_2/Rope2_low_lambert1_Height.uasset new file mode 100644 index 0000000..3739afc --- /dev/null +++ b/Content/Assets/Objects/Loose_Rope/Rope_2/Rope2_low_lambert1_Height.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e70fb3bbbfe29fc0f7e93e99ac88da89c20f9e51753078e0bd5306724b5e1c2a +size 164105 diff --git a/Content/Assets/Objects/Loose_Rope/Rope_2/Rope2_low_lambert1_Metallic.uasset b/Content/Assets/Objects/Loose_Rope/Rope_2/Rope2_low_lambert1_Metallic.uasset new file mode 100644 index 0000000..ccf9097 --- /dev/null +++ b/Content/Assets/Objects/Loose_Rope/Rope_2/Rope2_low_lambert1_Metallic.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:35937b45af076c3b21953202199078bf84a117f71743e97eee1779b4196ba716 +size 11122 diff --git a/Content/Assets/Objects/Loose_Rope/Rope_2/Rope2_low_lambert1_Normal.uasset b/Content/Assets/Objects/Loose_Rope/Rope_2/Rope2_low_lambert1_Normal.uasset new file mode 100644 index 0000000..b680293 --- /dev/null +++ b/Content/Assets/Objects/Loose_Rope/Rope_2/Rope2_low_lambert1_Normal.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:5e46bcc8ea1ceafe4c124cf86f579ef4599739d8fb0c1014a2c6d17a1764c1d0 +size 1336068 diff --git a/Content/Assets/Objects/Loose_Rope/Rope_2/Rope2_low_lambert1_Roughness.uasset b/Content/Assets/Objects/Loose_Rope/Rope_2/Rope2_low_lambert1_Roughness.uasset new file mode 100644 index 0000000..e9e51d6 --- /dev/null +++ b/Content/Assets/Objects/Loose_Rope/Rope_2/Rope2_low_lambert1_Roughness.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:2d515dde8e6941c4fd8ca2d81a250cd931b9ab879c74da4bccb0a0905ab2d2ad +size 184433 diff --git a/Content/Assets/Objects/Loose_Rope/Rope_2/m_rope2.uasset b/Content/Assets/Objects/Loose_Rope/Rope_2/m_rope2.uasset new file mode 100644 index 0000000..d4a3bd6 --- /dev/null +++ b/Content/Assets/Objects/Loose_Rope/Rope_2/m_rope2.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:343b85791a02421840727d30a15f35ea4114275d0099e9e86e238601f22f22ae +size 16917 diff --git a/Content/Assets/Objects/Loose_Rope/Rope_3/Rope3_low.uasset b/Content/Assets/Objects/Loose_Rope/Rope_3/Rope3_low.uasset new file mode 100644 index 0000000..303a928 --- /dev/null +++ b/Content/Assets/Objects/Loose_Rope/Rope_3/Rope3_low.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a6d688095cea476cc5abdd86a0eac7ecf1e6e4231748e32d2f04640a15b02a34 +size 509111 diff --git a/Content/Assets/Objects/Loose_Rope/Rope_3/Rope4_low_lambert1_BaseColor.uasset b/Content/Assets/Objects/Loose_Rope/Rope_3/Rope4_low_lambert1_BaseColor.uasset new file mode 100644 index 0000000..27a92e5 --- /dev/null +++ b/Content/Assets/Objects/Loose_Rope/Rope_3/Rope4_low_lambert1_BaseColor.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:77a38d1a10e6387ecf91ae932899523a975a08a53be5e757dce1fcdd4b0e27d2 +size 2061195 diff --git a/Content/Assets/Objects/Loose_Rope/Rope_3/Rope4_low_lambert1_Height.uasset b/Content/Assets/Objects/Loose_Rope/Rope_3/Rope4_low_lambert1_Height.uasset new file mode 100644 index 0000000..f804683 --- /dev/null +++ b/Content/Assets/Objects/Loose_Rope/Rope_3/Rope4_low_lambert1_Height.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:9ab95afdac664d67289ff4b605c81d2d46b3db883806a1a9b274a575d9723eba +size 570509 diff --git a/Content/Assets/Objects/Loose_Rope/Rope_3/Rope4_low_lambert1_Metallic.uasset b/Content/Assets/Objects/Loose_Rope/Rope_3/Rope4_low_lambert1_Metallic.uasset new file mode 100644 index 0000000..035c591 --- /dev/null +++ b/Content/Assets/Objects/Loose_Rope/Rope_3/Rope4_low_lambert1_Metallic.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:982685b2fce13c4d64d1ab7c2afbc18aa9c8dbfe369887dd4334de9cf08c3835 +size 16686 diff --git a/Content/Assets/Objects/Loose_Rope/Rope_3/Rope4_low_lambert1_Normal.uasset b/Content/Assets/Objects/Loose_Rope/Rope_3/Rope4_low_lambert1_Normal.uasset new file mode 100644 index 0000000..089a31c --- /dev/null +++ b/Content/Assets/Objects/Loose_Rope/Rope_3/Rope4_low_lambert1_Normal.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c76c60c642dd8beded04a205dd9f67a56e809647bf0c6daf913e8134cbb4fbb7 +size 1920130 diff --git a/Content/Assets/Objects/Loose_Rope/Rope_3/Rope4_low_lambert1_Roughness.uasset b/Content/Assets/Objects/Loose_Rope/Rope_3/Rope4_low_lambert1_Roughness.uasset new file mode 100644 index 0000000..28ba123 --- /dev/null +++ b/Content/Assets/Objects/Loose_Rope/Rope_3/Rope4_low_lambert1_Roughness.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d5930a0055bbb3836d89b0e99fa746fc0bde711c8f42186e7f124554b90872ab +size 994771 diff --git a/Content/Assets/Objects/Loose_Rope/Rope_3/m_rope3.uasset b/Content/Assets/Objects/Loose_Rope/Rope_3/m_rope3.uasset new file mode 100644 index 0000000..6e509c4 --- /dev/null +++ b/Content/Assets/Objects/Loose_Rope/Rope_3/m_rope3.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:0251ee546af248e8b19f102ee71add1d1e658835c710f8fb1688de1c5e84d352 +size 16395 diff --git a/Content/Assets/Objects/Loose_Rope/lambert1.uasset b/Content/Assets/Objects/Loose_Rope/lambert1.uasset new file mode 100644 index 0000000..54faaba --- /dev/null +++ b/Content/Assets/Objects/Loose_Rope/lambert1.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c09a1bfc868ffca0e41387860deedc6308861a965108d25bc0dd0a4f9d5395ce +size 8070 diff --git a/Content/Assets/Objects/Talisman/M_talisman.uasset b/Content/Assets/Objects/Talisman/M_talisman.uasset new file mode 100644 index 0000000..1b54cd3 --- /dev/null +++ b/Content/Assets/Objects/Talisman/M_talisman.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b821cbc7f806517bca7028a95ae1de7946192b5614bbbe50f5363b6cd678d681 +size 13898 diff --git a/Content/Assets/Objects/Talisman/lambert1.uasset b/Content/Assets/Objects/Talisman/lambert1.uasset new file mode 100644 index 0000000..447014d --- /dev/null +++ b/Content/Assets/Objects/Talisman/lambert1.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:51febaa7944e68fd755379d4466712f0b9d1c57028d4d9565f0882e7f47eb3f7 +size 8066 diff --git a/Content/Assets/Objects/Talisman/talisman_eye.uasset b/Content/Assets/Objects/Talisman/talisman_eye.uasset new file mode 100644 index 0000000..4c87e45 --- /dev/null +++ b/Content/Assets/Objects/Talisman/talisman_eye.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:dbc7e31d5b86ed8b4865ab3bff64b477dad569d9af3beaf1ff9c6141ed124bd9 +size 47104 diff --git a/Content/Assets/Objects/Talisman/talisman_eye_lambert1_BaseColor.uasset b/Content/Assets/Objects/Talisman/talisman_eye_lambert1_BaseColor.uasset new file mode 100644 index 0000000..6c6e7d1 --- /dev/null +++ b/Content/Assets/Objects/Talisman/talisman_eye_lambert1_BaseColor.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:1901f92c2c1147217eac8dd87533c2b8d972d5fc938fec5226143e327ff3bbcf +size 3229596 diff --git a/Content/Assets/Objects/Talisman/talisman_eye_lambert1_Height.uasset b/Content/Assets/Objects/Talisman/talisman_eye_lambert1_Height.uasset new file mode 100644 index 0000000..48ab049 --- /dev/null +++ b/Content/Assets/Objects/Talisman/talisman_eye_lambert1_Height.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:303125d7a8a7b037baa2c6037935b2ebe287e8db7a7f0ac0350b47ddf3aeefea +size 386248 diff --git a/Content/Assets/Objects/Talisman/talisman_eye_lambert1_Metallic.uasset b/Content/Assets/Objects/Talisman/talisman_eye_lambert1_Metallic.uasset new file mode 100644 index 0000000..9f0a6bd --- /dev/null +++ b/Content/Assets/Objects/Talisman/talisman_eye_lambert1_Metallic.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a79f7b86865d68844d29a44753af8106cd65c2dfd8f7124dbdee38210cd3cfcd +size 16739 diff --git a/Content/Assets/Objects/Talisman/talisman_eye_lambert1_Normal.uasset b/Content/Assets/Objects/Talisman/talisman_eye_lambert1_Normal.uasset new file mode 100644 index 0000000..3e917b9 --- /dev/null +++ b/Content/Assets/Objects/Talisman/talisman_eye_lambert1_Normal.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:23b1ba7b081d513749073fa104b10953104058042f3445570f0d7ee6e59c3b7f +size 2878454 diff --git a/Content/Assets/Objects/Talisman/talisman_eye_lambert1_Roughness.uasset b/Content/Assets/Objects/Talisman/talisman_eye_lambert1_Roughness.uasset new file mode 100644 index 0000000..388e400 --- /dev/null +++ b/Content/Assets/Objects/Talisman/talisman_eye_lambert1_Roughness.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:96723ada902acf424ddcc4f1962b8f5d96499364161da02c27c22b3ef6be4ab3 +size 1062651 diff --git a/Content/Levels/Build.umap b/Content/Levels/Build.umap index 9598dfb..e059c49 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:a0ed2bd7421a1a47279c538157de1d31a5ba596027e96809f533401451099457 +oid sha256:4a2ede72f000faff083043774cb704f140df75e68565235d99de200d07c41aa3 size 3500025