From 97d0cb25059ff4a0d30da412cd9c013e748ef976 Mon Sep 17 00:00:00 2001 From: Kacper Szelest Date: Thu, 27 Apr 2023 16:15:31 +0100 Subject: [PATCH 1/6] 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 2/6] 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 3/6] 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 4/6] 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 5/6] 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 6/6] 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