From 78651b1ce452f1cfb252e92c6981e56cce12a13a Mon Sep 17 00:00:00 2001 From: KACPER Szelest Date: Tue, 3 Jan 2023 12:50:33 +0000 Subject: [PATCH 01/43] Created new level I have created the Top_layer level which is where the beta level will be created and housed --- Content/Levels/Top_layer.umap | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 Content/Levels/Top_layer.umap diff --git a/Content/Levels/Top_layer.umap b/Content/Levels/Top_layer.umap new file mode 100644 index 0000000..cb721ad --- /dev/null +++ b/Content/Levels/Top_layer.umap @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e8cf7152c155cff5893dc48135441e7e255018bdea70842d26585005522b6989 +size 18749 From 0e643e81ba22fd211280f0cfcf676af7056af841 Mon Sep 17 00:00:00 2001 From: KACPER Szelest Date: Tue, 3 Jan 2023 14:20:51 +0000 Subject: [PATCH 02/43] Create basic greybox of top layer level I created a very blocky greybox, as both a back incase our level doesn't get finished on time, but also as a guide on what to do --- Content/Levels/Top_layer.umap | 3 --- Content/Levels/Top_layer_level.umap | 3 +++ 2 files changed, 3 insertions(+), 3 deletions(-) delete mode 100644 Content/Levels/Top_layer.umap create mode 100644 Content/Levels/Top_layer_level.umap diff --git a/Content/Levels/Top_layer.umap b/Content/Levels/Top_layer.umap deleted file mode 100644 index cb721ad..0000000 --- a/Content/Levels/Top_layer.umap +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:e8cf7152c155cff5893dc48135441e7e255018bdea70842d26585005522b6989 -size 18749 diff --git a/Content/Levels/Top_layer_level.umap b/Content/Levels/Top_layer_level.umap new file mode 100644 index 0000000..1d10e21 --- /dev/null +++ b/Content/Levels/Top_layer_level.umap @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ac3dbf813593a650c27f43496ea56ffa4b13ecd6011f2a39d74b9ca7240f9758 +size 32199 From 1061fb0f8497b4cce6a820886ee2d62d0e2aa46b Mon Sep 17 00:00:00 2001 From: KACPER Szelest Date: Tue, 3 Jan 2023 14:38:26 +0000 Subject: [PATCH 03/43] Added place holder enemy I created some new folders to organize assets, whilst also adding the enemy placeholder character --- .../Assets/Characters/Placeholder_enemy/Material_007.uasset | 3 +++ Content/Blueprints/Combat_UI/Combat_UI.uasset | 4 ++-- Content/Environment/_GENERATED/kacpe/Box_0788C286.uasset | 3 +++ .../_GENERATED/kacpe/CubeGridToolOutput_D0D715CB.uasset | 3 +++ Content/Environment/_GENERATED/kacpe/Revolve_DCDF6709.uasset | 3 +++ Content/Levels/Top_layer_level.umap | 4 ++-- .../T_Mossy_Forest_Boulder_wjwtbb3_8K_D.uasset | 3 +++ 7 files changed, 19 insertions(+), 4 deletions(-) create mode 100644 Content/Assets/Characters/Placeholder_enemy/Material_007.uasset create mode 100644 Content/Environment/_GENERATED/kacpe/Box_0788C286.uasset create mode 100644 Content/Environment/_GENERATED/kacpe/CubeGridToolOutput_D0D715CB.uasset create mode 100644 Content/Environment/_GENERATED/kacpe/Revolve_DCDF6709.uasset create mode 100644 Content/Megascans/3D_Assets/Mossy_Forest_Boulder_wjwtbb3/T_Mossy_Forest_Boulder_wjwtbb3_8K_D.uasset diff --git a/Content/Assets/Characters/Placeholder_enemy/Material_007.uasset b/Content/Assets/Characters/Placeholder_enemy/Material_007.uasset new file mode 100644 index 0000000..93682fe --- /dev/null +++ b/Content/Assets/Characters/Placeholder_enemy/Material_007.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:5c49528a084a2e7041dc996f44f0b387c0547966fc873c0fbabf0bba6d1d7fb4 +size 6278 diff --git a/Content/Blueprints/Combat_UI/Combat_UI.uasset b/Content/Blueprints/Combat_UI/Combat_UI.uasset index aae01ca..dc662dd 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:545b239dc38454f274d0f4ff5310ec6655a045999eb17764ed0e9bf31e17fa42 -size 56768 +oid sha256:d3d012afceb64edab767928d52e91c205b6377f99bf29b12bc25008919dd56a5 +size 48587 diff --git a/Content/Environment/_GENERATED/kacpe/Box_0788C286.uasset b/Content/Environment/_GENERATED/kacpe/Box_0788C286.uasset new file mode 100644 index 0000000..03693b3 --- /dev/null +++ b/Content/Environment/_GENERATED/kacpe/Box_0788C286.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:526bc0a8780f73123027d20a14446387ae8d0de29e6c654f818aff774a7aeb6e +size 13556 diff --git a/Content/Environment/_GENERATED/kacpe/CubeGridToolOutput_D0D715CB.uasset b/Content/Environment/_GENERATED/kacpe/CubeGridToolOutput_D0D715CB.uasset new file mode 100644 index 0000000..123b68d --- /dev/null +++ b/Content/Environment/_GENERATED/kacpe/CubeGridToolOutput_D0D715CB.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a67a52a9a86d5f9f11b5fe36f11e806898dd765ca1e90c4b64c2737d2589bf05 +size 31373 diff --git a/Content/Environment/_GENERATED/kacpe/Revolve_DCDF6709.uasset b/Content/Environment/_GENERATED/kacpe/Revolve_DCDF6709.uasset new file mode 100644 index 0000000..53a73a2 --- /dev/null +++ b/Content/Environment/_GENERATED/kacpe/Revolve_DCDF6709.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d2f1676fe6eb83128283dc0bbec40b9ae2b8ef352cbf689d452d346fd9cd1f12 +size 18562 diff --git a/Content/Levels/Top_layer_level.umap b/Content/Levels/Top_layer_level.umap index 1d10e21..98b0e98 100644 --- a/Content/Levels/Top_layer_level.umap +++ b/Content/Levels/Top_layer_level.umap @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ac3dbf813593a650c27f43496ea56ffa4b13ecd6011f2a39d74b9ca7240f9758 -size 32199 +oid sha256:755a8a0f6d9cffe2381ad7110ea2adba2f407ec47f6e4d16d3ee1bcc04571e24 +size 34771 diff --git a/Content/Megascans/3D_Assets/Mossy_Forest_Boulder_wjwtbb3/T_Mossy_Forest_Boulder_wjwtbb3_8K_D.uasset b/Content/Megascans/3D_Assets/Mossy_Forest_Boulder_wjwtbb3/T_Mossy_Forest_Boulder_wjwtbb3_8K_D.uasset new file mode 100644 index 0000000..09026a8 --- /dev/null +++ b/Content/Megascans/3D_Assets/Mossy_Forest_Boulder_wjwtbb3/T_Mossy_Forest_Boulder_wjwtbb3_8K_D.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:22b2d217ef20108e35f1669b57b14f0f1c374600092d309d5da5fd6be4ad336d +size 220322237 From d78abda469cf28fe706af662fc0d05dac926affc Mon Sep 17 00:00:00 2001 From: KACPER Szelest Date: Tue, 10 Jan 2023 16:02:43 +0000 Subject: [PATCH 04/43] Added Sheep model I added the sheep model and saved it in the correct folder, adding it in the enemy character folder --- .../Characters/Placeholder_enemy/Blue_Sheep_Cube_001.uasset | 3 +++ Content/Assets/Characters/Placeholder_enemy/Material.uasset | 3 +++ .../Assets/Characters/Placeholder_enemy/Material_003.uasset | 3 +++ .../Assets/Characters/Placeholder_enemy/Material_004.uasset | 3 +++ .../Assets/Characters/Placeholder_enemy/Material_006.uasset | 3 +++ .../Assets/Characters/Placeholder_enemy/Material_008.uasset | 3 +++ .../Assets/Characters/Placeholder_enemy/Material_009.uasset | 3 +++ .../Assets/Characters/Placeholder_enemy/Material_010.uasset | 3 +++ .../Assets/Characters/Placeholder_enemy/Material_011.uasset | 3 +++ Content/Levels/Top_layer_level.umap | 4 ++-- 10 files changed, 29 insertions(+), 2 deletions(-) create mode 100644 Content/Assets/Characters/Placeholder_enemy/Blue_Sheep_Cube_001.uasset create mode 100644 Content/Assets/Characters/Placeholder_enemy/Material.uasset create mode 100644 Content/Assets/Characters/Placeholder_enemy/Material_003.uasset create mode 100644 Content/Assets/Characters/Placeholder_enemy/Material_004.uasset create mode 100644 Content/Assets/Characters/Placeholder_enemy/Material_006.uasset create mode 100644 Content/Assets/Characters/Placeholder_enemy/Material_008.uasset create mode 100644 Content/Assets/Characters/Placeholder_enemy/Material_009.uasset create mode 100644 Content/Assets/Characters/Placeholder_enemy/Material_010.uasset create mode 100644 Content/Assets/Characters/Placeholder_enemy/Material_011.uasset diff --git a/Content/Assets/Characters/Placeholder_enemy/Blue_Sheep_Cube_001.uasset b/Content/Assets/Characters/Placeholder_enemy/Blue_Sheep_Cube_001.uasset new file mode 100644 index 0000000..2242624 --- /dev/null +++ b/Content/Assets/Characters/Placeholder_enemy/Blue_Sheep_Cube_001.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b88b0f36b4d485840b24e7201c7c1c7d5ddcdaaa278c2c7ba99e9da6d697a280 +size 1189523 diff --git a/Content/Assets/Characters/Placeholder_enemy/Material.uasset b/Content/Assets/Characters/Placeholder_enemy/Material.uasset new file mode 100644 index 0000000..eaa704d --- /dev/null +++ b/Content/Assets/Characters/Placeholder_enemy/Material.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:57cfb172c69598f5e7a1d21d03a31fda77cf7f9d7ff4c9714d02a00f1da2bde6 +size 7600 diff --git a/Content/Assets/Characters/Placeholder_enemy/Material_003.uasset b/Content/Assets/Characters/Placeholder_enemy/Material_003.uasset new file mode 100644 index 0000000..df890bf --- /dev/null +++ b/Content/Assets/Characters/Placeholder_enemy/Material_003.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a25051e0eb80bfde2501118d0f90d49a5fb3fe9c79c822b21ad6c6f56e0eb6fa +size 5997 diff --git a/Content/Assets/Characters/Placeholder_enemy/Material_004.uasset b/Content/Assets/Characters/Placeholder_enemy/Material_004.uasset new file mode 100644 index 0000000..31d1f48 --- /dev/null +++ b/Content/Assets/Characters/Placeholder_enemy/Material_004.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:4aadb4823a3215b995e8c87b0e3f58fca93a56df28c0bf3c9643a53c3d35b0f5 +size 7609 diff --git a/Content/Assets/Characters/Placeholder_enemy/Material_006.uasset b/Content/Assets/Characters/Placeholder_enemy/Material_006.uasset new file mode 100644 index 0000000..5fe518f --- /dev/null +++ b/Content/Assets/Characters/Placeholder_enemy/Material_006.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:9d6236b89f89ecbae62379cd2800c48c11d05f67d442a2ecb4c4256ece1332c4 +size 5997 diff --git a/Content/Assets/Characters/Placeholder_enemy/Material_008.uasset b/Content/Assets/Characters/Placeholder_enemy/Material_008.uasset new file mode 100644 index 0000000..70f50c3 --- /dev/null +++ b/Content/Assets/Characters/Placeholder_enemy/Material_008.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:611a7603dd86e0162ec64b206ea23fe7b53c979d0be7dfb0dcad1af8177e62eb +size 7969 diff --git a/Content/Assets/Characters/Placeholder_enemy/Material_009.uasset b/Content/Assets/Characters/Placeholder_enemy/Material_009.uasset new file mode 100644 index 0000000..3695216 --- /dev/null +++ b/Content/Assets/Characters/Placeholder_enemy/Material_009.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ecd8cdc05df90d07476160019b7b906f16836ea9631d7e090136d519422b973a +size 7969 diff --git a/Content/Assets/Characters/Placeholder_enemy/Material_010.uasset b/Content/Assets/Characters/Placeholder_enemy/Material_010.uasset new file mode 100644 index 0000000..b7529c2 --- /dev/null +++ b/Content/Assets/Characters/Placeholder_enemy/Material_010.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:56aa0c477d6171824e802cce191e8f9cdcea0bbf367ec138af9a0604088148b0 +size 5997 diff --git a/Content/Assets/Characters/Placeholder_enemy/Material_011.uasset b/Content/Assets/Characters/Placeholder_enemy/Material_011.uasset new file mode 100644 index 0000000..ae09a3a --- /dev/null +++ b/Content/Assets/Characters/Placeholder_enemy/Material_011.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c77182fd2ee0fe03c6e8176265f0838929221c551a3a8234df9b4ba278139385 +size 5997 diff --git a/Content/Levels/Top_layer_level.umap b/Content/Levels/Top_layer_level.umap index 98b0e98..6a3ed8b 100644 --- a/Content/Levels/Top_layer_level.umap +++ b/Content/Levels/Top_layer_level.umap @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:755a8a0f6d9cffe2381ad7110ea2adba2f407ec47f6e4d16d3ee1bcc04571e24 -size 34771 +oid sha256:6949886ca1892bfcc1a61d108374e8d939baefc31b2cc85adb141d36a505c6f3 +size 40006 From c107c9a490e567e8017b9979033e8f193515dcba Mon Sep 17 00:00:00 2001 From: MH261677 Date: Thu, 12 Jan 2023 13:05:43 +0000 Subject: [PATCH 05/43] Updated Merchant Fixed crash error and merchant dialouge box pops up now, Started working on item stacking --- Content/Blueprints/Combat_UI/CombatCharacter.uasset | 4 ++-- Content/Blueprints/Merchant/Merchant_UI/BP_OPENDIAL.uasset | 4 ++-- Content/Levels/MerchantPrototype.umap | 2 +- .../InteractableEnvironment/InteractableEnvironmentObject.h | 2 +- Source/the_twilight_abyss/PlayerTemp/TempCharacter.cpp | 3 ++- 5 files changed, 8 insertions(+), 7 deletions(-) diff --git a/Content/Blueprints/Combat_UI/CombatCharacter.uasset b/Content/Blueprints/Combat_UI/CombatCharacter.uasset index 4b8ec08..f58dc23 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:81bad35bf8880695b93bf905b8c2b54f945c47d82b169c2ea69aa092857e15e1 -size 63760 +oid sha256:ff64a97aeb5d12435a02c4bd605bffe6ba3cf27a0a8de71e2903fdb42a622c25 +size 63137 diff --git a/Content/Blueprints/Merchant/Merchant_UI/BP_OPENDIAL.uasset b/Content/Blueprints/Merchant/Merchant_UI/BP_OPENDIAL.uasset index b1a1752..cb0fa3a 100644 --- a/Content/Blueprints/Merchant/Merchant_UI/BP_OPENDIAL.uasset +++ b/Content/Blueprints/Merchant/Merchant_UI/BP_OPENDIAL.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b00c78b227e5926f654f4ae7c1421f83cc57c4a186be20147347e9b694ffe960 -size 71363 +oid sha256:5aba7e76546797d974d8c1fbb2f989416f27912dbd289acc8c16a5bc5b25eefd +size 70965 diff --git a/Content/Levels/MerchantPrototype.umap b/Content/Levels/MerchantPrototype.umap index fd3c5f2..7a9a334 100644 --- a/Content/Levels/MerchantPrototype.umap +++ b/Content/Levels/MerchantPrototype.umap @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ffe4d674bcfb45a2e8b4f2a05aa88a647f4f5a5d6726d037573cbbb4769b3697 +oid sha256:676563d739d9464ad55d9e31bd059f81dccf2250864c3c7bda445ea682e0083d size 27106 diff --git a/Source/the_twilight_abyss/InteractableEnvironment/InteractableEnvironmentObject.h b/Source/the_twilight_abyss/InteractableEnvironment/InteractableEnvironmentObject.h index c650652..fc376ff 100644 --- a/Source/the_twilight_abyss/InteractableEnvironment/InteractableEnvironmentObject.h +++ b/Source/the_twilight_abyss/InteractableEnvironment/InteractableEnvironmentObject.h @@ -24,7 +24,7 @@ public: // Called every frame virtual void TickComponent(float DeltaTime, ELevelTick TickType, FActorComponentTickFunction* ThisTickFunction) override; - UPROPERTY(EditDefaults) + UPROPERTY(EditDefaultsOnly) bool bInteractable = false; UFUNCTION(Blueprintcallable) diff --git a/Source/the_twilight_abyss/PlayerTemp/TempCharacter.cpp b/Source/the_twilight_abyss/PlayerTemp/TempCharacter.cpp index e74b47a..5b6bf51 100644 --- a/Source/the_twilight_abyss/PlayerTemp/TempCharacter.cpp +++ b/Source/the_twilight_abyss/PlayerTemp/TempCharacter.cpp @@ -77,13 +77,14 @@ void ATempCharacter::LineTraceLogic() if (bHit) { //we store the GetItem function from InventoryComponent into ItemArray variable - auto ItemArray = OutHit.GetActor()->FindComponentByClass()->GetItem(0); + if(OutHit.GetActor() == nullptr) { return; } if(OutHit.GetActor()->FindComponentByClass()) { + auto ItemArray = OutHit.GetActor()->FindComponentByClass()->GetItem(0); if(GoldBalance >= ItemArray->ItemCostPrice) { GoldBalance -= ItemArray->ItemCostPrice; From 9878f0f3707600453a0761f7ee6921087ce0673a Mon Sep 17 00:00:00 2001 From: MH261677 Date: Thu, 12 Jan 2023 13:56:02 +0000 Subject: [PATCH 06/43] Updated ItemDisplay WBP Added an item stack to the number to start creating stackable items --- Content/Blueprints/Inventory_UI/WBP_ItemDisplay.uasset | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Content/Blueprints/Inventory_UI/WBP_ItemDisplay.uasset b/Content/Blueprints/Inventory_UI/WBP_ItemDisplay.uasset index 8a3dc67..3980322 100644 --- a/Content/Blueprints/Inventory_UI/WBP_ItemDisplay.uasset +++ b/Content/Blueprints/Inventory_UI/WBP_ItemDisplay.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ca5bb69435dfac54ab1c7cdb03fe4521ed1961add9ff0e9438a235b479e8a68b -size 86855 +oid sha256:48426ed97184a867232380e93324520aeef1c39e773c7155c7caab764aa7f54a +size 86683 From 3710f33e74c13eb49d4c8e5e8da7f28b73b9ae16 Mon Sep 17 00:00:00 2001 From: MH261677 Date: Thu, 12 Jan 2023 13:56:30 +0000 Subject: [PATCH 07/43] Updated Inventory System Done it so the items from the inventory now get removed when used instead of one item never being able to be removed --- .../BaseItems/InventoryComponent.cpp | 18 +++++++----------- .../BaseItems/InventoryComponent.h | 3 +++ .../BaseItems/Items/BaseItem.h | 9 +++------ .../BaseItems/Items/EatableItems.cpp | 12 ++++++------ .../PlayerTemp/TempCharacter.h | 7 +++---- 5 files changed, 22 insertions(+), 27 deletions(-) diff --git a/Source/the_twilight_abyss/BaseItems/InventoryComponent.cpp b/Source/the_twilight_abyss/BaseItems/InventoryComponent.cpp index 8a5a53e..03745de 100644 --- a/Source/the_twilight_abyss/BaseItems/InventoryComponent.cpp +++ b/Source/the_twilight_abyss/BaseItems/InventoryComponent.cpp @@ -40,11 +40,8 @@ bool UInventoryComponent::AddItem(class UBaseItem* BaseItem) BaseItem->StoredItems = this; BaseItem->World = GetWorld(); Items.Add(BaseItem); - BaseItem->SubItemID++; - UE_LOG(LogTemp, Display, TEXT("ITEM HAS BEEN ADDED")); + UE_LOG(LogTemp, Display, TEXT("ITEM HAS BEEN ADDED TO INVENTORY")); //log the itemid - UE_LOG(LogTemp, Display, TEXT("ITEM ID: %d"), BaseItem->ItemID); - UE_LOG(LogTemp, Display, TEXT("SUBITEM ID: %d"), BaseItem->SubItemID); //Refreshes the inventory OnInventoryUpdated.Broadcast(); @@ -60,13 +57,6 @@ bool UInventoryComponent::Remove(class UBaseItem* BaseItem) UE_LOG(LogTemp, Display, TEXT("ItEM HAS BEEN REMOVED")); BaseItem->StoredItems = nullptr; BaseItem->World = nullptr; - if(BaseItem->SubItemID < Items.Num()) - { - Items.RemoveSingle(BaseItem); - BaseItem->SubItemID --; - UE_LOG(LogTemp, Display, TEXT("ItemRemoved")); - UE_LOG(LogTemp, Display, TEXT("SUBITEM ID: %d"), BaseItem->SubItemID); - } //Items.RemoveSingle(BaseItem); OnInventoryUpdated.Broadcast(); // Updates UI return true; @@ -79,3 +69,9 @@ UBaseItem* UInventoryComponent::GetItem(int Index) return Items[Index]; } +void UInventoryComponent::RemoveItem(UEatableItems* Item) +{ + Items.RemoveSingle(Item); + OnInventoryUpdated.Broadcast(); +} + diff --git a/Source/the_twilight_abyss/BaseItems/InventoryComponent.h b/Source/the_twilight_abyss/BaseItems/InventoryComponent.h index 41476b1..7ecd224 100644 --- a/Source/the_twilight_abyss/BaseItems/InventoryComponent.h +++ b/Source/the_twilight_abyss/BaseItems/InventoryComponent.h @@ -45,5 +45,8 @@ public: UFUNCTION(BlueprintCallable, Category= "Inventory") class UBaseItem* GetItem(int Index); + + UFUNCTION() + void RemoveItem(UEatableItems* Item); }; diff --git a/Source/the_twilight_abyss/BaseItems/Items/BaseItem.h b/Source/the_twilight_abyss/BaseItems/Items/BaseItem.h index 524269a..fa9426c 100644 --- a/Source/the_twilight_abyss/BaseItems/Items/BaseItem.h +++ b/Source/the_twilight_abyss/BaseItems/Items/BaseItem.h @@ -53,14 +53,11 @@ public: UPROPERTY(EditAnywhere, Category = "Item") bool isDamageBuffItem; - UPROPERTY(EditAnywhere, Category = "Item") - int ItemID; - - UPROPERTY(EditAnywhere, Category = "Item") - int SubItemID; + UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = "Item") + int32 StackCount; //reference to the UInventoryComponent script - UPROPERTY() + UPROPERTY(EditAnywhere, Category = "Item") class UInventoryComponent* StoredItems; //The buy class to purchase the item diff --git a/Source/the_twilight_abyss/BaseItems/Items/EatableItems.cpp b/Source/the_twilight_abyss/BaseItems/Items/EatableItems.cpp index 352aee9..65d911d 100644 --- a/Source/the_twilight_abyss/BaseItems/Items/EatableItems.cpp +++ b/Source/the_twilight_abyss/BaseItems/Items/EatableItems.cpp @@ -3,14 +3,14 @@ #include "EatableItems.h" +#include "BehaviorTree/BehaviorTreeTypes.h" #include "the_twilight_abyss/BaseItems/InventoryComponent.h" #include "the_twilight_abyss/PlayerTemp/TempCharacter.h" UEatableItems::UEatableItems() { - ItemID; - SubItemID; + } void UEatableItems::Use(ATempCharacter* Character) @@ -21,15 +21,15 @@ void UEatableItems::Use(ATempCharacter* Character) { Character->Health += 10; UE_LOG(LogTemp, Display, TEXT("Healed")); + //delete itself + Character->Inventory->RemoveItem(this); + } if(isDamageBuffItem == true) { // need to add the damage buff functionality here UE_LOG(LogTemp, Display, TEXT("Damage Buffed")); - } - if(StoredItems) - { - StoredItems->Remove(this); + Character->Inventory->RemoveItem(this); } } diff --git a/Source/the_twilight_abyss/PlayerTemp/TempCharacter.h b/Source/the_twilight_abyss/PlayerTemp/TempCharacter.h index 972140d..56cc8d3 100644 --- a/Source/the_twilight_abyss/PlayerTemp/TempCharacter.h +++ b/Source/the_twilight_abyss/PlayerTemp/TempCharacter.h @@ -12,10 +12,6 @@ class THE_TWILIGHT_ABYSS_API ATempCharacter : public ACharacter { GENERATED_BODY() - //Player inventory - UPROPERTY(EditAnywhere, BlueprintReadOnly, Category = Inventory, meta = (AllowPrivateAccess = "true")) - class UInventoryComponent* Inventory; //Using the InventoryComponent class - public: // Sets default values for this character's properties ATempCharacter(); @@ -31,6 +27,9 @@ public: // Called every frame virtual void Tick(float DeltaTime) override; + UPROPERTY(EditAnywhere, BlueprintReadOnly, Category = Inventory, meta = (AllowPrivateAccess = "true")) + class UInventoryComponent* Inventory; //Using the InventoryComponent class + // Called to bind functionality to input virtual void SetupPlayerInputComponent(class UInputComponent* PlayerInputComponent) override; From cd745b086bc594fb011275fa0015f3c5d2ab96a2 Mon Sep 17 00:00:00 2001 From: MH261677 Date: Thu, 12 Jan 2023 15:21:32 +0000 Subject: [PATCH 08/43] Updated BaseItem, InventoryComponent.cpp Fixed an issue where the final item was not dissapearing, added item stacking so when purchasing the same item it will stack instead of being seperate instances. --- .../BaseItems/InventoryComponent.cpp | 34 ++++++++++++++----- .../BaseItems/Items/BaseItem.h | 2 +- 2 files changed, 27 insertions(+), 9 deletions(-) diff --git a/Source/the_twilight_abyss/BaseItems/InventoryComponent.cpp b/Source/the_twilight_abyss/BaseItems/InventoryComponent.cpp index 03745de..a208bd0 100644 --- a/Source/the_twilight_abyss/BaseItems/InventoryComponent.cpp +++ b/Source/the_twilight_abyss/BaseItems/InventoryComponent.cpp @@ -39,14 +39,28 @@ bool UInventoryComponent::AddItem(class UBaseItem* BaseItem) } BaseItem->StoredItems = this; BaseItem->World = GetWorld(); - Items.Add(BaseItem); - UE_LOG(LogTemp, Display, TEXT("ITEM HAS BEEN ADDED TO INVENTORY")); - //log the itemid - + bool isNewItem = true; + // for every item in inventory + for (auto & Item : Items) + { + //if the item is the same as the item that is being added + if (Item->ItemDisplayName.ToString() == BaseItem->ItemDisplayName.ToString()) + { + //add the amount of the item that is being added to the item in the inventory + Item->StackCount++; + UE_LOG(LogTemp, Display, TEXT("ITEM STACKCOUNT: %d"), Item->StackCount); + isNewItem = false; + break; + } + } + if (isNewItem == true) + { + Items.Add(BaseItem); + UE_LOG(LogTemp, Display, TEXT("ITEM HAS BEEN ADDED TO INVENTORY")); + } //Refreshes the inventory OnInventoryUpdated.Broadcast(); - - return true; + return true; } // remove only gets called once on the same item @@ -57,7 +71,7 @@ bool UInventoryComponent::Remove(class UBaseItem* BaseItem) UE_LOG(LogTemp, Display, TEXT("ItEM HAS BEEN REMOVED")); BaseItem->StoredItems = nullptr; BaseItem->World = nullptr; - //Items.RemoveSingle(BaseItem); + Items.RemoveSingle(BaseItem); OnInventoryUpdated.Broadcast(); // Updates UI return true; } @@ -71,7 +85,11 @@ UBaseItem* UInventoryComponent::GetItem(int Index) void UInventoryComponent::RemoveItem(UEatableItems* Item) { - Items.RemoveSingle(Item); + Item->StackCount--; + if (Item->StackCount <= 0) + { + Remove(Item); // activates the remove function up above + } OnInventoryUpdated.Broadcast(); } diff --git a/Source/the_twilight_abyss/BaseItems/Items/BaseItem.h b/Source/the_twilight_abyss/BaseItems/Items/BaseItem.h index fa9426c..346966f 100644 --- a/Source/the_twilight_abyss/BaseItems/Items/BaseItem.h +++ b/Source/the_twilight_abyss/BaseItems/Items/BaseItem.h @@ -54,7 +54,7 @@ public: bool isDamageBuffItem; UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = "Item") - int32 StackCount; + int32 StackCount = 1; //reference to the UInventoryComponent script UPROPERTY(EditAnywhere, Category = "Item") From a582a05a59fc3cad870a74c8042d2a2037b057e7 Mon Sep 17 00:00:00 2001 From: MH261677 Date: Sat, 14 Jan 2023 20:34:38 +0000 Subject: [PATCH 09/43] Changed BP_Interaction name to BP_MerchantInteract Changed BP_Interaction name to BP_MerchantInteraction --- Content/Blueprints/Merchant/BP_Interaction.uasset | 4 ++-- Content/Blueprints/Merchant/BP_MerchantInteraction.uasset | 3 +++ Content/Levels/MerchantPrototype.umap | 4 ++-- 3 files changed, 7 insertions(+), 4 deletions(-) create mode 100644 Content/Blueprints/Merchant/BP_MerchantInteraction.uasset diff --git a/Content/Blueprints/Merchant/BP_Interaction.uasset b/Content/Blueprints/Merchant/BP_Interaction.uasset index 1c1c83b..db3bf9a 100644 --- a/Content/Blueprints/Merchant/BP_Interaction.uasset +++ b/Content/Blueprints/Merchant/BP_Interaction.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:2965ad13589cf50b8112f5e97941fd3e65db67ebece69401a963a630a15ce134 -size 26706 +oid sha256:47d6ac19f0fc2b09a64a87a238e5cafd637e0cd06bc5dae2824d9363c8f177bd +size 2447 diff --git a/Content/Blueprints/Merchant/BP_MerchantInteraction.uasset b/Content/Blueprints/Merchant/BP_MerchantInteraction.uasset new file mode 100644 index 0000000..2d5275a --- /dev/null +++ b/Content/Blueprints/Merchant/BP_MerchantInteraction.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:cbe759df6480175f1e18986bfb5b5d43047dfd4d67f0ccbaf962d41ad1aba1e8 +size 26818 diff --git a/Content/Levels/MerchantPrototype.umap b/Content/Levels/MerchantPrototype.umap index 7a9a334..021a2d3 100644 --- a/Content/Levels/MerchantPrototype.umap +++ b/Content/Levels/MerchantPrototype.umap @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:676563d739d9464ad55d9e31bd059f81dccf2250864c3c7bda445ea682e0083d -size 27106 +oid sha256:efb7d3016eb4dfebc7292f7eb1ced41f43b3bb7a8335554d290a522ea26270e1 +size 27144 From 29c3fdcf09394da64e602c6e06b66649c9b08e43 Mon Sep 17 00:00:00 2001 From: MH261677 Date: Sat, 14 Jan 2023 20:35:49 +0000 Subject: [PATCH 10/43] Updated Interaction, TempCharacter.cpp Created InputDisabler functions to disable player controls when dialouge box stops to start working on merchant --- .../MerchantInteraction/Interaction.cpp | 8 ++++++- .../MerchantInteraction/Interaction.h | 5 ++++ .../PlayerTemp/TempCharacter.cpp | 23 +++++++++++++++++++ .../PlayerTemp/TempCharacter.h | 4 +++- 4 files changed, 38 insertions(+), 2 deletions(-) diff --git a/Source/the_twilight_abyss/MerchantInteraction/Interaction.cpp b/Source/the_twilight_abyss/MerchantInteraction/Interaction.cpp index f295c82..ead7abb 100644 --- a/Source/the_twilight_abyss/MerchantInteraction/Interaction.cpp +++ b/Source/the_twilight_abyss/MerchantInteraction/Interaction.cpp @@ -3,6 +3,7 @@ #include "Interaction.h" +#include "Chaos/BoundingVolumeUtilities.h" #include "Components/WidgetComponent.h" @@ -25,18 +26,23 @@ void AInteraction::BeginPlay() void AInteraction::Tick(float DeltaTime) { Super::Tick(DeltaTime); - + } void AInteraction::OnInteract() { CurrentWidget = CreateWidget(GetWorld(), Widget); CurrentWidget->AddToViewport(0); + //handles the widget dissapearing from the viewport FTimerHandle WidgetTimer; GetWorldTimerManager().SetTimer(WidgetTimer, this, &AInteraction::RemoveWidget, WaitTimer, false); + } void AInteraction::RemoveWidget() { + bisDisabled = true; CurrentWidget->RemoveFromViewport(); + UE_LOG(LogTemp, Display, TEXT("setting isDisabled to true")); + } \ No newline at end of file diff --git a/Source/the_twilight_abyss/MerchantInteraction/Interaction.h b/Source/the_twilight_abyss/MerchantInteraction/Interaction.h index 64ddcbf..2a6104a 100644 --- a/Source/the_twilight_abyss/MerchantInteraction/Interaction.h +++ b/Source/the_twilight_abyss/MerchantInteraction/Interaction.h @@ -27,10 +27,15 @@ public: TSubclassOf Widget; virtual void OnInteract(); + virtual void RemoveWidget(); UPROPERTY() UUserWidget* CurrentWidget; + UPROPERTY(EditAnywhere) float WaitTimer = 8.0f; + + UPROPERTY() + bool bisDisabled = false; }; diff --git a/Source/the_twilight_abyss/PlayerTemp/TempCharacter.cpp b/Source/the_twilight_abyss/PlayerTemp/TempCharacter.cpp index 5b6bf51..7c09f12 100644 --- a/Source/the_twilight_abyss/PlayerTemp/TempCharacter.cpp +++ b/Source/the_twilight_abyss/PlayerTemp/TempCharacter.cpp @@ -96,15 +96,38 @@ void ATempCharacter::LineTraceLogic() UE_LOG(LogTemp, Display, TEXT("Not Enough Gold")); } } + // if the actor hit has the interaction component/script then it will activate the code + if (AInteraction* MyInteractable = Cast(OutHit.GetActor())) { DrawDebugLine(GetWorld(), Start, End, FColor::Green, false, 1.0f); MyInteractable->OnInteract(); + UE_LOG(LogTemp, Display, TEXT("OnInteract activated")); UE_LOG(LogTemp, Display, TEXT("HIT: %s"), *OutHit.GetActor()->GetName()); + + // While loop to check bisDisabled var until it changes to true + while (MyInteractable->bisDisabled == false) + { + if (MyInteractable->bisDisabled == true) + { + //I am creating a 5 second timer here that then executes the inputdisabler function + FTimerHandle TimerHandle; + FTimerDelegate TimerDelegate = FTimerDelegate::CreateUObject(this, &ATempCharacter::InputDisabler); + GetWorld()->GetTimerManager().SetTimer(TimerHandle, TimerDelegate, 6.0f, false); + break; + } + } } } } +void ATempCharacter::InputDisabler() +{ + UE_LOG(LogTemp, Display, TEXT("Disabling playermovement")); + GetWorld()->GetFirstPlayerController()->SetIgnoreLookInput(false); + GetWorld()->GetFirstPlayerController()->SetIgnoreMoveInput(true); +} + void ATempCharacter::UseItem(class UBaseItem* Item) { if(Item) diff --git a/Source/the_twilight_abyss/PlayerTemp/TempCharacter.h b/Source/the_twilight_abyss/PlayerTemp/TempCharacter.h index 56cc8d3..5b607c2 100644 --- a/Source/the_twilight_abyss/PlayerTemp/TempCharacter.h +++ b/Source/the_twilight_abyss/PlayerTemp/TempCharacter.h @@ -37,7 +37,8 @@ public: UPROPERTY(EditAnyWhere) float TraceDistance = 200; - + + void InputDisabler(); void LineTraceLogic(); UPROPERTY(BlueprintReadWrite, EditAnywhere, Category= "Health") @@ -52,4 +53,5 @@ public: //Using the item in the inventory UFUNCTION(BlueprintCallable, Category= "Items") void UseItem(class UBaseItem* Item); // Overriding the BaseItem Class + }; From 1d6e0171c47d1469d840a83f2bb46087fb3f2f9c Mon Sep 17 00:00:00 2001 From: MH261677 Date: Sat, 14 Jan 2023 20:38:02 +0000 Subject: [PATCH 11/43] Created BP_GoldCount in Blueprints/Display_UI Started to create the GoldCounter to display the players gold --- Content/Blueprints/Display_UI/BP_GoldCount.uasset | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 Content/Blueprints/Display_UI/BP_GoldCount.uasset diff --git a/Content/Blueprints/Display_UI/BP_GoldCount.uasset b/Content/Blueprints/Display_UI/BP_GoldCount.uasset new file mode 100644 index 0000000..a3f50e9 --- /dev/null +++ b/Content/Blueprints/Display_UI/BP_GoldCount.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:702e8d9acd00db57854c677f15c316edccc501aa66f7041b79ce713f9b85d131 +size 21474 From 43db88c1079af7e42d4431de63437031f0648353 Mon Sep 17 00:00:00 2001 From: MH261677 Date: Sat, 14 Jan 2023 22:05:20 +0000 Subject: [PATCH 12/43] Updated BP_GoldCount Made it so it shows the gold count now that you can set in the BP_TempCharacter --- Content/Blueprints/Combat_UI/CombatCharacter.uasset | 4 ++-- Content/Blueprints/Display_UI/BP_GoldCount.uasset | 4 ++-- Content/Blueprints/Player/BP_MyTempCharacter.uasset | 4 ++-- Source/the_twilight_abyss/BaseItems/InventoryComponent.h | 3 --- 4 files changed, 6 insertions(+), 9 deletions(-) diff --git a/Content/Blueprints/Combat_UI/CombatCharacter.uasset b/Content/Blueprints/Combat_UI/CombatCharacter.uasset index f58dc23..0ad7190 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:ff64a97aeb5d12435a02c4bd605bffe6ba3cf27a0a8de71e2903fdb42a622c25 -size 63137 +oid sha256:6623bdf9919b1b41c0499e229f4f70e410e946fd1da46ed119b30b701f69e035 +size 61312 diff --git a/Content/Blueprints/Display_UI/BP_GoldCount.uasset b/Content/Blueprints/Display_UI/BP_GoldCount.uasset index a3f50e9..ea0021a 100644 --- a/Content/Blueprints/Display_UI/BP_GoldCount.uasset +++ b/Content/Blueprints/Display_UI/BP_GoldCount.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:702e8d9acd00db57854c677f15c316edccc501aa66f7041b79ce713f9b85d131 -size 21474 +oid sha256:59e4c880b7279d4af4d95ad0792e362b410c84d52923b9e585826cf4a2c4d3f9 +size 51095 diff --git a/Content/Blueprints/Player/BP_MyTempCharacter.uasset b/Content/Blueprints/Player/BP_MyTempCharacter.uasset index 93bd6e5..90d46c3 100644 --- a/Content/Blueprints/Player/BP_MyTempCharacter.uasset +++ b/Content/Blueprints/Player/BP_MyTempCharacter.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:cdb552dab713052cd07463c8a6cdb840878d73101872e5f076cebdb7f909b84a -size 51402 +oid sha256:e2b4aebf4396409ffd1683e12baa6c6503ed46054aa8976cfad04ad3e85511e2 +size 56290 diff --git a/Source/the_twilight_abyss/BaseItems/InventoryComponent.h b/Source/the_twilight_abyss/BaseItems/InventoryComponent.h index 7ecd224..1ec1fb1 100644 --- a/Source/the_twilight_abyss/BaseItems/InventoryComponent.h +++ b/Source/the_twilight_abyss/BaseItems/InventoryComponent.h @@ -33,9 +33,6 @@ public: UPROPERTY(EditDefaultsOnly, Category= "Inventory") int32 MaxItemSlots; - - UPROPERTY(EditDefaultsOnly, Category = "Inventory") - int MaxItemStack; UPROPERTY(BlueprintAssignable, Category= "Inventory") FOnInventoryUpdated OnInventoryUpdated; //This is our delegate From f25b0b970d9a10691f79f8c3902d578a75b8ef14 Mon Sep 17 00:00:00 2001 From: MH261677 Date: Sat, 14 Jan 2023 22:10:29 +0000 Subject: [PATCH 13/43] Updated BP_GoldCount Added health value and made it reflect the players health variable --- Content/Blueprints/Display_UI/BP_GoldCount.uasset | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Content/Blueprints/Display_UI/BP_GoldCount.uasset b/Content/Blueprints/Display_UI/BP_GoldCount.uasset index ea0021a..01f56ab 100644 --- a/Content/Blueprints/Display_UI/BP_GoldCount.uasset +++ b/Content/Blueprints/Display_UI/BP_GoldCount.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:59e4c880b7279d4af4d95ad0792e362b410c84d52923b9e585826cf4a2c4d3f9 -size 51095 +oid sha256:4bc0a1589f8ce9c55a2de489e311b50bdfa1c8fce390a613ea93f0b6655e9bfb +size 71730 From b4e741bfd86719a3d5ce46b2cf0172297e4e95ae Mon Sep 17 00:00:00 2001 From: MH261677 Date: Sat, 14 Jan 2023 22:11:15 +0000 Subject: [PATCH 14/43] Changed BP_GoldCount to BP_ImportantStats --- Content/Blueprints/Display_UI/BP_GoldCount.uasset | 3 --- Content/Blueprints/Display_UI/BP_ImportantStats.uasset | 3 +++ Content/Blueprints/Player/BP_MyTempCharacter.uasset | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) delete mode 100644 Content/Blueprints/Display_UI/BP_GoldCount.uasset create mode 100644 Content/Blueprints/Display_UI/BP_ImportantStats.uasset diff --git a/Content/Blueprints/Display_UI/BP_GoldCount.uasset b/Content/Blueprints/Display_UI/BP_GoldCount.uasset deleted file mode 100644 index 01f56ab..0000000 --- a/Content/Blueprints/Display_UI/BP_GoldCount.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:4bc0a1589f8ce9c55a2de489e311b50bdfa1c8fce390a613ea93f0b6655e9bfb -size 71730 diff --git a/Content/Blueprints/Display_UI/BP_ImportantStats.uasset b/Content/Blueprints/Display_UI/BP_ImportantStats.uasset new file mode 100644 index 0000000..b0ef34c --- /dev/null +++ b/Content/Blueprints/Display_UI/BP_ImportantStats.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ecadf653938c7e2137ad59b6476da03b5bf1046dbd16b88954a9cb4286ed16b4 +size 71800 diff --git a/Content/Blueprints/Player/BP_MyTempCharacter.uasset b/Content/Blueprints/Player/BP_MyTempCharacter.uasset index 90d46c3..3cd68ed 100644 --- a/Content/Blueprints/Player/BP_MyTempCharacter.uasset +++ b/Content/Blueprints/Player/BP_MyTempCharacter.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e2b4aebf4396409ffd1683e12baa6c6503ed46054aa8976cfad04ad3e85511e2 -size 56290 +oid sha256:48787fb18ad9d51b32e5b837c8c1605b11d1b60014c75f2efa1ab910d621415b +size 56881 From 808b567d6f5a99fbd2e9462f86820b5737e903f0 Mon Sep 17 00:00:00 2001 From: MH261677 Date: Sun, 15 Jan 2023 15:06:30 +0000 Subject: [PATCH 15/43] Created BP_ShopSelector Created the widget for the item selector when you are in the shop --- Content/Blueprints/Merchant/Merchant_UI/BP_ShopSelector.uasset | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 Content/Blueprints/Merchant/Merchant_UI/BP_ShopSelector.uasset diff --git a/Content/Blueprints/Merchant/Merchant_UI/BP_ShopSelector.uasset b/Content/Blueprints/Merchant/Merchant_UI/BP_ShopSelector.uasset new file mode 100644 index 0000000..7c68b71 --- /dev/null +++ b/Content/Blueprints/Merchant/Merchant_UI/BP_ShopSelector.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:fe7246b825912bddc35b9b23052729ba263dc40afc2fbbf35f24cddd2e612594 +size 25723 From 4fa9ca74dd949724a9706c886fba57f076349400 Mon Sep 17 00:00:00 2001 From: MH261677 Date: Sun, 15 Jan 2023 16:13:11 +0000 Subject: [PATCH 16/43] Updated Interaction.cpp Fixed the game crashing if there isnt any WBP inputted in tempchar --- .../MerchantInteraction/Interaction.cpp | 25 +++++++++++++++---- .../MerchantInteraction/Interaction.h | 11 ++++++-- 2 files changed, 29 insertions(+), 7 deletions(-) diff --git a/Source/the_twilight_abyss/MerchantInteraction/Interaction.cpp b/Source/the_twilight_abyss/MerchantInteraction/Interaction.cpp index ead7abb..5cb2b8a 100644 --- a/Source/the_twilight_abyss/MerchantInteraction/Interaction.cpp +++ b/Source/the_twilight_abyss/MerchantInteraction/Interaction.cpp @@ -31,9 +31,16 @@ void AInteraction::Tick(float DeltaTime) void AInteraction::OnInteract() { - CurrentWidget = CreateWidget(GetWorld(), Widget); - CurrentWidget->AddToViewport(0); - //handles the widget dissapearing from the viewport + ShopDialogWidget = CreateWidget(GetWorld(), ShopDialog); + if (ShopDialogWidget == nullptr) + { + return; + } + else + { + ShopDialogWidget->AddToViewport(0); + } + //handles the widget disappearing from the viewport FTimerHandle WidgetTimer; GetWorldTimerManager().SetTimer(WidgetTimer, this, &AInteraction::RemoveWidget, WaitTimer, false); @@ -42,7 +49,15 @@ void AInteraction::OnInteract() void AInteraction::RemoveWidget() { bisDisabled = true; - CurrentWidget->RemoveFromViewport(); + ShopDialogWidget->RemoveFromViewport(); UE_LOG(LogTemp, Display, TEXT("setting isDisabled to true")); - + ItemSelectorWidget = CreateWidget(GetWorld(), ItemSelector); + if (ItemSelectorWidget == nullptr) + { + return; + } + else + { + ItemSelectorWidget->AddToViewport(0); + } } \ No newline at end of file diff --git a/Source/the_twilight_abyss/MerchantInteraction/Interaction.h b/Source/the_twilight_abyss/MerchantInteraction/Interaction.h index 2a6104a..fbeb15d 100644 --- a/Source/the_twilight_abyss/MerchantInteraction/Interaction.h +++ b/Source/the_twilight_abyss/MerchantInteraction/Interaction.h @@ -24,13 +24,20 @@ public: virtual void Tick(float DeltaTime) override; UPROPERTY(EditAnywhere) - TSubclassOf Widget; + TSubclassOf ShopDialog; + + UPROPERTY(EditAnywhere) + TSubclassOf ItemSelector; virtual void OnInteract(); virtual void RemoveWidget(); + UPROPERTY() - UUserWidget* CurrentWidget; + UUserWidget* ShopDialogWidget; + + UPROPERTY() + UUserWidget* ItemSelectorWidget; UPROPERTY(EditAnywhere) float WaitTimer = 8.0f; From e7fa8f4c63c82fa7e97e3dbd057f2899fe101324 Mon Sep 17 00:00:00 2001 From: MH261677 Date: Sun, 15 Jan 2023 16:14:03 +0000 Subject: [PATCH 17/43] Updated BP_ShopSelector Added a close button which re-enables all the input again by calling a function in TempChar --- Content/Blueprints/Merchant/BP_MerchantGameMode.uasset | 3 --- .../Blueprints/Merchant/Merchant_UI/BP_ShopSelector.uasset | 4 ++-- Content/Levels/MerchantPrototype.umap | 4 ++-- Content/Merchant/BP_MerchantGameMode.uasset | 4 ++-- 4 files changed, 6 insertions(+), 9 deletions(-) delete mode 100644 Content/Blueprints/Merchant/BP_MerchantGameMode.uasset diff --git a/Content/Blueprints/Merchant/BP_MerchantGameMode.uasset b/Content/Blueprints/Merchant/BP_MerchantGameMode.uasset deleted file mode 100644 index 38dc788..0000000 --- a/Content/Blueprints/Merchant/BP_MerchantGameMode.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:fafeaa8343b7186e04b9d4e83254fa951e1135f29c66e0eba4c159633d570fb2 -size 27659 diff --git a/Content/Blueprints/Merchant/Merchant_UI/BP_ShopSelector.uasset b/Content/Blueprints/Merchant/Merchant_UI/BP_ShopSelector.uasset index 7c68b71..b8dacd0 100644 --- a/Content/Blueprints/Merchant/Merchant_UI/BP_ShopSelector.uasset +++ b/Content/Blueprints/Merchant/Merchant_UI/BP_ShopSelector.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:fe7246b825912bddc35b9b23052729ba263dc40afc2fbbf35f24cddd2e612594 -size 25723 +oid sha256:48ca274e48ad60e875654b1511a6b4ff981f6a079d0435a15ed3590b03c497ec +size 52563 diff --git a/Content/Levels/MerchantPrototype.umap b/Content/Levels/MerchantPrototype.umap index 021a2d3..d9c7cf4 100644 --- a/Content/Levels/MerchantPrototype.umap +++ b/Content/Levels/MerchantPrototype.umap @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:efb7d3016eb4dfebc7292f7eb1ced41f43b3bb7a8335554d290a522ea26270e1 -size 27144 +oid sha256:7561f73b5996a2170a51911f08cd6265413876a28382fe5d3d16a416683da860 +size 27636 diff --git a/Content/Merchant/BP_MerchantGameMode.uasset b/Content/Merchant/BP_MerchantGameMode.uasset index 283c991..31edcb1 100644 --- a/Content/Merchant/BP_MerchantGameMode.uasset +++ b/Content/Merchant/BP_MerchantGameMode.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d940b475e6be75f5270d92b3b8a3d1d6ba48035329560f1b2bbb2a02b9e711e2 -size 36670 +oid sha256:2cbd536daaa66932e59ccd0514cade57f6b39c63166a21d6eba166709178c35d +size 36431 From 52639d9af666a5af55a693bd3055edb2f1276f29 Mon Sep 17 00:00:00 2001 From: MH261677 Date: Sun, 15 Jan 2023 16:15:06 +0000 Subject: [PATCH 18/43] Updated TempCharacter.cpp, Interaction.cpp Added a function which can be called from blueprints to re-enable all input once a button is pressed Fixed interaction boolean to reset itself back to false to make it so player can talk to NPC again without having to restart the game to interact with it. --- .../MerchantInteraction/Interaction.cpp | 1 + .../PlayerTemp/TempCharacter.cpp | 17 ++++++++++++++++- .../PlayerTemp/TempCharacter.h | 3 +++ 3 files changed, 20 insertions(+), 1 deletion(-) diff --git a/Source/the_twilight_abyss/MerchantInteraction/Interaction.cpp b/Source/the_twilight_abyss/MerchantInteraction/Interaction.cpp index 5cb2b8a..27c894f 100644 --- a/Source/the_twilight_abyss/MerchantInteraction/Interaction.cpp +++ b/Source/the_twilight_abyss/MerchantInteraction/Interaction.cpp @@ -59,5 +59,6 @@ void AInteraction::RemoveWidget() else { ItemSelectorWidget->AddToViewport(0); + bisDisabled = false; } } \ No newline at end of file diff --git a/Source/the_twilight_abyss/PlayerTemp/TempCharacter.cpp b/Source/the_twilight_abyss/PlayerTemp/TempCharacter.cpp index 7c09f12..9a8920b 100644 --- a/Source/the_twilight_abyss/PlayerTemp/TempCharacter.cpp +++ b/Source/the_twilight_abyss/PlayerTemp/TempCharacter.cpp @@ -124,8 +124,21 @@ void ATempCharacter::LineTraceLogic() void ATempCharacter::InputDisabler() { UE_LOG(LogTemp, Display, TEXT("Disabling playermovement")); - GetWorld()->GetFirstPlayerController()->SetIgnoreLookInput(false); + GetWorld()->GetFirstPlayerController()->SetIgnoreLookInput(true); GetWorld()->GetFirstPlayerController()->SetIgnoreMoveInput(true); + GetWorld()->GetFirstPlayerController()->bShowMouseCursor = true; + GetWorld()->GetFirstPlayerController()->bEnableClickEvents = true; + GetWorld()->GetFirstPlayerController()->bEnableMouseOverEvents = true; +} + +void ATempCharacter::InputEnabler() +{ + UE_LOG(LogTemp, Display, TEXT("Enabling Inputs")); + GetWorld()->GetFirstPlayerController()->SetIgnoreLookInput(false); + GetWorld()->GetFirstPlayerController()->SetIgnoreMoveInput(false); + GetWorld()->GetFirstPlayerController()->bShowMouseCursor = false; + GetWorld()->GetFirstPlayerController()->bEnableClickEvents = false; + GetWorld()->GetFirstPlayerController()->bEnableMouseOverEvents = false; } void ATempCharacter::UseItem(class UBaseItem* Item) @@ -137,3 +150,5 @@ void ATempCharacter::UseItem(class UBaseItem* Item) } } + + diff --git a/Source/the_twilight_abyss/PlayerTemp/TempCharacter.h b/Source/the_twilight_abyss/PlayerTemp/TempCharacter.h index 5b607c2..cc97668 100644 --- a/Source/the_twilight_abyss/PlayerTemp/TempCharacter.h +++ b/Source/the_twilight_abyss/PlayerTemp/TempCharacter.h @@ -53,5 +53,8 @@ public: //Using the item in the inventory UFUNCTION(BlueprintCallable, Category= "Items") void UseItem(class UBaseItem* Item); // Overriding the BaseItem Class + + UFUNCTION(BlueprintCallable) + void InputEnabler(); }; From 45eae63b760c210ade78f05515e6aa5a4a0677e4 Mon Sep 17 00:00:00 2001 From: KACPER Szelest Date: Mon, 16 Jan 2023 11:23:43 +0000 Subject: [PATCH 19/43] Added Cave tunnel modular assets I added multiple cave tunnels to allow us to create a level placing parts of tunnels down to make it --- Content/Assets/Objects/Caves/Blue_rocks.uasset | 3 +++ .../Assets/Objects/Caves/Rock035_2K_AmbientOcclusion.uasset | 3 +++ Content/Assets/Objects/Caves/Rock035_2K_Color.uasset | 3 +++ Content/Assets/Objects/Caves/Rock035_2K_Displacement.uasset | 3 +++ Content/Assets/Objects/Caves/Rock035_2K_NormalDX.uasset | 3 +++ Content/Assets/Objects/Caves/Rock035_2K_Roughness.uasset | 3 +++ Content/Assets/Objects/Caves/Rock_tunnels_Curve.uasset | 3 +++ Content/Assets/Objects/Caves/Rock_tunnels_Ramp.uasset | 3 +++ Content/Assets/Objects/Caves/Rock_tunnels_Straight.uasset | 3 +++ 9 files changed, 27 insertions(+) create mode 100644 Content/Assets/Objects/Caves/Blue_rocks.uasset create mode 100644 Content/Assets/Objects/Caves/Rock035_2K_AmbientOcclusion.uasset create mode 100644 Content/Assets/Objects/Caves/Rock035_2K_Color.uasset create mode 100644 Content/Assets/Objects/Caves/Rock035_2K_Displacement.uasset create mode 100644 Content/Assets/Objects/Caves/Rock035_2K_NormalDX.uasset create mode 100644 Content/Assets/Objects/Caves/Rock035_2K_Roughness.uasset create mode 100644 Content/Assets/Objects/Caves/Rock_tunnels_Curve.uasset create mode 100644 Content/Assets/Objects/Caves/Rock_tunnels_Ramp.uasset create mode 100644 Content/Assets/Objects/Caves/Rock_tunnels_Straight.uasset diff --git a/Content/Assets/Objects/Caves/Blue_rocks.uasset b/Content/Assets/Objects/Caves/Blue_rocks.uasset new file mode 100644 index 0000000..2c170f9 --- /dev/null +++ b/Content/Assets/Objects/Caves/Blue_rocks.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:71d692c8faf65abfe095b323c201c8ebaf1ca07a187adf94f2f08b1ccd10d6ba +size 17611 diff --git a/Content/Assets/Objects/Caves/Rock035_2K_AmbientOcclusion.uasset b/Content/Assets/Objects/Caves/Rock035_2K_AmbientOcclusion.uasset new file mode 100644 index 0000000..ac7b113 --- /dev/null +++ b/Content/Assets/Objects/Caves/Rock035_2K_AmbientOcclusion.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:1dab342800a73d561dedf51576b921d245ddc3e5cd839fe5514ff23b3c8e9613 +size 2160258 diff --git a/Content/Assets/Objects/Caves/Rock035_2K_Color.uasset b/Content/Assets/Objects/Caves/Rock035_2K_Color.uasset new file mode 100644 index 0000000..d6f0b01 --- /dev/null +++ b/Content/Assets/Objects/Caves/Rock035_2K_Color.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:1d6f4555504d67c70d4b066018fa372568b7db3936f2a4d75c35b86aabe56eb9 +size 8136666 diff --git a/Content/Assets/Objects/Caves/Rock035_2K_Displacement.uasset b/Content/Assets/Objects/Caves/Rock035_2K_Displacement.uasset new file mode 100644 index 0000000..26ab821 --- /dev/null +++ b/Content/Assets/Objects/Caves/Rock035_2K_Displacement.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:0f7bef632ecd83ffc470a6d1dd584845b153d23d3c64f2f3dc41dc42191bf7dc +size 5799704 diff --git a/Content/Assets/Objects/Caves/Rock035_2K_NormalDX.uasset b/Content/Assets/Objects/Caves/Rock035_2K_NormalDX.uasset new file mode 100644 index 0000000..3805c71 --- /dev/null +++ b/Content/Assets/Objects/Caves/Rock035_2K_NormalDX.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:3af17ba1753e7cee1ec4c4b7a9700d7c025065ca004183a18937674a947040d7 +size 27157193 diff --git a/Content/Assets/Objects/Caves/Rock035_2K_Roughness.uasset b/Content/Assets/Objects/Caves/Rock035_2K_Roughness.uasset new file mode 100644 index 0000000..4cbb826 --- /dev/null +++ b/Content/Assets/Objects/Caves/Rock035_2K_Roughness.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:8d4c561b121bace9d90204d9a99b6d85f4923f122c7a03d0d80d2b92836b067d +size 2571677 diff --git a/Content/Assets/Objects/Caves/Rock_tunnels_Curve.uasset b/Content/Assets/Objects/Caves/Rock_tunnels_Curve.uasset new file mode 100644 index 0000000..2f6befd --- /dev/null +++ b/Content/Assets/Objects/Caves/Rock_tunnels_Curve.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:32273fd87096017291e88adf7ca5cef8eb591282345e1683507201bb04ddccd7 +size 121650 diff --git a/Content/Assets/Objects/Caves/Rock_tunnels_Ramp.uasset b/Content/Assets/Objects/Caves/Rock_tunnels_Ramp.uasset new file mode 100644 index 0000000..b89cfd4 --- /dev/null +++ b/Content/Assets/Objects/Caves/Rock_tunnels_Ramp.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:5736b30bf7801b6d3ab6050306dc4c362f0ad2883199a683edc36d6f22a42685 +size 43733 diff --git a/Content/Assets/Objects/Caves/Rock_tunnels_Straight.uasset b/Content/Assets/Objects/Caves/Rock_tunnels_Straight.uasset new file mode 100644 index 0000000..5c2d927 --- /dev/null +++ b/Content/Assets/Objects/Caves/Rock_tunnels_Straight.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:89b21a686a181bf627e6c52c4e179f981374f44836b29f8950fe8a256ff5fabc +size 42016 From c5ce519fae834b3b2f99a3b5cd19bfdb67a49944 Mon Sep 17 00:00:00 2001 From: KACPER Szelest Date: Mon, 16 Jan 2023 11:24:18 +0000 Subject: [PATCH 20/43] Added rope bridge modular pack I added the rope bridge modular pack to allow us to create long rope bridges and connect them wherever we want --- Content/Assets/Objects/Rope_Bridge/Material_1722.uasset | 3 +++ Content/Assets/Objects/Rope_Bridge/Material_1722_ncl1_1.uasset | 3 +++ Content/Assets/Objects/Rope_Bridge/Material_1722_ncl1_2.uasset | 3 +++ Content/Assets/Objects/Rope_Bridge/Material_1722_ncl1_3.uasset | 3 +++ Content/Assets/Objects/Rope_Bridge/Material_1722_ncl1_4.uasset | 3 +++ Content/Assets/Objects/Rope_Bridge/Rope.uasset | 3 +++ Content/Assets/Objects/Rope_Bridge/Rope_001_normal.uasset | 3 +++ .../Assets/Objects/Rope_Bridge/Rope_001_normal_ncl1_1.uasset | 3 +++ .../Assets/Objects/Rope_Bridge/Rope_001_normal_ncl1_2.uasset | 3 +++ .../Assets/Objects/Rope_Bridge/Rope_001_normal_ncl1_3.uasset | 3 +++ .../Assets/Objects/Rope_Bridge/Rope_001_normal_ncl1_4.uasset | 3 +++ Content/Assets/Objects/Rope_Bridge/Rope_001_roughness.uasset | 3 +++ .../Objects/Rope_Bridge/Rope_001_roughness_ncl1_1.uasset | 3 +++ .../Objects/Rope_Bridge/Rope_001_roughness_ncl1_2.uasset | 3 +++ .../Objects/Rope_Bridge/Rope_001_roughness_ncl1_3.uasset | 3 +++ .../Objects/Rope_Bridge/Rope_001_roughness_ncl1_4.uasset | 3 +++ Content/Assets/Objects/Rope_Bridge/Rope_035.uasset | 3 +++ Content/Assets/Objects/Rope_Bridge/Rope_036.uasset | 3 +++ Content/Assets/Objects/Rope_Bridge/Rope_037.uasset | 3 +++ Content/Assets/Objects/Rope_Bridge/Rope_038.uasset | 3 +++ Content/Assets/Objects/Rope_Bridge/Rope_bridge_Rope.uasset | 3 +++ Content/Assets/Objects/Rope_Bridge/Rope_bridge_Rope_001.uasset | 3 +++ Content/Assets/Objects/Rope_Bridge/Rope_bridge_Rope_002.uasset | 3 +++ Content/Assets/Objects/Rope_Bridge/Rope_bridge_Rope_003.uasset | 3 +++ Content/Assets/Objects/Rope_Bridge/Rope_bridge_Rope_004.uasset | 3 +++ Content/Assets/Objects/Rope_Bridge/Rope_bridge_Rope_005.uasset | 3 +++ Content/Assets/Objects/Rope_Bridge/Rope_bridge_Rope_006.uasset | 3 +++ Content/Assets/Objects/Rope_Bridge/Rope_bridge_Rope_007.uasset | 3 +++ Content/Assets/Objects/Rope_Bridge/Rope_bridge_Rope_008.uasset | 3 +++ Content/Assets/Objects/Rope_Bridge/Rope_bridge_Rope_009.uasset | 3 +++ Content/Assets/Objects/Rope_Bridge/Rope_bridge_Rope_010.uasset | 3 +++ Content/Assets/Objects/Rope_Bridge/Rope_bridge_Rope_011.uasset | 3 +++ Content/Assets/Objects/Rope_Bridge/Rope_bridge_Rope_012.uasset | 3 +++ Content/Assets/Objects/Rope_Bridge/Rope_bridge_Rope_013.uasset | 3 +++ Content/Assets/Objects/Rope_Bridge/Rope_bridge_Rope_014.uasset | 3 +++ Content/Assets/Objects/Rope_Bridge/Rope_bridge_Rope_015.uasset | 3 +++ Content/Assets/Objects/Rope_Bridge/Rope_bridge_Rope_016.uasset | 3 +++ Content/Assets/Objects/Rope_Bridge/Rope_bridge_Rope_017.uasset | 3 +++ Content/Assets/Objects/Rope_Bridge/Rope_bridge_Rope_018.uasset | 3 +++ .../Assets/Objects/Rope_Bridge/Rope_bridge_Rope_pole.uasset | 3 +++ .../Objects/Rope_Bridge/Rope_bridge_Rope_pole_001.uasset | 3 +++ .../Objects/Rope_Bridge/Rope_bridge_Rope_pole_002.uasset | 3 +++ .../Objects/Rope_Bridge/Rope_bridge_Rope_pole_003.uasset | 3 +++ .../Assets/Objects/Rope_Bridge/Rope_bridge_Wood_planks.uasset | 3 +++ .../Assets/Objects/Rope_Bridge/Rope_bridge_wood_planks1.uasset | 3 +++ .../Objects/Rope_Bridge/Rope_bridge_wood_planks_001.uasset | 3 +++ Content/Assets/Objects/Rope_Bridge/Wood_bark_real.uasset | 3 +++ Content/Assets/Objects/Rope_Bridge/Wood_bark_real_001.uasset | 3 +++ Content/Assets/Objects/Rope_Bridge/Wood_plank.uasset | 3 +++ Content/Assets/Objects/Rope_Bridge/Wood_plank_002.uasset | 3 +++ Content/Assets/Objects/Rope_Bridge/bark_willow_diff_1k.uasset | 3 +++ .../Objects/Rope_Bridge/bark_willow_diff_1k_ncl1_1.uasset | 3 +++ .../Assets/Objects/Rope_Bridge/bark_willow_nor_dx_1k.uasset | 3 +++ .../Objects/Rope_Bridge/bark_willow_nor_dx_1k_ncl1_1.uasset | 3 +++ Content/Assets/Objects/Rope_Bridge/bark_willow_rough_1k.uasset | 3 +++ .../Objects/Rope_Bridge/bark_willow_rough_1k_ncl1_1.uasset | 3 +++ .../Assets/Objects/Rope_Bridge/wood_planks_grey_diff_2k.uasset | 3 +++ .../Objects/Rope_Bridge/wood_planks_grey_diff_2k_ncl1_1.uasset | 3 +++ .../Objects/Rope_Bridge/wood_planks_grey_nor_dx_2k.uasset | 3 +++ .../Rope_Bridge/wood_planks_grey_nor_dx_2k_ncl1_1.uasset | 3 +++ .../Objects/Rope_Bridge/wood_planks_grey_rough_2k.uasset | 3 +++ .../Rope_Bridge/wood_planks_grey_rough_2k_ncl1_1.uasset | 3 +++ 62 files changed, 186 insertions(+) create mode 100644 Content/Assets/Objects/Rope_Bridge/Material_1722.uasset create mode 100644 Content/Assets/Objects/Rope_Bridge/Material_1722_ncl1_1.uasset create mode 100644 Content/Assets/Objects/Rope_Bridge/Material_1722_ncl1_2.uasset create mode 100644 Content/Assets/Objects/Rope_Bridge/Material_1722_ncl1_3.uasset create mode 100644 Content/Assets/Objects/Rope_Bridge/Material_1722_ncl1_4.uasset create mode 100644 Content/Assets/Objects/Rope_Bridge/Rope.uasset create mode 100644 Content/Assets/Objects/Rope_Bridge/Rope_001_normal.uasset create mode 100644 Content/Assets/Objects/Rope_Bridge/Rope_001_normal_ncl1_1.uasset create mode 100644 Content/Assets/Objects/Rope_Bridge/Rope_001_normal_ncl1_2.uasset create mode 100644 Content/Assets/Objects/Rope_Bridge/Rope_001_normal_ncl1_3.uasset create mode 100644 Content/Assets/Objects/Rope_Bridge/Rope_001_normal_ncl1_4.uasset create mode 100644 Content/Assets/Objects/Rope_Bridge/Rope_001_roughness.uasset create mode 100644 Content/Assets/Objects/Rope_Bridge/Rope_001_roughness_ncl1_1.uasset create mode 100644 Content/Assets/Objects/Rope_Bridge/Rope_001_roughness_ncl1_2.uasset create mode 100644 Content/Assets/Objects/Rope_Bridge/Rope_001_roughness_ncl1_3.uasset create mode 100644 Content/Assets/Objects/Rope_Bridge/Rope_001_roughness_ncl1_4.uasset create mode 100644 Content/Assets/Objects/Rope_Bridge/Rope_035.uasset create mode 100644 Content/Assets/Objects/Rope_Bridge/Rope_036.uasset create mode 100644 Content/Assets/Objects/Rope_Bridge/Rope_037.uasset create mode 100644 Content/Assets/Objects/Rope_Bridge/Rope_038.uasset create mode 100644 Content/Assets/Objects/Rope_Bridge/Rope_bridge_Rope.uasset create mode 100644 Content/Assets/Objects/Rope_Bridge/Rope_bridge_Rope_001.uasset create mode 100644 Content/Assets/Objects/Rope_Bridge/Rope_bridge_Rope_002.uasset create mode 100644 Content/Assets/Objects/Rope_Bridge/Rope_bridge_Rope_003.uasset create mode 100644 Content/Assets/Objects/Rope_Bridge/Rope_bridge_Rope_004.uasset create mode 100644 Content/Assets/Objects/Rope_Bridge/Rope_bridge_Rope_005.uasset create mode 100644 Content/Assets/Objects/Rope_Bridge/Rope_bridge_Rope_006.uasset create mode 100644 Content/Assets/Objects/Rope_Bridge/Rope_bridge_Rope_007.uasset create mode 100644 Content/Assets/Objects/Rope_Bridge/Rope_bridge_Rope_008.uasset create mode 100644 Content/Assets/Objects/Rope_Bridge/Rope_bridge_Rope_009.uasset create mode 100644 Content/Assets/Objects/Rope_Bridge/Rope_bridge_Rope_010.uasset create mode 100644 Content/Assets/Objects/Rope_Bridge/Rope_bridge_Rope_011.uasset create mode 100644 Content/Assets/Objects/Rope_Bridge/Rope_bridge_Rope_012.uasset create mode 100644 Content/Assets/Objects/Rope_Bridge/Rope_bridge_Rope_013.uasset create mode 100644 Content/Assets/Objects/Rope_Bridge/Rope_bridge_Rope_014.uasset create mode 100644 Content/Assets/Objects/Rope_Bridge/Rope_bridge_Rope_015.uasset create mode 100644 Content/Assets/Objects/Rope_Bridge/Rope_bridge_Rope_016.uasset create mode 100644 Content/Assets/Objects/Rope_Bridge/Rope_bridge_Rope_017.uasset create mode 100644 Content/Assets/Objects/Rope_Bridge/Rope_bridge_Rope_018.uasset create mode 100644 Content/Assets/Objects/Rope_Bridge/Rope_bridge_Rope_pole.uasset create mode 100644 Content/Assets/Objects/Rope_Bridge/Rope_bridge_Rope_pole_001.uasset create mode 100644 Content/Assets/Objects/Rope_Bridge/Rope_bridge_Rope_pole_002.uasset create mode 100644 Content/Assets/Objects/Rope_Bridge/Rope_bridge_Rope_pole_003.uasset create mode 100644 Content/Assets/Objects/Rope_Bridge/Rope_bridge_Wood_planks.uasset create mode 100644 Content/Assets/Objects/Rope_Bridge/Rope_bridge_wood_planks1.uasset create mode 100644 Content/Assets/Objects/Rope_Bridge/Rope_bridge_wood_planks_001.uasset create mode 100644 Content/Assets/Objects/Rope_Bridge/Wood_bark_real.uasset create mode 100644 Content/Assets/Objects/Rope_Bridge/Wood_bark_real_001.uasset create mode 100644 Content/Assets/Objects/Rope_Bridge/Wood_plank.uasset create mode 100644 Content/Assets/Objects/Rope_Bridge/Wood_plank_002.uasset create mode 100644 Content/Assets/Objects/Rope_Bridge/bark_willow_diff_1k.uasset create mode 100644 Content/Assets/Objects/Rope_Bridge/bark_willow_diff_1k_ncl1_1.uasset create mode 100644 Content/Assets/Objects/Rope_Bridge/bark_willow_nor_dx_1k.uasset create mode 100644 Content/Assets/Objects/Rope_Bridge/bark_willow_nor_dx_1k_ncl1_1.uasset create mode 100644 Content/Assets/Objects/Rope_Bridge/bark_willow_rough_1k.uasset create mode 100644 Content/Assets/Objects/Rope_Bridge/bark_willow_rough_1k_ncl1_1.uasset create mode 100644 Content/Assets/Objects/Rope_Bridge/wood_planks_grey_diff_2k.uasset create mode 100644 Content/Assets/Objects/Rope_Bridge/wood_planks_grey_diff_2k_ncl1_1.uasset create mode 100644 Content/Assets/Objects/Rope_Bridge/wood_planks_grey_nor_dx_2k.uasset create mode 100644 Content/Assets/Objects/Rope_Bridge/wood_planks_grey_nor_dx_2k_ncl1_1.uasset create mode 100644 Content/Assets/Objects/Rope_Bridge/wood_planks_grey_rough_2k.uasset create mode 100644 Content/Assets/Objects/Rope_Bridge/wood_planks_grey_rough_2k_ncl1_1.uasset diff --git a/Content/Assets/Objects/Rope_Bridge/Material_1722.uasset b/Content/Assets/Objects/Rope_Bridge/Material_1722.uasset new file mode 100644 index 0000000..81c8555 --- /dev/null +++ b/Content/Assets/Objects/Rope_Bridge/Material_1722.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:509680d40ff920501aa48356656693647ee65a5715b29082a4f1ef47de4149fd +size 103815 diff --git a/Content/Assets/Objects/Rope_Bridge/Material_1722_ncl1_1.uasset b/Content/Assets/Objects/Rope_Bridge/Material_1722_ncl1_1.uasset new file mode 100644 index 0000000..7e983b4 --- /dev/null +++ b/Content/Assets/Objects/Rope_Bridge/Material_1722_ncl1_1.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ff1d0b261afa29dc597bb095852a4a182ea3ef38c71a02e90a2a2735cfa16181 +size 103849 diff --git a/Content/Assets/Objects/Rope_Bridge/Material_1722_ncl1_2.uasset b/Content/Assets/Objects/Rope_Bridge/Material_1722_ncl1_2.uasset new file mode 100644 index 0000000..92ad9a8 --- /dev/null +++ b/Content/Assets/Objects/Rope_Bridge/Material_1722_ncl1_2.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:57a342ae162b8268d5387b1c808217621d4d8b3c28afcc37ade1585a972b805b +size 103849 diff --git a/Content/Assets/Objects/Rope_Bridge/Material_1722_ncl1_3.uasset b/Content/Assets/Objects/Rope_Bridge/Material_1722_ncl1_3.uasset new file mode 100644 index 0000000..243cb9c --- /dev/null +++ b/Content/Assets/Objects/Rope_Bridge/Material_1722_ncl1_3.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:97077e59f939212afef732ded28efc55104fcb33d50207ba80de0951a1bc9482 +size 103849 diff --git a/Content/Assets/Objects/Rope_Bridge/Material_1722_ncl1_4.uasset b/Content/Assets/Objects/Rope_Bridge/Material_1722_ncl1_4.uasset new file mode 100644 index 0000000..7e2e898 --- /dev/null +++ b/Content/Assets/Objects/Rope_Bridge/Material_1722_ncl1_4.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:510589aa9ea8134ef59b267102b6b2b34a75f0e105bb39ad4c57c684dd00c4c3 +size 103849 diff --git a/Content/Assets/Objects/Rope_Bridge/Rope.uasset b/Content/Assets/Objects/Rope_Bridge/Rope.uasset new file mode 100644 index 0000000..1ebaa4a --- /dev/null +++ b/Content/Assets/Objects/Rope_Bridge/Rope.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:877d9dd612d9f4160c39b8b97c3b4933a322cb1af286041b666158632c664512 +size 12789 diff --git a/Content/Assets/Objects/Rope_Bridge/Rope_001_normal.uasset b/Content/Assets/Objects/Rope_Bridge/Rope_001_normal.uasset new file mode 100644 index 0000000..7c8b717 --- /dev/null +++ b/Content/Assets/Objects/Rope_Bridge/Rope_001_normal.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:4f3a25c9b0f70268ad49582f7625a7ef67ecb0f6713a0385e069d74594234af9 +size 228235 diff --git a/Content/Assets/Objects/Rope_Bridge/Rope_001_normal_ncl1_1.uasset b/Content/Assets/Objects/Rope_Bridge/Rope_001_normal_ncl1_1.uasset new file mode 100644 index 0000000..836c63e --- /dev/null +++ b/Content/Assets/Objects/Rope_Bridge/Rope_001_normal_ncl1_1.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d5932f5506de8b82dc641535de677e94a42c8a962173ea72b608c1384bc3b2f3 +size 228259 diff --git a/Content/Assets/Objects/Rope_Bridge/Rope_001_normal_ncl1_2.uasset b/Content/Assets/Objects/Rope_Bridge/Rope_001_normal_ncl1_2.uasset new file mode 100644 index 0000000..e909eb6 --- /dev/null +++ b/Content/Assets/Objects/Rope_Bridge/Rope_001_normal_ncl1_2.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:03a42132305f0cc8ac6ce3dbd9879ee50ef446731b4ac840fe8abae24aa5b72e +size 228259 diff --git a/Content/Assets/Objects/Rope_Bridge/Rope_001_normal_ncl1_3.uasset b/Content/Assets/Objects/Rope_Bridge/Rope_001_normal_ncl1_3.uasset new file mode 100644 index 0000000..b2e8414 --- /dev/null +++ b/Content/Assets/Objects/Rope_Bridge/Rope_001_normal_ncl1_3.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:8ac81432c78b0bf47ac7b2edac4d70ad168b037781abc84d9ec5ccb3ebfa0e88 +size 228259 diff --git a/Content/Assets/Objects/Rope_Bridge/Rope_001_normal_ncl1_4.uasset b/Content/Assets/Objects/Rope_Bridge/Rope_001_normal_ncl1_4.uasset new file mode 100644 index 0000000..fd2fd31 --- /dev/null +++ b/Content/Assets/Objects/Rope_Bridge/Rope_001_normal_ncl1_4.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:7648db47a4d227f933fdf53dcf2516d22d41caef6d6cb855069efa229145245d +size 228259 diff --git a/Content/Assets/Objects/Rope_Bridge/Rope_001_roughness.uasset b/Content/Assets/Objects/Rope_Bridge/Rope_001_roughness.uasset new file mode 100644 index 0000000..567c3b8 --- /dev/null +++ b/Content/Assets/Objects/Rope_Bridge/Rope_001_roughness.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:7ca8024633c6415b80e019279fbab8d934e47dc7d76870f30f5538a778c2fc97 +size 45733 diff --git a/Content/Assets/Objects/Rope_Bridge/Rope_001_roughness_ncl1_1.uasset b/Content/Assets/Objects/Rope_Bridge/Rope_001_roughness_ncl1_1.uasset new file mode 100644 index 0000000..cb30f9e --- /dev/null +++ b/Content/Assets/Objects/Rope_Bridge/Rope_001_roughness_ncl1_1.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:036e32a2b5b8a3b81240d296212f9927c1f2740d9199580bc82871a6dc972c52 +size 45757 diff --git a/Content/Assets/Objects/Rope_Bridge/Rope_001_roughness_ncl1_2.uasset b/Content/Assets/Objects/Rope_Bridge/Rope_001_roughness_ncl1_2.uasset new file mode 100644 index 0000000..79f5f19 --- /dev/null +++ b/Content/Assets/Objects/Rope_Bridge/Rope_001_roughness_ncl1_2.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:aa83035536c84181cb4f7720c979950014079a2bc203ad4c49db302a7476b9bc +size 45757 diff --git a/Content/Assets/Objects/Rope_Bridge/Rope_001_roughness_ncl1_3.uasset b/Content/Assets/Objects/Rope_Bridge/Rope_001_roughness_ncl1_3.uasset new file mode 100644 index 0000000..f2602a3 --- /dev/null +++ b/Content/Assets/Objects/Rope_Bridge/Rope_001_roughness_ncl1_3.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:57ab9e440842e6a60cdb070944e0503ee68a9c88937809dc805e6070a7385047 +size 45757 diff --git a/Content/Assets/Objects/Rope_Bridge/Rope_001_roughness_ncl1_4.uasset b/Content/Assets/Objects/Rope_Bridge/Rope_001_roughness_ncl1_4.uasset new file mode 100644 index 0000000..596b3be --- /dev/null +++ b/Content/Assets/Objects/Rope_Bridge/Rope_001_roughness_ncl1_4.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:4f47b70fdd65070410dcd69658be94fdb342236cf1ff3dfebe1a7714e7a2f966 +size 45757 diff --git a/Content/Assets/Objects/Rope_Bridge/Rope_035.uasset b/Content/Assets/Objects/Rope_Bridge/Rope_035.uasset new file mode 100644 index 0000000..f5711d5 --- /dev/null +++ b/Content/Assets/Objects/Rope_Bridge/Rope_035.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:4eb009115152c6c76e81e74611c57ccb263d187d8a7ee06f620dcf86b61b7d76 +size 12862 diff --git a/Content/Assets/Objects/Rope_Bridge/Rope_036.uasset b/Content/Assets/Objects/Rope_Bridge/Rope_036.uasset new file mode 100644 index 0000000..85e8852 --- /dev/null +++ b/Content/Assets/Objects/Rope_Bridge/Rope_036.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b129704cad5601dae1ebb5207937385fcb2e152a4aec995d42db0cecebeb7e47 +size 12862 diff --git a/Content/Assets/Objects/Rope_Bridge/Rope_037.uasset b/Content/Assets/Objects/Rope_Bridge/Rope_037.uasset new file mode 100644 index 0000000..0dd069f --- /dev/null +++ b/Content/Assets/Objects/Rope_Bridge/Rope_037.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:9898ceefe40ef903b4606135a8bc9ff55f39f9296e46b9dbd8d8cbfeba6b837d +size 12862 diff --git a/Content/Assets/Objects/Rope_Bridge/Rope_038.uasset b/Content/Assets/Objects/Rope_Bridge/Rope_038.uasset new file mode 100644 index 0000000..c812be8 --- /dev/null +++ b/Content/Assets/Objects/Rope_Bridge/Rope_038.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b471d494a7892447740d3ced41899c84ee6782e203a90b28791aac7afdfc694f +size 12862 diff --git a/Content/Assets/Objects/Rope_Bridge/Rope_bridge_Rope.uasset b/Content/Assets/Objects/Rope_Bridge/Rope_bridge_Rope.uasset new file mode 100644 index 0000000..d07ee1d --- /dev/null +++ b/Content/Assets/Objects/Rope_Bridge/Rope_bridge_Rope.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:5fb709c4ec322ad7e4aa4d737a8561a6a96f3b97a7d951bf8b326ef2c08ddcbc +size 156278 diff --git a/Content/Assets/Objects/Rope_Bridge/Rope_bridge_Rope_001.uasset b/Content/Assets/Objects/Rope_Bridge/Rope_bridge_Rope_001.uasset new file mode 100644 index 0000000..e95cbf9 --- /dev/null +++ b/Content/Assets/Objects/Rope_Bridge/Rope_bridge_Rope_001.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:fd8af9233bf415bf0f82e369b15666574af8e0cf36d0d9c9cb557345cb63f4df +size 103327 diff --git a/Content/Assets/Objects/Rope_Bridge/Rope_bridge_Rope_002.uasset b/Content/Assets/Objects/Rope_Bridge/Rope_bridge_Rope_002.uasset new file mode 100644 index 0000000..31df060 --- /dev/null +++ b/Content/Assets/Objects/Rope_Bridge/Rope_bridge_Rope_002.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a52364eed437607b01b63c0975dd9100e094a7bb96d425dd6700f38c3927f2bf +size 104152 diff --git a/Content/Assets/Objects/Rope_Bridge/Rope_bridge_Rope_003.uasset b/Content/Assets/Objects/Rope_Bridge/Rope_bridge_Rope_003.uasset new file mode 100644 index 0000000..56142b8 --- /dev/null +++ b/Content/Assets/Objects/Rope_Bridge/Rope_bridge_Rope_003.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e26c3f8b026148ca2f2acbde3a4ff11bbfef6b6e05ec01b91956c85bb222d7d6 +size 104275 diff --git a/Content/Assets/Objects/Rope_Bridge/Rope_bridge_Rope_004.uasset b/Content/Assets/Objects/Rope_Bridge/Rope_bridge_Rope_004.uasset new file mode 100644 index 0000000..24de88b --- /dev/null +++ b/Content/Assets/Objects/Rope_Bridge/Rope_bridge_Rope_004.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:08ce72ff7271fd37664447359bfc7a5006382b1fd0f77edffca693077af80fe2 +size 89616 diff --git a/Content/Assets/Objects/Rope_Bridge/Rope_bridge_Rope_005.uasset b/Content/Assets/Objects/Rope_Bridge/Rope_bridge_Rope_005.uasset new file mode 100644 index 0000000..536e1e3 --- /dev/null +++ b/Content/Assets/Objects/Rope_Bridge/Rope_bridge_Rope_005.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:9aabe843f8cda8e281d83371f6f45cdd8751d03bdf79b089bba31da683b7ac95 +size 89646 diff --git a/Content/Assets/Objects/Rope_Bridge/Rope_bridge_Rope_006.uasset b/Content/Assets/Objects/Rope_Bridge/Rope_bridge_Rope_006.uasset new file mode 100644 index 0000000..7151a35 --- /dev/null +++ b/Content/Assets/Objects/Rope_Bridge/Rope_bridge_Rope_006.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:82f1ac30a11be22f3bb150ca1edd3f0d7d7377e6982c11f62b0acd064fd51291 +size 90016 diff --git a/Content/Assets/Objects/Rope_Bridge/Rope_bridge_Rope_007.uasset b/Content/Assets/Objects/Rope_Bridge/Rope_bridge_Rope_007.uasset new file mode 100644 index 0000000..e25039e --- /dev/null +++ b/Content/Assets/Objects/Rope_Bridge/Rope_bridge_Rope_007.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:3c242a9109191d0c519f734c93a1ca65c58a70138f26b8c05b5ed1a9ea813aaa +size 103184 diff --git a/Content/Assets/Objects/Rope_Bridge/Rope_bridge_Rope_008.uasset b/Content/Assets/Objects/Rope_Bridge/Rope_bridge_Rope_008.uasset new file mode 100644 index 0000000..7e5e4c4 --- /dev/null +++ b/Content/Assets/Objects/Rope_Bridge/Rope_bridge_Rope_008.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:36c6d2429ce803019282a28878fa3b235ea7eff08d7b29ff24b6b46049987ea0 +size 142216 diff --git a/Content/Assets/Objects/Rope_Bridge/Rope_bridge_Rope_009.uasset b/Content/Assets/Objects/Rope_Bridge/Rope_bridge_Rope_009.uasset new file mode 100644 index 0000000..b026c9e --- /dev/null +++ b/Content/Assets/Objects/Rope_Bridge/Rope_bridge_Rope_009.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:21457b872f337e0b0f837c966ff15582df339c97dbd70b46989527349361dea5 +size 142299 diff --git a/Content/Assets/Objects/Rope_Bridge/Rope_bridge_Rope_010.uasset b/Content/Assets/Objects/Rope_Bridge/Rope_bridge_Rope_010.uasset new file mode 100644 index 0000000..1f29f90 --- /dev/null +++ b/Content/Assets/Objects/Rope_Bridge/Rope_bridge_Rope_010.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b510140a323e2a05e70e08703a1a8e63b7d9a9ea7680405e05f76cce4fab56da +size 103623 diff --git a/Content/Assets/Objects/Rope_Bridge/Rope_bridge_Rope_011.uasset b/Content/Assets/Objects/Rope_Bridge/Rope_bridge_Rope_011.uasset new file mode 100644 index 0000000..7347a58 --- /dev/null +++ b/Content/Assets/Objects/Rope_Bridge/Rope_bridge_Rope_011.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:498c306164fef13a434bd051161f2e6f959e0972e70204dea96fc12a3fb4a958 +size 103692 diff --git a/Content/Assets/Objects/Rope_Bridge/Rope_bridge_Rope_012.uasset b/Content/Assets/Objects/Rope_Bridge/Rope_bridge_Rope_012.uasset new file mode 100644 index 0000000..096b995 --- /dev/null +++ b/Content/Assets/Objects/Rope_Bridge/Rope_bridge_Rope_012.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:5981be272e38f59a92343e6b81c892b38ced509865c36697cd2e62c616a8c0f2 +size 103219 diff --git a/Content/Assets/Objects/Rope_Bridge/Rope_bridge_Rope_013.uasset b/Content/Assets/Objects/Rope_Bridge/Rope_bridge_Rope_013.uasset new file mode 100644 index 0000000..5bf9939 --- /dev/null +++ b/Content/Assets/Objects/Rope_Bridge/Rope_bridge_Rope_013.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ef64ba278fac7147054dd694c2a371fc910e08b9edfe8debc9b69c1d4a1154d0 +size 103242 diff --git a/Content/Assets/Objects/Rope_Bridge/Rope_bridge_Rope_014.uasset b/Content/Assets/Objects/Rope_Bridge/Rope_bridge_Rope_014.uasset new file mode 100644 index 0000000..a2b0aae --- /dev/null +++ b/Content/Assets/Objects/Rope_Bridge/Rope_bridge_Rope_014.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:8194d301690078f045a4a37ef8ad97d4b364effe60161f670e3e36fae6e369e3 +size 157889 diff --git a/Content/Assets/Objects/Rope_Bridge/Rope_bridge_Rope_015.uasset b/Content/Assets/Objects/Rope_Bridge/Rope_bridge_Rope_015.uasset new file mode 100644 index 0000000..ef45fe5 --- /dev/null +++ b/Content/Assets/Objects/Rope_Bridge/Rope_bridge_Rope_015.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c7a4f77e8d066d030f07ed38c4598ca3050ec7c9bd57284c071611e59c51ed20 +size 233704 diff --git a/Content/Assets/Objects/Rope_Bridge/Rope_bridge_Rope_016.uasset b/Content/Assets/Objects/Rope_Bridge/Rope_bridge_Rope_016.uasset new file mode 100644 index 0000000..564c82d --- /dev/null +++ b/Content/Assets/Objects/Rope_Bridge/Rope_bridge_Rope_016.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:6c8fb5c5f608ebd06ca9671d96c6ecbbc9a223a6e1e23f24c42e91c2ff929a71 +size 156802 diff --git a/Content/Assets/Objects/Rope_Bridge/Rope_bridge_Rope_017.uasset b/Content/Assets/Objects/Rope_Bridge/Rope_bridge_Rope_017.uasset new file mode 100644 index 0000000..0fcddd8 --- /dev/null +++ b/Content/Assets/Objects/Rope_Bridge/Rope_bridge_Rope_017.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c013b60c4cc23c7e11e4ffe508387a87d6b126d8a7903350e856dccb14697f3a +size 143472 diff --git a/Content/Assets/Objects/Rope_Bridge/Rope_bridge_Rope_018.uasset b/Content/Assets/Objects/Rope_Bridge/Rope_bridge_Rope_018.uasset new file mode 100644 index 0000000..9b3ad98 --- /dev/null +++ b/Content/Assets/Objects/Rope_Bridge/Rope_bridge_Rope_018.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:74da684a024a09220a551b38a5df1d73130eafec063ef1984af9e86bb0879486 +size 142670 diff --git a/Content/Assets/Objects/Rope_Bridge/Rope_bridge_Rope_pole.uasset b/Content/Assets/Objects/Rope_Bridge/Rope_bridge_Rope_pole.uasset new file mode 100644 index 0000000..881f5b3 --- /dev/null +++ b/Content/Assets/Objects/Rope_Bridge/Rope_bridge_Rope_pole.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:95e5ee5d8e7e681febf6d387b29cf9014692a9211283f575c45d56be856d0d0a +size 31846 diff --git a/Content/Assets/Objects/Rope_Bridge/Rope_bridge_Rope_pole_001.uasset b/Content/Assets/Objects/Rope_Bridge/Rope_bridge_Rope_pole_001.uasset new file mode 100644 index 0000000..5903170 --- /dev/null +++ b/Content/Assets/Objects/Rope_Bridge/Rope_bridge_Rope_pole_001.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ce6ee8755bd2f0e35766fd1636d900d1e6c87c9eb1dbdbdc32af7a77a83c791b +size 31846 diff --git a/Content/Assets/Objects/Rope_Bridge/Rope_bridge_Rope_pole_002.uasset b/Content/Assets/Objects/Rope_Bridge/Rope_bridge_Rope_pole_002.uasset new file mode 100644 index 0000000..2d951a0 --- /dev/null +++ b/Content/Assets/Objects/Rope_Bridge/Rope_bridge_Rope_pole_002.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:97401ad280fa61b5ed7abe01d7e3051168f8da16a1fcdf966fa162964fc5ca32 +size 31139 diff --git a/Content/Assets/Objects/Rope_Bridge/Rope_bridge_Rope_pole_003.uasset b/Content/Assets/Objects/Rope_Bridge/Rope_bridge_Rope_pole_003.uasset new file mode 100644 index 0000000..6d7bd6a --- /dev/null +++ b/Content/Assets/Objects/Rope_Bridge/Rope_bridge_Rope_pole_003.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:85887706d246a013c3e0d947be97849024aa61ce5d2b854e5a60304d609a11c5 +size 31235 diff --git a/Content/Assets/Objects/Rope_Bridge/Rope_bridge_Wood_planks.uasset b/Content/Assets/Objects/Rope_Bridge/Rope_bridge_Wood_planks.uasset new file mode 100644 index 0000000..6037429 --- /dev/null +++ b/Content/Assets/Objects/Rope_Bridge/Rope_bridge_Wood_planks.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:3498395bd7eda9dc40ada9ecac8cebb76e8af31755b08659fdfc19a43732568f +size 26892 diff --git a/Content/Assets/Objects/Rope_Bridge/Rope_bridge_wood_planks1.uasset b/Content/Assets/Objects/Rope_Bridge/Rope_bridge_wood_planks1.uasset new file mode 100644 index 0000000..0d05b78 --- /dev/null +++ b/Content/Assets/Objects/Rope_Bridge/Rope_bridge_wood_planks1.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:3b1c992edace4b26fc2ea377269213cdcf3bc49d5c76f0affbae35a4cd818564 +size 26570 diff --git a/Content/Assets/Objects/Rope_Bridge/Rope_bridge_wood_planks_001.uasset b/Content/Assets/Objects/Rope_Bridge/Rope_bridge_wood_planks_001.uasset new file mode 100644 index 0000000..02da83e --- /dev/null +++ b/Content/Assets/Objects/Rope_Bridge/Rope_bridge_wood_planks_001.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a108c1c1107a2cecc97174b34d98144ee78a3cee2331085fa1ff862b0762fc4a +size 26953 diff --git a/Content/Assets/Objects/Rope_Bridge/Wood_bark_real.uasset b/Content/Assets/Objects/Rope_Bridge/Wood_bark_real.uasset new file mode 100644 index 0000000..9b4121f --- /dev/null +++ b/Content/Assets/Objects/Rope_Bridge/Wood_bark_real.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b072158ce82855cf4073c4f512bf5f91b052e159b39a103569dd6b30b4a086dc +size 8857 diff --git a/Content/Assets/Objects/Rope_Bridge/Wood_bark_real_001.uasset b/Content/Assets/Objects/Rope_Bridge/Wood_bark_real_001.uasset new file mode 100644 index 0000000..63593f2 --- /dev/null +++ b/Content/Assets/Objects/Rope_Bridge/Wood_bark_real_001.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:1c69b6b3c740bfd2be64cbf5abd073102ac82dd53ea69ed96f3affbaf0d0505b +size 8903 diff --git a/Content/Assets/Objects/Rope_Bridge/Wood_plank.uasset b/Content/Assets/Objects/Rope_Bridge/Wood_plank.uasset new file mode 100644 index 0000000..c060cc5 --- /dev/null +++ b/Content/Assets/Objects/Rope_Bridge/Wood_plank.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c5161df650f7ac65d023eaec61d4d23cc12890c9b4513b13bb36e476238a6fae +size 8871 diff --git a/Content/Assets/Objects/Rope_Bridge/Wood_plank_002.uasset b/Content/Assets/Objects/Rope_Bridge/Wood_plank_002.uasset new file mode 100644 index 0000000..7226b83 --- /dev/null +++ b/Content/Assets/Objects/Rope_Bridge/Wood_plank_002.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f80ac2fd212b5c38fb0ecf2726a16705cd7f98f906a2b11ada6c8580265a861d +size 8917 diff --git a/Content/Assets/Objects/Rope_Bridge/bark_willow_diff_1k.uasset b/Content/Assets/Objects/Rope_Bridge/bark_willow_diff_1k.uasset new file mode 100644 index 0000000..75d5a51 --- /dev/null +++ b/Content/Assets/Objects/Rope_Bridge/bark_willow_diff_1k.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c87d3b0ddd310a7baa4fd254153fde0999dc19a3e222b76df0a396e2415c8cf5 +size 790316 diff --git a/Content/Assets/Objects/Rope_Bridge/bark_willow_diff_1k_ncl1_1.uasset b/Content/Assets/Objects/Rope_Bridge/bark_willow_diff_1k_ncl1_1.uasset new file mode 100644 index 0000000..b59de4f --- /dev/null +++ b/Content/Assets/Objects/Rope_Bridge/bark_willow_diff_1k_ncl1_1.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b5af3af92232717e6259508a56d8863bc321610b046bfac08193d6ed590cda92 +size 790340 diff --git a/Content/Assets/Objects/Rope_Bridge/bark_willow_nor_dx_1k.uasset b/Content/Assets/Objects/Rope_Bridge/bark_willow_nor_dx_1k.uasset new file mode 100644 index 0000000..76769fc --- /dev/null +++ b/Content/Assets/Objects/Rope_Bridge/bark_willow_nor_dx_1k.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:9177ad4222c36369e6cba3734653aeeb02689f55dc7f0b9d01ac57bb0d352d51 +size 4696703 diff --git a/Content/Assets/Objects/Rope_Bridge/bark_willow_nor_dx_1k_ncl1_1.uasset b/Content/Assets/Objects/Rope_Bridge/bark_willow_nor_dx_1k_ncl1_1.uasset new file mode 100644 index 0000000..7255402 --- /dev/null +++ b/Content/Assets/Objects/Rope_Bridge/bark_willow_nor_dx_1k_ncl1_1.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:28cd6af6a9642feb492cdbc9bf458cd8ecf29eb8a4910bbca409a529a41e8d3f +size 4696727 diff --git a/Content/Assets/Objects/Rope_Bridge/bark_willow_rough_1k.uasset b/Content/Assets/Objects/Rope_Bridge/bark_willow_rough_1k.uasset new file mode 100644 index 0000000..643b5db --- /dev/null +++ b/Content/Assets/Objects/Rope_Bridge/bark_willow_rough_1k.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:194157d7512b36af80c7cb5655d16823c3e8a56959f7c0bec1b8e6ca7e5d18e8 +size 918460 diff --git a/Content/Assets/Objects/Rope_Bridge/bark_willow_rough_1k_ncl1_1.uasset b/Content/Assets/Objects/Rope_Bridge/bark_willow_rough_1k_ncl1_1.uasset new file mode 100644 index 0000000..0e510de --- /dev/null +++ b/Content/Assets/Objects/Rope_Bridge/bark_willow_rough_1k_ncl1_1.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:15b0a43ab2c906d01d6880435410d3f11c3a9d8185c6d69435e94e3542211d87 +size 918484 diff --git a/Content/Assets/Objects/Rope_Bridge/wood_planks_grey_diff_2k.uasset b/Content/Assets/Objects/Rope_Bridge/wood_planks_grey_diff_2k.uasset new file mode 100644 index 0000000..07fdd58 --- /dev/null +++ b/Content/Assets/Objects/Rope_Bridge/wood_planks_grey_diff_2k.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e54175b47273b3457a9e68324afa64033cbb0bc21bf2198d810d2ddb459edd68 +size 1009266 diff --git a/Content/Assets/Objects/Rope_Bridge/wood_planks_grey_diff_2k_ncl1_1.uasset b/Content/Assets/Objects/Rope_Bridge/wood_planks_grey_diff_2k_ncl1_1.uasset new file mode 100644 index 0000000..7a4800d --- /dev/null +++ b/Content/Assets/Objects/Rope_Bridge/wood_planks_grey_diff_2k_ncl1_1.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:7a4eab9449d5d00b11c5449ea5d6255e5e86cf79d09678564f89fc18455702e0 +size 1009290 diff --git a/Content/Assets/Objects/Rope_Bridge/wood_planks_grey_nor_dx_2k.uasset b/Content/Assets/Objects/Rope_Bridge/wood_planks_grey_nor_dx_2k.uasset new file mode 100644 index 0000000..8c03c17 --- /dev/null +++ b/Content/Assets/Objects/Rope_Bridge/wood_planks_grey_nor_dx_2k.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:0b39c989b4951f5074791555df15eb9809b20aae518c8e37056df8a7d112f93e +size 13185652 diff --git a/Content/Assets/Objects/Rope_Bridge/wood_planks_grey_nor_dx_2k_ncl1_1.uasset b/Content/Assets/Objects/Rope_Bridge/wood_planks_grey_nor_dx_2k_ncl1_1.uasset new file mode 100644 index 0000000..ce6ad45 --- /dev/null +++ b/Content/Assets/Objects/Rope_Bridge/wood_planks_grey_nor_dx_2k_ncl1_1.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:0c444f0f713abe79ff5f320040a139826a843e231f8425553d8e1f4414aeab99 +size 13185676 diff --git a/Content/Assets/Objects/Rope_Bridge/wood_planks_grey_rough_2k.uasset b/Content/Assets/Objects/Rope_Bridge/wood_planks_grey_rough_2k.uasset new file mode 100644 index 0000000..35a5ac4 --- /dev/null +++ b/Content/Assets/Objects/Rope_Bridge/wood_planks_grey_rough_2k.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d57d3d95de84feceb48b5ecf24144a0fdef50107b6b698dfa00572b408636f46 +size 15103 diff --git a/Content/Assets/Objects/Rope_Bridge/wood_planks_grey_rough_2k_ncl1_1.uasset b/Content/Assets/Objects/Rope_Bridge/wood_planks_grey_rough_2k_ncl1_1.uasset new file mode 100644 index 0000000..e83f726 --- /dev/null +++ b/Content/Assets/Objects/Rope_Bridge/wood_planks_grey_rough_2k_ncl1_1.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:7245f92593fec0e0bbc304443ffeced13e71e18e2adf1d51c2583e16889ef3ed +size 15127 From 6319ab9f8ad7d9a406c66493cd2823b25ac522dc Mon Sep 17 00:00:00 2001 From: KACPER Szelest Date: Mon, 16 Jan 2023 11:27:16 +0000 Subject: [PATCH 21/43] Added science buildings Added a few science buildings in order to build our level --- .../Objects/Science_buildings/DiamondPlate005C_2K_Color.uasset | 3 +++ .../Science_buildings/DiamondPlate005C_2K_Color_ncl1_1.uasset | 3 +++ .../Science_buildings/DiamondPlate005C_2K_NormalDX.uasset | 3 +++ .../DiamondPlate005C_2K_NormalDX_ncl1_1.uasset | 3 +++ .../Science_buildings/DiamondPlate005C_2K_Roughness.uasset | 3 +++ .../DiamondPlate005C_2K_Roughness_ncl1_1.uasset | 3 +++ Content/Assets/Objects/Science_buildings/Dirty_metal.uasset | 3 +++ .../Assets/Objects/Science_buildings/Dirty_metal_001.uasset | 3 +++ Content/Assets/Objects/Science_buildings/Glass.uasset | 3 +++ Content/Assets/Objects/Science_buildings/Metal.uasset | 3 +++ .../Objects/Science_buildings/MetalPlates013_2K_Color.uasset | 3 +++ .../Science_buildings/MetalPlates013_2K_Color_ncl1_1.uasset | 3 +++ .../Science_buildings/MetalPlates013_2K_NormalDX.uasset | 3 +++ .../Science_buildings/MetalPlates013_2K_NormalDX_ncl1_1.uasset | 3 +++ .../Science_buildings/MetalPlates013_2K_Roughness.uasset | 3 +++ .../MetalPlates013_2K_Roughness_ncl1_1.uasset | 3 +++ Content/Assets/Objects/Science_buildings/Metal_002.uasset | 3 +++ .../science_buildings_large_building_door_wall_001.uasset | 3 +++ .../science_buildings_science_outpost_glass_wall.uasset | 3 +++ 19 files changed, 57 insertions(+) create mode 100644 Content/Assets/Objects/Science_buildings/DiamondPlate005C_2K_Color.uasset create mode 100644 Content/Assets/Objects/Science_buildings/DiamondPlate005C_2K_Color_ncl1_1.uasset create mode 100644 Content/Assets/Objects/Science_buildings/DiamondPlate005C_2K_NormalDX.uasset create mode 100644 Content/Assets/Objects/Science_buildings/DiamondPlate005C_2K_NormalDX_ncl1_1.uasset create mode 100644 Content/Assets/Objects/Science_buildings/DiamondPlate005C_2K_Roughness.uasset create mode 100644 Content/Assets/Objects/Science_buildings/DiamondPlate005C_2K_Roughness_ncl1_1.uasset create mode 100644 Content/Assets/Objects/Science_buildings/Dirty_metal.uasset create mode 100644 Content/Assets/Objects/Science_buildings/Dirty_metal_001.uasset create mode 100644 Content/Assets/Objects/Science_buildings/Glass.uasset create mode 100644 Content/Assets/Objects/Science_buildings/Metal.uasset create mode 100644 Content/Assets/Objects/Science_buildings/MetalPlates013_2K_Color.uasset create mode 100644 Content/Assets/Objects/Science_buildings/MetalPlates013_2K_Color_ncl1_1.uasset create mode 100644 Content/Assets/Objects/Science_buildings/MetalPlates013_2K_NormalDX.uasset create mode 100644 Content/Assets/Objects/Science_buildings/MetalPlates013_2K_NormalDX_ncl1_1.uasset create mode 100644 Content/Assets/Objects/Science_buildings/MetalPlates013_2K_Roughness.uasset create mode 100644 Content/Assets/Objects/Science_buildings/MetalPlates013_2K_Roughness_ncl1_1.uasset create mode 100644 Content/Assets/Objects/Science_buildings/Metal_002.uasset create mode 100644 Content/Assets/Objects/Science_buildings/science_buildings_large_building_door_wall_001.uasset create mode 100644 Content/Assets/Objects/Science_buildings/science_buildings_science_outpost_glass_wall.uasset diff --git a/Content/Assets/Objects/Science_buildings/DiamondPlate005C_2K_Color.uasset b/Content/Assets/Objects/Science_buildings/DiamondPlate005C_2K_Color.uasset new file mode 100644 index 0000000..0478a4a --- /dev/null +++ b/Content/Assets/Objects/Science_buildings/DiamondPlate005C_2K_Color.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:bac6c8c95de305857bd368ac6c1849eec00a7a1185bad76316782b3206fca1f0 +size 4102057 diff --git a/Content/Assets/Objects/Science_buildings/DiamondPlate005C_2K_Color_ncl1_1.uasset b/Content/Assets/Objects/Science_buildings/DiamondPlate005C_2K_Color_ncl1_1.uasset new file mode 100644 index 0000000..8ccc7c9 --- /dev/null +++ b/Content/Assets/Objects/Science_buildings/DiamondPlate005C_2K_Color_ncl1_1.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:14d8a030e9037faf011ce2bc6d78db6814c381f371be499f62326089c327cfbe +size 4102081 diff --git a/Content/Assets/Objects/Science_buildings/DiamondPlate005C_2K_NormalDX.uasset b/Content/Assets/Objects/Science_buildings/DiamondPlate005C_2K_NormalDX.uasset new file mode 100644 index 0000000..da7ec6e --- /dev/null +++ b/Content/Assets/Objects/Science_buildings/DiamondPlate005C_2K_NormalDX.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:469c8fdee4a345f88dba08ffadacfc2405ddd09ab81ca09462dd25c151e8bef5 +size 20729239 diff --git a/Content/Assets/Objects/Science_buildings/DiamondPlate005C_2K_NormalDX_ncl1_1.uasset b/Content/Assets/Objects/Science_buildings/DiamondPlate005C_2K_NormalDX_ncl1_1.uasset new file mode 100644 index 0000000..3ae17b1 --- /dev/null +++ b/Content/Assets/Objects/Science_buildings/DiamondPlate005C_2K_NormalDX_ncl1_1.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b6973ef28bbed597139f696cb000bb857f301c49ad5b21cad93eca5a1eaf6db9 +size 20729263 diff --git a/Content/Assets/Objects/Science_buildings/DiamondPlate005C_2K_Roughness.uasset b/Content/Assets/Objects/Science_buildings/DiamondPlate005C_2K_Roughness.uasset new file mode 100644 index 0000000..5631233 --- /dev/null +++ b/Content/Assets/Objects/Science_buildings/DiamondPlate005C_2K_Roughness.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:23511b433b7130ba0ee6e7b7ce0e7c979ffe74da228927c695125cec33c3cfc4 +size 2037409 diff --git a/Content/Assets/Objects/Science_buildings/DiamondPlate005C_2K_Roughness_ncl1_1.uasset b/Content/Assets/Objects/Science_buildings/DiamondPlate005C_2K_Roughness_ncl1_1.uasset new file mode 100644 index 0000000..79f082e --- /dev/null +++ b/Content/Assets/Objects/Science_buildings/DiamondPlate005C_2K_Roughness_ncl1_1.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:2035c586fc9a127f1d70cc6b37462640836cb6c3b6c8e22c510db2cc25362d40 +size 2037433 diff --git a/Content/Assets/Objects/Science_buildings/Dirty_metal.uasset b/Content/Assets/Objects/Science_buildings/Dirty_metal.uasset new file mode 100644 index 0000000..2dfa505 --- /dev/null +++ b/Content/Assets/Objects/Science_buildings/Dirty_metal.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:23f8aff15c25a22d26124cf8fda2f122f672f2731e699ab7daaa7a85c620befb +size 12424 diff --git a/Content/Assets/Objects/Science_buildings/Dirty_metal_001.uasset b/Content/Assets/Objects/Science_buildings/Dirty_metal_001.uasset new file mode 100644 index 0000000..45829a5 --- /dev/null +++ b/Content/Assets/Objects/Science_buildings/Dirty_metal_001.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:6ff98d6086c6bd0cad77980d020d8f3cfc0383a550eeda091200daf5dd74b8ac +size 12470 diff --git a/Content/Assets/Objects/Science_buildings/Glass.uasset b/Content/Assets/Objects/Science_buildings/Glass.uasset new file mode 100644 index 0000000..aefb6c7 --- /dev/null +++ b/Content/Assets/Objects/Science_buildings/Glass.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c9462317b626b7ddd8321ef79d5b70ae6c30eb42d545904e1a0ce43b68e08ff5 +size 7572 diff --git a/Content/Assets/Objects/Science_buildings/Metal.uasset b/Content/Assets/Objects/Science_buildings/Metal.uasset new file mode 100644 index 0000000..b0a5831 --- /dev/null +++ b/Content/Assets/Objects/Science_buildings/Metal.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:8aa8f89056197a667fafa2c3b38fa7388632719fc6e051ce10ee16cc2005a5dc +size 13783 diff --git a/Content/Assets/Objects/Science_buildings/MetalPlates013_2K_Color.uasset b/Content/Assets/Objects/Science_buildings/MetalPlates013_2K_Color.uasset new file mode 100644 index 0000000..fa78eda --- /dev/null +++ b/Content/Assets/Objects/Science_buildings/MetalPlates013_2K_Color.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:df2688b8e37455da71a4bbbc2d8ee8d626a100a56ca39ba2f1d315ee871c84d8 +size 6958729 diff --git a/Content/Assets/Objects/Science_buildings/MetalPlates013_2K_Color_ncl1_1.uasset b/Content/Assets/Objects/Science_buildings/MetalPlates013_2K_Color_ncl1_1.uasset new file mode 100644 index 0000000..078d620 --- /dev/null +++ b/Content/Assets/Objects/Science_buildings/MetalPlates013_2K_Color_ncl1_1.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a985a0b8ca8dc99108e9d392c6f50ae4cec5977bfa1357e96cc4c0d4d549ba4d +size 6958753 diff --git a/Content/Assets/Objects/Science_buildings/MetalPlates013_2K_NormalDX.uasset b/Content/Assets/Objects/Science_buildings/MetalPlates013_2K_NormalDX.uasset new file mode 100644 index 0000000..094c473 --- /dev/null +++ b/Content/Assets/Objects/Science_buildings/MetalPlates013_2K_NormalDX.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:29a5b8f12237f006e8bcd839853cbf7f9c3adb53a9eb9e4b0df86fcdcb55c2aa +size 21865817 diff --git a/Content/Assets/Objects/Science_buildings/MetalPlates013_2K_NormalDX_ncl1_1.uasset b/Content/Assets/Objects/Science_buildings/MetalPlates013_2K_NormalDX_ncl1_1.uasset new file mode 100644 index 0000000..15a724d --- /dev/null +++ b/Content/Assets/Objects/Science_buildings/MetalPlates013_2K_NormalDX_ncl1_1.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c34f6c33967a7e8bf5621d6a94f2c017bdb87aa707b0475ef8ecd4e2a183496c +size 21865841 diff --git a/Content/Assets/Objects/Science_buildings/MetalPlates013_2K_Roughness.uasset b/Content/Assets/Objects/Science_buildings/MetalPlates013_2K_Roughness.uasset new file mode 100644 index 0000000..114f91b --- /dev/null +++ b/Content/Assets/Objects/Science_buildings/MetalPlates013_2K_Roughness.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:54462eeac1c12ff59c886db72baa6c7327e30f3dfbe860dd45c8dd33409d72c8 +size 2544896 diff --git a/Content/Assets/Objects/Science_buildings/MetalPlates013_2K_Roughness_ncl1_1.uasset b/Content/Assets/Objects/Science_buildings/MetalPlates013_2K_Roughness_ncl1_1.uasset new file mode 100644 index 0000000..4b34f44 --- /dev/null +++ b/Content/Assets/Objects/Science_buildings/MetalPlates013_2K_Roughness_ncl1_1.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:78b2172774b0a27197a1da02acf36de6b0ec69bc33f50c45af9214193f32e334 +size 2544920 diff --git a/Content/Assets/Objects/Science_buildings/Metal_002.uasset b/Content/Assets/Objects/Science_buildings/Metal_002.uasset new file mode 100644 index 0000000..bf0d572 --- /dev/null +++ b/Content/Assets/Objects/Science_buildings/Metal_002.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d0506a4ba39e352c2bf74ea81b80cc7ce25e02a2b46ae38307a8cf12cc5e3250 +size 13829 diff --git a/Content/Assets/Objects/Science_buildings/science_buildings_large_building_door_wall_001.uasset b/Content/Assets/Objects/Science_buildings/science_buildings_large_building_door_wall_001.uasset new file mode 100644 index 0000000..b8e7cc6 --- /dev/null +++ b/Content/Assets/Objects/Science_buildings/science_buildings_large_building_door_wall_001.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f3795db0b151cf39b9779f6c041facb642e509af33e87703d920cb548707b428 +size 38695 diff --git a/Content/Assets/Objects/Science_buildings/science_buildings_science_outpost_glass_wall.uasset b/Content/Assets/Objects/Science_buildings/science_buildings_science_outpost_glass_wall.uasset new file mode 100644 index 0000000..58ffdc1 --- /dev/null +++ b/Content/Assets/Objects/Science_buildings/science_buildings_science_outpost_glass_wall.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:5065023ad6814551b985686d8f2ee4798e1b3417b5f404489a89dfa69040e6b3 +size 24528 From 55ebd7d779105fd37d5c016389d7d2de0f46ce42 Mon Sep 17 00:00:00 2001 From: KACPER Szelest Date: Mon, 16 Jan 2023 11:36:08 +0000 Subject: [PATCH 22/43] Added Glass material I added a new glass material into unreal because the one from blender didn't work --- Content/Assets/Objects/Science_buildings/Glass.uasset | 4 ++-- Content/Assets/Objects/Science_buildings/NewMaterial.uasset | 3 +++ .../science_buildings_science_outpost_glass_wall.uasset | 4 ++-- 3 files changed, 7 insertions(+), 4 deletions(-) create mode 100644 Content/Assets/Objects/Science_buildings/NewMaterial.uasset diff --git a/Content/Assets/Objects/Science_buildings/Glass.uasset b/Content/Assets/Objects/Science_buildings/Glass.uasset index aefb6c7..a2a3055 100644 --- a/Content/Assets/Objects/Science_buildings/Glass.uasset +++ b/Content/Assets/Objects/Science_buildings/Glass.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c9462317b626b7ddd8321ef79d5b70ae6c30eb42d545904e1a0ce43b68e08ff5 -size 7572 +oid sha256:692282ac06b157c2729f825fac2bb7058dd16e4b2bc97436acec4dcd78aaf764 +size 1109 diff --git a/Content/Assets/Objects/Science_buildings/NewMaterial.uasset b/Content/Assets/Objects/Science_buildings/NewMaterial.uasset new file mode 100644 index 0000000..158255b --- /dev/null +++ b/Content/Assets/Objects/Science_buildings/NewMaterial.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d6d41dd08955fea99f9fcee22a0a9bc251207290ef3349922c0646f90a0e5772 +size 12159 diff --git a/Content/Assets/Objects/Science_buildings/science_buildings_science_outpost_glass_wall.uasset b/Content/Assets/Objects/Science_buildings/science_buildings_science_outpost_glass_wall.uasset index 58ffdc1..9299cd2 100644 --- a/Content/Assets/Objects/Science_buildings/science_buildings_science_outpost_glass_wall.uasset +++ b/Content/Assets/Objects/Science_buildings/science_buildings_science_outpost_glass_wall.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:5065023ad6814551b985686d8f2ee4798e1b3417b5f404489a89dfa69040e6b3 -size 24528 +oid sha256:47aaf7bb07cd5bd5ced0418531cf79afe53514d9459be1d046b3e102c5c2b07e +size 24474 From a3de58b063eba61166be78bfd4148b3fc4bb0cd9 Mon Sep 17 00:00:00 2001 From: KACPER Szelest Date: Mon, 16 Jan 2023 11:38:50 +0000 Subject: [PATCH 23/43] Added Stalegtite asset Added stalegtite asset to be used to build our level --- Content/Assets/Objects/Stalegtite/Material.uasset | 3 +++ .../Objects/Stalegtite/Rock035_2K_AmbientOcclusion.uasset | 3 +++ Content/Assets/Objects/Stalegtite/Rock035_2K_Color.uasset | 3 +++ .../Assets/Objects/Stalegtite/Rock035_2K_Displacement.uasset | 3 +++ Content/Assets/Objects/Stalegtite/Rock035_2K_NormalDX.uasset | 3 +++ Content/Assets/Objects/Stalegtite/Rock035_2K_Roughness.uasset | 3 +++ Content/Assets/Objects/Stalegtite/Stalegtite.uasset | 3 +++ 7 files changed, 21 insertions(+) create mode 100644 Content/Assets/Objects/Stalegtite/Material.uasset create mode 100644 Content/Assets/Objects/Stalegtite/Rock035_2K_AmbientOcclusion.uasset create mode 100644 Content/Assets/Objects/Stalegtite/Rock035_2K_Color.uasset create mode 100644 Content/Assets/Objects/Stalegtite/Rock035_2K_Displacement.uasset create mode 100644 Content/Assets/Objects/Stalegtite/Rock035_2K_NormalDX.uasset create mode 100644 Content/Assets/Objects/Stalegtite/Rock035_2K_Roughness.uasset create mode 100644 Content/Assets/Objects/Stalegtite/Stalegtite.uasset diff --git a/Content/Assets/Objects/Stalegtite/Material.uasset b/Content/Assets/Objects/Stalegtite/Material.uasset new file mode 100644 index 0000000..269aa3d --- /dev/null +++ b/Content/Assets/Objects/Stalegtite/Material.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:6d1ed215b520515ef38856b86c8f58f7f38c1608683da710e4ea40c01cb9fd8b +size 17800 diff --git a/Content/Assets/Objects/Stalegtite/Rock035_2K_AmbientOcclusion.uasset b/Content/Assets/Objects/Stalegtite/Rock035_2K_AmbientOcclusion.uasset new file mode 100644 index 0000000..fed324f --- /dev/null +++ b/Content/Assets/Objects/Stalegtite/Rock035_2K_AmbientOcclusion.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d0ff906beead6b1ab8bc6e180fdb763022f353a799e589be0fdd4d204cf8476b +size 2160263 diff --git a/Content/Assets/Objects/Stalegtite/Rock035_2K_Color.uasset b/Content/Assets/Objects/Stalegtite/Rock035_2K_Color.uasset new file mode 100644 index 0000000..3254a51 --- /dev/null +++ b/Content/Assets/Objects/Stalegtite/Rock035_2K_Color.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a3c1d96a5cc6d22c037155e441f1c4563ab1e002c454e504e3993b332f79dc28 +size 8136671 diff --git a/Content/Assets/Objects/Stalegtite/Rock035_2K_Displacement.uasset b/Content/Assets/Objects/Stalegtite/Rock035_2K_Displacement.uasset new file mode 100644 index 0000000..73e6484 --- /dev/null +++ b/Content/Assets/Objects/Stalegtite/Rock035_2K_Displacement.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b6adbc145784099b4deb7dd39d6fb9429cccb9b14531dc093f90cc3f9df3ed32 +size 5799709 diff --git a/Content/Assets/Objects/Stalegtite/Rock035_2K_NormalDX.uasset b/Content/Assets/Objects/Stalegtite/Rock035_2K_NormalDX.uasset new file mode 100644 index 0000000..d2909c9 --- /dev/null +++ b/Content/Assets/Objects/Stalegtite/Rock035_2K_NormalDX.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d06facc0197f7bff8f074cb7dc3435cad3c87950c49a230550e57152813cd47a +size 27157198 diff --git a/Content/Assets/Objects/Stalegtite/Rock035_2K_Roughness.uasset b/Content/Assets/Objects/Stalegtite/Rock035_2K_Roughness.uasset new file mode 100644 index 0000000..efaf917 --- /dev/null +++ b/Content/Assets/Objects/Stalegtite/Rock035_2K_Roughness.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e61bd4a6f20de3f00ef0ef2016f0cf7295d05a9aa281ae86a3891980a6b9d25a +size 2571682 diff --git a/Content/Assets/Objects/Stalegtite/Stalegtite.uasset b/Content/Assets/Objects/Stalegtite/Stalegtite.uasset new file mode 100644 index 0000000..a823318 --- /dev/null +++ b/Content/Assets/Objects/Stalegtite/Stalegtite.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:059355422386ff6930e160ae4b9bbce7b42aac0f16db64dd027473bfc0795864 +size 1341287 From db170e9ff563117a4611e50ec90fc302a4d75444 Mon Sep 17 00:00:00 2001 From: KACPER Szelest Date: Mon, 16 Jan 2023 11:46:32 +0000 Subject: [PATCH 24/43] Added Shelf Object Added a shelf object to be paired with the merchant system --- Content/Assets/Objects/Shelf/Material.uasset | 3 +++ Content/Assets/Objects/Shelf/Shelf.uasset | 3 +++ Content/Assets/Objects/Shelf/wood_planks_grey_ao_2k.uasset | 3 +++ Content/Assets/Objects/Shelf/wood_planks_grey_diff_2k.uasset | 3 +++ Content/Assets/Objects/Shelf/wood_planks_grey_nor_dx_2k.uasset | 3 +++ Content/Assets/Objects/Shelf/wood_planks_grey_rough_2k.uasset | 3 +++ 6 files changed, 18 insertions(+) create mode 100644 Content/Assets/Objects/Shelf/Material.uasset create mode 100644 Content/Assets/Objects/Shelf/Shelf.uasset create mode 100644 Content/Assets/Objects/Shelf/wood_planks_grey_ao_2k.uasset create mode 100644 Content/Assets/Objects/Shelf/wood_planks_grey_diff_2k.uasset create mode 100644 Content/Assets/Objects/Shelf/wood_planks_grey_nor_dx_2k.uasset create mode 100644 Content/Assets/Objects/Shelf/wood_planks_grey_rough_2k.uasset diff --git a/Content/Assets/Objects/Shelf/Material.uasset b/Content/Assets/Objects/Shelf/Material.uasset new file mode 100644 index 0000000..604b8c1 --- /dev/null +++ b/Content/Assets/Objects/Shelf/Material.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:75fc26885780e9ae9933ac125823b67535caa327f9f1a0fc5ba6c695f697a7e3 +size 12702 diff --git a/Content/Assets/Objects/Shelf/Shelf.uasset b/Content/Assets/Objects/Shelf/Shelf.uasset new file mode 100644 index 0000000..2c5b497 --- /dev/null +++ b/Content/Assets/Objects/Shelf/Shelf.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:21622761601bf008b170f43699a116b428a434c01bab1f1efce5f402f53d1fb9 +size 38239 diff --git a/Content/Assets/Objects/Shelf/wood_planks_grey_ao_2k.uasset b/Content/Assets/Objects/Shelf/wood_planks_grey_ao_2k.uasset new file mode 100644 index 0000000..d7190b2 --- /dev/null +++ b/Content/Assets/Objects/Shelf/wood_planks_grey_ao_2k.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a42b79975b55a0e54a1e9d7262d28a24eff2187b52a11aa84c71c42af1d4590d +size 188913 diff --git a/Content/Assets/Objects/Shelf/wood_planks_grey_diff_2k.uasset b/Content/Assets/Objects/Shelf/wood_planks_grey_diff_2k.uasset new file mode 100644 index 0000000..438ff3e --- /dev/null +++ b/Content/Assets/Objects/Shelf/wood_planks_grey_diff_2k.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:cece55a76a7b0c195fb92283824a573239e2ba572b5fafcc5163f5d8421a68ae +size 1009260 diff --git a/Content/Assets/Objects/Shelf/wood_planks_grey_nor_dx_2k.uasset b/Content/Assets/Objects/Shelf/wood_planks_grey_nor_dx_2k.uasset new file mode 100644 index 0000000..7ae6999 --- /dev/null +++ b/Content/Assets/Objects/Shelf/wood_planks_grey_nor_dx_2k.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d490b3c6ca574f01b01d320dc5c3767351e3b13bd5be34409c1416fe6d2cc760 +size 13185646 diff --git a/Content/Assets/Objects/Shelf/wood_planks_grey_rough_2k.uasset b/Content/Assets/Objects/Shelf/wood_planks_grey_rough_2k.uasset new file mode 100644 index 0000000..d86a3b9 --- /dev/null +++ b/Content/Assets/Objects/Shelf/wood_planks_grey_rough_2k.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:9a5b992316a55da74b8343daf0780cb2483dacf12fae63c231b05604eef97af7 +size 15097 From 4a14dbe384c7a8a6b935f220ddaeb95519d8b445 Mon Sep 17 00:00:00 2001 From: KACPER Szelest Date: Mon, 16 Jan 2023 11:52:50 +0000 Subject: [PATCH 25/43] Added countertop asset Added a countertop asset to be used with the merchant system --- Content/Assets/Objects/Counter/Countertop_store.uasset | 3 +++ Content/Assets/Objects/Counter/Material.uasset | 3 +++ Content/Assets/Objects/Counter/Material_001.uasset | 3 +++ Content/Assets/Objects/Counter/bark_willow_diff_1k.uasset | 3 +++ Content/Assets/Objects/Counter/bark_willow_disp_1k.uasset | 3 +++ Content/Assets/Objects/Counter/bark_willow_nor_dx_1k.uasset | 3 +++ Content/Assets/Objects/Counter/bark_willow_rough_1k.uasset | 3 +++ Content/Assets/Objects/Counter/beige_wall_001_ao_1k.uasset | 3 +++ Content/Assets/Objects/Counter/beige_wall_001_diff_1k.uasset | 3 +++ Content/Assets/Objects/Counter/beige_wall_001_nor_dx_1k.uasset | 3 +++ Content/Assets/Objects/Counter/beige_wall_001_rough_1k.uasset | 3 +++ 11 files changed, 33 insertions(+) create mode 100644 Content/Assets/Objects/Counter/Countertop_store.uasset create mode 100644 Content/Assets/Objects/Counter/Material.uasset create mode 100644 Content/Assets/Objects/Counter/Material_001.uasset create mode 100644 Content/Assets/Objects/Counter/bark_willow_diff_1k.uasset create mode 100644 Content/Assets/Objects/Counter/bark_willow_disp_1k.uasset create mode 100644 Content/Assets/Objects/Counter/bark_willow_nor_dx_1k.uasset create mode 100644 Content/Assets/Objects/Counter/bark_willow_rough_1k.uasset create mode 100644 Content/Assets/Objects/Counter/beige_wall_001_ao_1k.uasset create mode 100644 Content/Assets/Objects/Counter/beige_wall_001_diff_1k.uasset create mode 100644 Content/Assets/Objects/Counter/beige_wall_001_nor_dx_1k.uasset create mode 100644 Content/Assets/Objects/Counter/beige_wall_001_rough_1k.uasset diff --git a/Content/Assets/Objects/Counter/Countertop_store.uasset b/Content/Assets/Objects/Counter/Countertop_store.uasset new file mode 100644 index 0000000..aad1b6f --- /dev/null +++ b/Content/Assets/Objects/Counter/Countertop_store.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:50adb7a6053b23d37fa7225e5182283b4827309dd117d95d0284cd06611164bf +size 28166 diff --git a/Content/Assets/Objects/Counter/Material.uasset b/Content/Assets/Objects/Counter/Material.uasset new file mode 100644 index 0000000..318aa33 --- /dev/null +++ b/Content/Assets/Objects/Counter/Material.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:11b09844fe8acb6b66314237c9133e8cda5bbc56dfb7c35bd3570a420784b808 +size 13750 diff --git a/Content/Assets/Objects/Counter/Material_001.uasset b/Content/Assets/Objects/Counter/Material_001.uasset new file mode 100644 index 0000000..746b6bd --- /dev/null +++ b/Content/Assets/Objects/Counter/Material_001.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:822d334fd8468f672f703bdf3e66cb85245e6c64fea121538816fdf84547ee5f +size 10453 diff --git a/Content/Assets/Objects/Counter/bark_willow_diff_1k.uasset b/Content/Assets/Objects/Counter/bark_willow_diff_1k.uasset new file mode 100644 index 0000000..378a23e --- /dev/null +++ b/Content/Assets/Objects/Counter/bark_willow_diff_1k.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:dbb3868f884d4c171accf882ffac55170c62869bf118495e4a471d441b59e0f2 +size 790312 diff --git a/Content/Assets/Objects/Counter/bark_willow_disp_1k.uasset b/Content/Assets/Objects/Counter/bark_willow_disp_1k.uasset new file mode 100644 index 0000000..3d1e1e6 --- /dev/null +++ b/Content/Assets/Objects/Counter/bark_willow_disp_1k.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:5a4903e26355caad00147fdfbb5f10b368045bdc8579e5326d04857c78d0e52e +size 1681997 diff --git a/Content/Assets/Objects/Counter/bark_willow_nor_dx_1k.uasset b/Content/Assets/Objects/Counter/bark_willow_nor_dx_1k.uasset new file mode 100644 index 0000000..77dff1e --- /dev/null +++ b/Content/Assets/Objects/Counter/bark_willow_nor_dx_1k.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:850c71c488b0ab3fa5cc6120675314b27d1f9160aa57e7a599b411a9b7e3eb30 +size 4696699 diff --git a/Content/Assets/Objects/Counter/bark_willow_rough_1k.uasset b/Content/Assets/Objects/Counter/bark_willow_rough_1k.uasset new file mode 100644 index 0000000..f4780b9 --- /dev/null +++ b/Content/Assets/Objects/Counter/bark_willow_rough_1k.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:3f85a92096ac9cc9011b4b28dc72b6c2d75a82a7a5355ce56d00110d2035e8e2 +size 918456 diff --git a/Content/Assets/Objects/Counter/beige_wall_001_ao_1k.uasset b/Content/Assets/Objects/Counter/beige_wall_001_ao_1k.uasset new file mode 100644 index 0000000..96c5157 --- /dev/null +++ b/Content/Assets/Objects/Counter/beige_wall_001_ao_1k.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:2a7c067b68a8c0292284a30a30f4729325c0cefbddb195422ae5e23cecf3489d +size 126148 diff --git a/Content/Assets/Objects/Counter/beige_wall_001_diff_1k.uasset b/Content/Assets/Objects/Counter/beige_wall_001_diff_1k.uasset new file mode 100644 index 0000000..0fa177a --- /dev/null +++ b/Content/Assets/Objects/Counter/beige_wall_001_diff_1k.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c12ff6762a815e7d13c9cb240177aae4c5aa49912f53e2aee0c34c3b4dfafe1e +size 38347 diff --git a/Content/Assets/Objects/Counter/beige_wall_001_nor_dx_1k.uasset b/Content/Assets/Objects/Counter/beige_wall_001_nor_dx_1k.uasset new file mode 100644 index 0000000..412410e --- /dev/null +++ b/Content/Assets/Objects/Counter/beige_wall_001_nor_dx_1k.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:6ae7fe9c59081f2f9ba30be51d9a839d65e63217f4e749ba06abe5aa7e23a6bb +size 3205600 diff --git a/Content/Assets/Objects/Counter/beige_wall_001_rough_1k.uasset b/Content/Assets/Objects/Counter/beige_wall_001_rough_1k.uasset new file mode 100644 index 0000000..79f80ac --- /dev/null +++ b/Content/Assets/Objects/Counter/beige_wall_001_rough_1k.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:4a33c41e1d1cf005d6e5c9cd86bccc0466ce28b8066ec2fa6f0e0df73d4f05b7 +size 1169166 From 27d51210ecf6be82b1c2d3146c24a61934188833 Mon Sep 17 00:00:00 2001 From: KACPER Szelest Date: Mon, 16 Jan 2023 12:03:29 +0000 Subject: [PATCH 26/43] Added new cave tunnel --- Content/Assets/Objects/Caves/Rock_tunnels_Cube_003.uasset | 3 +++ Content/Assets/Objects/Caves/Rock_tunnels_Curve.uasset | 4 ++-- Content/Assets/Objects/Caves/Rock_tunnels_Ramp.uasset | 4 ++-- Content/Assets/Objects/Caves/Rock_tunnels_Straight.uasset | 4 ++-- Content/Assets/Objects/Caves/Rock_tunnels_Straight_001.uasset | 3 +++ 5 files changed, 12 insertions(+), 6 deletions(-) create mode 100644 Content/Assets/Objects/Caves/Rock_tunnels_Cube_003.uasset create mode 100644 Content/Assets/Objects/Caves/Rock_tunnels_Straight_001.uasset diff --git a/Content/Assets/Objects/Caves/Rock_tunnels_Cube_003.uasset b/Content/Assets/Objects/Caves/Rock_tunnels_Cube_003.uasset new file mode 100644 index 0000000..6697f7d --- /dev/null +++ b/Content/Assets/Objects/Caves/Rock_tunnels_Cube_003.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e8ae255d67106c4a36d6d4442370172c708437524e8dad85d1f01f22856338ac +size 7156064 diff --git a/Content/Assets/Objects/Caves/Rock_tunnels_Curve.uasset b/Content/Assets/Objects/Caves/Rock_tunnels_Curve.uasset index 2f6befd..7483f15 100644 --- a/Content/Assets/Objects/Caves/Rock_tunnels_Curve.uasset +++ b/Content/Assets/Objects/Caves/Rock_tunnels_Curve.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:32273fd87096017291e88adf7ca5cef8eb591282345e1683507201bb04ddccd7 -size 121650 +oid sha256:e88322b3c874bcdb1bcecc8f7e12bb0ffae389569c3e5949d14449b69d26317d +size 121649 diff --git a/Content/Assets/Objects/Caves/Rock_tunnels_Ramp.uasset b/Content/Assets/Objects/Caves/Rock_tunnels_Ramp.uasset index b89cfd4..173a34d 100644 --- a/Content/Assets/Objects/Caves/Rock_tunnels_Ramp.uasset +++ b/Content/Assets/Objects/Caves/Rock_tunnels_Ramp.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:5736b30bf7801b6d3ab6050306dc4c362f0ad2883199a683edc36d6f22a42685 -size 43733 +oid sha256:0d9a7eabe7885b8c87ae2b0f987c9c094106f41fdbba8b96640d4e618a7d0ace +size 43264 diff --git a/Content/Assets/Objects/Caves/Rock_tunnels_Straight.uasset b/Content/Assets/Objects/Caves/Rock_tunnels_Straight.uasset index 5c2d927..b0cf122 100644 --- a/Content/Assets/Objects/Caves/Rock_tunnels_Straight.uasset +++ b/Content/Assets/Objects/Caves/Rock_tunnels_Straight.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:89b21a686a181bf627e6c52c4e179f981374f44836b29f8950fe8a256ff5fabc -size 42016 +oid sha256:86898f206db00a8b48303daa22af91f084c1657eafc9d27adc24e995ad847633 +size 42011 diff --git a/Content/Assets/Objects/Caves/Rock_tunnels_Straight_001.uasset b/Content/Assets/Objects/Caves/Rock_tunnels_Straight_001.uasset new file mode 100644 index 0000000..83df269 --- /dev/null +++ b/Content/Assets/Objects/Caves/Rock_tunnels_Straight_001.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:0b17423bc3f4010acb12a1ff663d6898f5020617af81cdf906360707fe362777 +size 49523 From 8aa6529f8aac45b0fcd2b7585b8185ff76798020 Mon Sep 17 00:00:00 2001 From: KACPER Szelest Date: Mon, 16 Jan 2023 12:38:41 +0000 Subject: [PATCH 27/43] Added rope and metal beam Added a few items to be used in level creation --- .../Assets/Objects/Steel_Rope_and_metal_beam/Metal_Grid.uasset | 3 +++ .../Steel_Rope_and_metal_beam/PaintedMetal004_2K_Color.uasset | 3 +++ .../PaintedMetal004_2K_Displacement.uasset | 3 +++ .../PaintedMetal004_2K_Metalness.uasset | 3 +++ .../PaintedMetal004_2K_NormalDX.uasset | 3 +++ .../PaintedMetal004_2K_Opacity.uasset | 3 +++ .../PaintedMetal004_2K_Roughness.uasset | 3 +++ .../Objects/Steel_Rope_and_metal_beam/Rope002_2K_Color.uasset | 3 +++ .../Steel_Rope_and_metal_beam/Rope002_2K_NormalDX.uasset | 3 +++ .../Steel_Rope_and_metal_beam/Rope002_2K_Roughness.uasset | 3 +++ .../Rope_and_Metal_Metal_railing.uasset | 3 +++ .../Steel_Rope_and_metal_beam/Rope_and_Metal_Steel_rope.uasset | 3 +++ .../Assets/Objects/Steel_Rope_and_metal_beam/Steel_Rope.uasset | 3 +++ 13 files changed, 39 insertions(+) create mode 100644 Content/Assets/Objects/Steel_Rope_and_metal_beam/Metal_Grid.uasset create mode 100644 Content/Assets/Objects/Steel_Rope_and_metal_beam/PaintedMetal004_2K_Color.uasset create mode 100644 Content/Assets/Objects/Steel_Rope_and_metal_beam/PaintedMetal004_2K_Displacement.uasset create mode 100644 Content/Assets/Objects/Steel_Rope_and_metal_beam/PaintedMetal004_2K_Metalness.uasset create mode 100644 Content/Assets/Objects/Steel_Rope_and_metal_beam/PaintedMetal004_2K_NormalDX.uasset create mode 100644 Content/Assets/Objects/Steel_Rope_and_metal_beam/PaintedMetal004_2K_Opacity.uasset create mode 100644 Content/Assets/Objects/Steel_Rope_and_metal_beam/PaintedMetal004_2K_Roughness.uasset create mode 100644 Content/Assets/Objects/Steel_Rope_and_metal_beam/Rope002_2K_Color.uasset create mode 100644 Content/Assets/Objects/Steel_Rope_and_metal_beam/Rope002_2K_NormalDX.uasset create mode 100644 Content/Assets/Objects/Steel_Rope_and_metal_beam/Rope002_2K_Roughness.uasset create mode 100644 Content/Assets/Objects/Steel_Rope_and_metal_beam/Rope_and_Metal_Metal_railing.uasset create mode 100644 Content/Assets/Objects/Steel_Rope_and_metal_beam/Rope_and_Metal_Steel_rope.uasset create mode 100644 Content/Assets/Objects/Steel_Rope_and_metal_beam/Steel_Rope.uasset diff --git a/Content/Assets/Objects/Steel_Rope_and_metal_beam/Metal_Grid.uasset b/Content/Assets/Objects/Steel_Rope_and_metal_beam/Metal_Grid.uasset new file mode 100644 index 0000000..01ae186 --- /dev/null +++ b/Content/Assets/Objects/Steel_Rope_and_metal_beam/Metal_Grid.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d049e8aa94206a4f5cc46d7a1cec161ade2cea442ea7a441f2ed8918a38a4d58 +size 18505 diff --git a/Content/Assets/Objects/Steel_Rope_and_metal_beam/PaintedMetal004_2K_Color.uasset b/Content/Assets/Objects/Steel_Rope_and_metal_beam/PaintedMetal004_2K_Color.uasset new file mode 100644 index 0000000..9ee5e6d --- /dev/null +++ b/Content/Assets/Objects/Steel_Rope_and_metal_beam/PaintedMetal004_2K_Color.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c90e2ecbfb4504c2be85b71658a1608f6a19d4e362ced3f99dc758b3fe02ee34 +size 5918012 diff --git a/Content/Assets/Objects/Steel_Rope_and_metal_beam/PaintedMetal004_2K_Displacement.uasset b/Content/Assets/Objects/Steel_Rope_and_metal_beam/PaintedMetal004_2K_Displacement.uasset new file mode 100644 index 0000000..588c933 --- /dev/null +++ b/Content/Assets/Objects/Steel_Rope_and_metal_beam/PaintedMetal004_2K_Displacement.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:60194015e62db78109de9ab0e26d9533013812b1a996a3dad5ae7c8884bf2eee +size 1789005 diff --git a/Content/Assets/Objects/Steel_Rope_and_metal_beam/PaintedMetal004_2K_Metalness.uasset b/Content/Assets/Objects/Steel_Rope_and_metal_beam/PaintedMetal004_2K_Metalness.uasset new file mode 100644 index 0000000..d37d1fc --- /dev/null +++ b/Content/Assets/Objects/Steel_Rope_and_metal_beam/PaintedMetal004_2K_Metalness.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ce2ef12e60d82d708c4a8fe2e9e327c9fbd0caa43c8aef36055f1d82a7617cc7 +size 551104 diff --git a/Content/Assets/Objects/Steel_Rope_and_metal_beam/PaintedMetal004_2K_NormalDX.uasset b/Content/Assets/Objects/Steel_Rope_and_metal_beam/PaintedMetal004_2K_NormalDX.uasset new file mode 100644 index 0000000..c0ac545 --- /dev/null +++ b/Content/Assets/Objects/Steel_Rope_and_metal_beam/PaintedMetal004_2K_NormalDX.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ffc07d498b45d4c7ec339dbdb7817b8e73194cb3750100ab9f6a62c299c4baaf +size 5673112 diff --git a/Content/Assets/Objects/Steel_Rope_and_metal_beam/PaintedMetal004_2K_Opacity.uasset b/Content/Assets/Objects/Steel_Rope_and_metal_beam/PaintedMetal004_2K_Opacity.uasset new file mode 100644 index 0000000..d8ec461 --- /dev/null +++ b/Content/Assets/Objects/Steel_Rope_and_metal_beam/PaintedMetal004_2K_Opacity.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d9da07c3f9cc114b385c95e4dc3e3cea41c3e55d6831ca9c2bdf3adc7cafd3aa +size 1665720 diff --git a/Content/Assets/Objects/Steel_Rope_and_metal_beam/PaintedMetal004_2K_Roughness.uasset b/Content/Assets/Objects/Steel_Rope_and_metal_beam/PaintedMetal004_2K_Roughness.uasset new file mode 100644 index 0000000..de878db --- /dev/null +++ b/Content/Assets/Objects/Steel_Rope_and_metal_beam/PaintedMetal004_2K_Roughness.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:5cf3ab6defbb9c510eb571ac406bacc613ec54ef80e86005a237433468f25da2 +size 1895754 diff --git a/Content/Assets/Objects/Steel_Rope_and_metal_beam/Rope002_2K_Color.uasset b/Content/Assets/Objects/Steel_Rope_and_metal_beam/Rope002_2K_Color.uasset new file mode 100644 index 0000000..981dd1c --- /dev/null +++ b/Content/Assets/Objects/Steel_Rope_and_metal_beam/Rope002_2K_Color.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c5def7fe2ba8ff197d40e89321d423d3d4e9453b016c411f6d6f8cbd6b8614bd +size 2444141 diff --git a/Content/Assets/Objects/Steel_Rope_and_metal_beam/Rope002_2K_NormalDX.uasset b/Content/Assets/Objects/Steel_Rope_and_metal_beam/Rope002_2K_NormalDX.uasset new file mode 100644 index 0000000..bfc1786 --- /dev/null +++ b/Content/Assets/Objects/Steel_Rope_and_metal_beam/Rope002_2K_NormalDX.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:fc87171209392246a1622425596a12408708277bfbe0d96e67cccf73855fc878 +size 12506815 diff --git a/Content/Assets/Objects/Steel_Rope_and_metal_beam/Rope002_2K_Roughness.uasset b/Content/Assets/Objects/Steel_Rope_and_metal_beam/Rope002_2K_Roughness.uasset new file mode 100644 index 0000000..6508780 --- /dev/null +++ b/Content/Assets/Objects/Steel_Rope_and_metal_beam/Rope002_2K_Roughness.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e6e11c0648f6d8897eb8b13d5162b25067520683a14c6954b01c3446bbf86c1f +size 725729 diff --git a/Content/Assets/Objects/Steel_Rope_and_metal_beam/Rope_and_Metal_Metal_railing.uasset b/Content/Assets/Objects/Steel_Rope_and_metal_beam/Rope_and_Metal_Metal_railing.uasset new file mode 100644 index 0000000..ca468f8 --- /dev/null +++ b/Content/Assets/Objects/Steel_Rope_and_metal_beam/Rope_and_Metal_Metal_railing.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:85d9efbfc2bd40036211f3c577ddfa12fab6058e51b8908690277966312294be +size 23032 diff --git a/Content/Assets/Objects/Steel_Rope_and_metal_beam/Rope_and_Metal_Steel_rope.uasset b/Content/Assets/Objects/Steel_Rope_and_metal_beam/Rope_and_Metal_Steel_rope.uasset new file mode 100644 index 0000000..6313c94 --- /dev/null +++ b/Content/Assets/Objects/Steel_Rope_and_metal_beam/Rope_and_Metal_Steel_rope.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:6568687cef99910f19ddca27b041f15de2258099ccf912c43c0843a06bee1571 +size 19372 diff --git a/Content/Assets/Objects/Steel_Rope_and_metal_beam/Steel_Rope.uasset b/Content/Assets/Objects/Steel_Rope_and_metal_beam/Steel_Rope.uasset new file mode 100644 index 0000000..f5e34ec --- /dev/null +++ b/Content/Assets/Objects/Steel_Rope_and_metal_beam/Steel_Rope.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d449d8abfb187dc8ef3876ab1565fe3a5bd95acdfb409fa2e06d0d76173d3af0 +size 15259 From 5333846266bcc547f5e316089092cd1113808484 Mon Sep 17 00:00:00 2001 From: KACPER Szelest Date: Mon, 16 Jan 2023 13:52:15 +0000 Subject: [PATCH 28/43] Added Abyss asset Added the abyss asset to be used in level creation --- Content/Assets/Objects/Abyss/Abyss_Cube.uasset | 3 +++ Content/Assets/Objects/Abyss/Abyss_Cylinder.uasset | 3 +++ Content/Assets/Objects/Abyss/Rock035_2K_Color.uasset | 3 +++ Content/Assets/Objects/Abyss/Rock035_2K_NormalDX.uasset | 3 +++ Content/Assets/Objects/Abyss/Rock035_2K_Roughness.uasset | 3 +++ Content/Assets/Objects/Abyss/Rocks.uasset | 3 +++ Content/Levels/Top_layer_level.umap | 4 ++-- 7 files changed, 20 insertions(+), 2 deletions(-) create mode 100644 Content/Assets/Objects/Abyss/Abyss_Cube.uasset create mode 100644 Content/Assets/Objects/Abyss/Abyss_Cylinder.uasset create mode 100644 Content/Assets/Objects/Abyss/Rock035_2K_Color.uasset create mode 100644 Content/Assets/Objects/Abyss/Rock035_2K_NormalDX.uasset create mode 100644 Content/Assets/Objects/Abyss/Rock035_2K_Roughness.uasset create mode 100644 Content/Assets/Objects/Abyss/Rocks.uasset diff --git a/Content/Assets/Objects/Abyss/Abyss_Cube.uasset b/Content/Assets/Objects/Abyss/Abyss_Cube.uasset new file mode 100644 index 0000000..1d959b1 --- /dev/null +++ b/Content/Assets/Objects/Abyss/Abyss_Cube.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:376ae066c5634c9eb09217bf5fa194d602adc21ce0eddd5515eff35c77386dee +size 48549 diff --git a/Content/Assets/Objects/Abyss/Abyss_Cylinder.uasset b/Content/Assets/Objects/Abyss/Abyss_Cylinder.uasset new file mode 100644 index 0000000..903c4a3 --- /dev/null +++ b/Content/Assets/Objects/Abyss/Abyss_Cylinder.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ba841289eaded1e97ec831fae4e5edaba05b57060cabef0c13abc9cf03f63e7e +size 504169 diff --git a/Content/Assets/Objects/Abyss/Rock035_2K_Color.uasset b/Content/Assets/Objects/Abyss/Rock035_2K_Color.uasset new file mode 100644 index 0000000..4c230b4 --- /dev/null +++ b/Content/Assets/Objects/Abyss/Rock035_2K_Color.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:85245be9363fe0cbd34887f6d173fc351306169f68c215dd09e2e230603eb484 +size 8136666 diff --git a/Content/Assets/Objects/Abyss/Rock035_2K_NormalDX.uasset b/Content/Assets/Objects/Abyss/Rock035_2K_NormalDX.uasset new file mode 100644 index 0000000..7ca51e3 --- /dev/null +++ b/Content/Assets/Objects/Abyss/Rock035_2K_NormalDX.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:821a41308d57218a0cc4160cb5aa6ce3dcdeb167ad0bc334d456010016ba457c +size 27157193 diff --git a/Content/Assets/Objects/Abyss/Rock035_2K_Roughness.uasset b/Content/Assets/Objects/Abyss/Rock035_2K_Roughness.uasset new file mode 100644 index 0000000..fc7f15b --- /dev/null +++ b/Content/Assets/Objects/Abyss/Rock035_2K_Roughness.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:713a7d3d1b2b2270704457d686e79e9d01c0d2694150cfeef04c5abf12c325d6 +size 2571677 diff --git a/Content/Assets/Objects/Abyss/Rocks.uasset b/Content/Assets/Objects/Abyss/Rocks.uasset new file mode 100644 index 0000000..14dee30 --- /dev/null +++ b/Content/Assets/Objects/Abyss/Rocks.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:4b109dd8e8de1f6269daaeb9f8ffca758e6129a47a18ef8de4d18b889518fa65 +size 12908 diff --git a/Content/Levels/Top_layer_level.umap b/Content/Levels/Top_layer_level.umap index 6a3ed8b..d5b716d 100644 --- a/Content/Levels/Top_layer_level.umap +++ b/Content/Levels/Top_layer_level.umap @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:6949886ca1892bfcc1a61d108374e8d939baefc31b2cc85adb141d36a505c6f3 -size 40006 +oid sha256:352a8432e36505e271199d9ec825297d8ed792ca7184540458d6ff30732e31c8 +size 41419 From 16972db8c5d3d32df859d4923285214ac842d09e Mon Sep 17 00:00:00 2001 From: KACPER Szelest Date: Mon, 16 Jan 2023 14:25:38 +0000 Subject: [PATCH 29/43] Fixed Rope Bridge asset I fixed the rope bridge assets as the textures and models themselves were not looking right --- Content/Assets/Objects/Rope_Bridge/Material_1722.uasset | 2 +- .../Assets/Objects/Rope_Bridge/Material_1722_ncl1_1.uasset | 3 --- .../Assets/Objects/Rope_Bridge/Material_1722_ncl1_2.uasset | 3 --- .../Assets/Objects/Rope_Bridge/Material_1722_ncl1_3.uasset | 3 --- .../Assets/Objects/Rope_Bridge/Material_1722_ncl1_4.uasset | 3 --- Content/Assets/Objects/Rope_Bridge/Rope.uasset | 4 ++-- Content/Assets/Objects/Rope_Bridge/Rope_001_normal.uasset | 2 +- .../Assets/Objects/Rope_Bridge/Rope_001_normal_ncl1_1.uasset | 3 --- .../Assets/Objects/Rope_Bridge/Rope_001_normal_ncl1_2.uasset | 3 --- .../Assets/Objects/Rope_Bridge/Rope_001_normal_ncl1_3.uasset | 3 --- .../Assets/Objects/Rope_Bridge/Rope_001_normal_ncl1_4.uasset | 3 --- Content/Assets/Objects/Rope_Bridge/Rope_001_roughness.uasset | 2 +- .../Objects/Rope_Bridge/Rope_001_roughness_ncl1_1.uasset | 3 --- .../Objects/Rope_Bridge/Rope_001_roughness_ncl1_2.uasset | 3 --- .../Objects/Rope_Bridge/Rope_001_roughness_ncl1_3.uasset | 3 --- .../Objects/Rope_Bridge/Rope_001_roughness_ncl1_4.uasset | 3 --- Content/Assets/Objects/Rope_Bridge/Rope_035.uasset | 3 --- Content/Assets/Objects/Rope_Bridge/Rope_036.uasset | 3 --- Content/Assets/Objects/Rope_Bridge/Rope_037.uasset | 3 --- Content/Assets/Objects/Rope_Bridge/Rope_038.uasset | 3 --- .../Assets/Objects/Rope_Bridge/Rope_bridge_Cube_001.uasset | 3 +++ .../Assets/Objects/Rope_Bridge/Rope_bridge_Cube_002.uasset | 3 +++ .../Assets/Objects/Rope_Bridge/Rope_bridge_Cube_006.uasset | 3 +++ Content/Assets/Objects/Rope_Bridge/Rope_bridge_Rope.uasset | 3 --- .../Assets/Objects/Rope_Bridge/Rope_bridge_Rope_001.uasset | 3 --- .../Assets/Objects/Rope_Bridge/Rope_bridge_Rope_002.uasset | 3 --- .../Assets/Objects/Rope_Bridge/Rope_bridge_Rope_003.uasset | 3 --- .../Assets/Objects/Rope_Bridge/Rope_bridge_Rope_004.uasset | 3 --- .../Assets/Objects/Rope_Bridge/Rope_bridge_Rope_005.uasset | 3 --- .../Assets/Objects/Rope_Bridge/Rope_bridge_Rope_006.uasset | 3 --- .../Assets/Objects/Rope_Bridge/Rope_bridge_Rope_007.uasset | 3 --- .../Assets/Objects/Rope_Bridge/Rope_bridge_Rope_008.uasset | 3 --- .../Assets/Objects/Rope_Bridge/Rope_bridge_Rope_009.uasset | 3 --- .../Assets/Objects/Rope_Bridge/Rope_bridge_Rope_010.uasset | 3 --- .../Assets/Objects/Rope_Bridge/Rope_bridge_Rope_011.uasset | 3 --- .../Assets/Objects/Rope_Bridge/Rope_bridge_Rope_012.uasset | 3 --- .../Assets/Objects/Rope_Bridge/Rope_bridge_Rope_013.uasset | 3 --- .../Assets/Objects/Rope_Bridge/Rope_bridge_Rope_014.uasset | 3 --- .../Assets/Objects/Rope_Bridge/Rope_bridge_Rope_015.uasset | 3 --- .../Assets/Objects/Rope_Bridge/Rope_bridge_Rope_016.uasset | 3 --- .../Assets/Objects/Rope_Bridge/Rope_bridge_Rope_017.uasset | 3 --- .../Assets/Objects/Rope_Bridge/Rope_bridge_Rope_018.uasset | 3 --- .../Assets/Objects/Rope_Bridge/Rope_bridge_Rope_pole.uasset | 3 --- .../Objects/Rope_Bridge/Rope_bridge_Rope_pole_001.uasset | 3 --- .../Objects/Rope_Bridge/Rope_bridge_Rope_pole_002.uasset | 3 --- .../Objects/Rope_Bridge/Rope_bridge_Rope_pole_003.uasset | 3 --- .../Assets/Objects/Rope_Bridge/Rope_bridge_Wood_planks.uasset | 3 --- .../Objects/Rope_Bridge/Rope_bridge_wood_planks1.uasset | 3 --- .../Objects/Rope_Bridge/Rope_bridge_wood_planks_001.uasset | 3 --- Content/Assets/Objects/Rope_Bridge/Wood_bark_real.uasset | 4 ++-- Content/Assets/Objects/Rope_Bridge/Wood_bark_real_001.uasset | 3 --- Content/Assets/Objects/Rope_Bridge/Wood_plank.uasset | 4 ++-- Content/Assets/Objects/Rope_Bridge/Wood_plank_002.uasset | 3 --- Content/Assets/Objects/Rope_Bridge/bark_willow_ao_1k.uasset | 3 +++ Content/Assets/Objects/Rope_Bridge/bark_willow_diff_1k.uasset | 2 +- .../Objects/Rope_Bridge/bark_willow_diff_1k_ncl1_1.uasset | 3 --- Content/Assets/Objects/Rope_Bridge/bark_willow_disp_1k.uasset | 3 +++ .../Assets/Objects/Rope_Bridge/bark_willow_nor_dx_1k.uasset | 2 +- .../Objects/Rope_Bridge/bark_willow_nor_dx_1k_ncl1_1.uasset | 3 --- .../Assets/Objects/Rope_Bridge/bark_willow_rough_1k.uasset | 2 +- .../Objects/Rope_Bridge/bark_willow_rough_1k_ncl1_1.uasset | 3 --- .../Objects/Rope_Bridge/wood_planks_grey_diff_2k.uasset | 3 --- .../Rope_Bridge/wood_planks_grey_diff_2k_ncl1_1.uasset | 3 --- .../Rope_Bridge/wood_planks_grey_diff_2k_ncl1_2.uasset | 3 +++ .../Objects/Rope_Bridge/wood_planks_grey_nor_dx_2k.uasset | 3 --- .../Rope_Bridge/wood_planks_grey_nor_dx_2k_ncl1_1.uasset | 3 --- .../Rope_Bridge/wood_planks_grey_nor_dx_2k_ncl1_2.uasset | 3 +++ .../Objects/Rope_Bridge/wood_planks_grey_rough_2k.uasset | 3 --- .../Rope_Bridge/wood_planks_grey_rough_2k_ncl1_1.uasset | 3 --- .../Rope_Bridge/wood_planks_grey_rough_2k_ncl1_2.uasset | 3 +++ 70 files changed, 36 insertions(+), 171 deletions(-) delete mode 100644 Content/Assets/Objects/Rope_Bridge/Material_1722_ncl1_1.uasset delete mode 100644 Content/Assets/Objects/Rope_Bridge/Material_1722_ncl1_2.uasset delete mode 100644 Content/Assets/Objects/Rope_Bridge/Material_1722_ncl1_3.uasset delete mode 100644 Content/Assets/Objects/Rope_Bridge/Material_1722_ncl1_4.uasset delete mode 100644 Content/Assets/Objects/Rope_Bridge/Rope_001_normal_ncl1_1.uasset delete mode 100644 Content/Assets/Objects/Rope_Bridge/Rope_001_normal_ncl1_2.uasset delete mode 100644 Content/Assets/Objects/Rope_Bridge/Rope_001_normal_ncl1_3.uasset delete mode 100644 Content/Assets/Objects/Rope_Bridge/Rope_001_normal_ncl1_4.uasset delete mode 100644 Content/Assets/Objects/Rope_Bridge/Rope_001_roughness_ncl1_1.uasset delete mode 100644 Content/Assets/Objects/Rope_Bridge/Rope_001_roughness_ncl1_2.uasset delete mode 100644 Content/Assets/Objects/Rope_Bridge/Rope_001_roughness_ncl1_3.uasset delete mode 100644 Content/Assets/Objects/Rope_Bridge/Rope_001_roughness_ncl1_4.uasset delete mode 100644 Content/Assets/Objects/Rope_Bridge/Rope_035.uasset delete mode 100644 Content/Assets/Objects/Rope_Bridge/Rope_036.uasset delete mode 100644 Content/Assets/Objects/Rope_Bridge/Rope_037.uasset delete mode 100644 Content/Assets/Objects/Rope_Bridge/Rope_038.uasset create mode 100644 Content/Assets/Objects/Rope_Bridge/Rope_bridge_Cube_001.uasset create mode 100644 Content/Assets/Objects/Rope_Bridge/Rope_bridge_Cube_002.uasset create mode 100644 Content/Assets/Objects/Rope_Bridge/Rope_bridge_Cube_006.uasset delete mode 100644 Content/Assets/Objects/Rope_Bridge/Rope_bridge_Rope.uasset delete mode 100644 Content/Assets/Objects/Rope_Bridge/Rope_bridge_Rope_001.uasset delete mode 100644 Content/Assets/Objects/Rope_Bridge/Rope_bridge_Rope_002.uasset delete mode 100644 Content/Assets/Objects/Rope_Bridge/Rope_bridge_Rope_003.uasset delete mode 100644 Content/Assets/Objects/Rope_Bridge/Rope_bridge_Rope_004.uasset delete mode 100644 Content/Assets/Objects/Rope_Bridge/Rope_bridge_Rope_005.uasset delete mode 100644 Content/Assets/Objects/Rope_Bridge/Rope_bridge_Rope_006.uasset delete mode 100644 Content/Assets/Objects/Rope_Bridge/Rope_bridge_Rope_007.uasset delete mode 100644 Content/Assets/Objects/Rope_Bridge/Rope_bridge_Rope_008.uasset delete mode 100644 Content/Assets/Objects/Rope_Bridge/Rope_bridge_Rope_009.uasset delete mode 100644 Content/Assets/Objects/Rope_Bridge/Rope_bridge_Rope_010.uasset delete mode 100644 Content/Assets/Objects/Rope_Bridge/Rope_bridge_Rope_011.uasset delete mode 100644 Content/Assets/Objects/Rope_Bridge/Rope_bridge_Rope_012.uasset delete mode 100644 Content/Assets/Objects/Rope_Bridge/Rope_bridge_Rope_013.uasset delete mode 100644 Content/Assets/Objects/Rope_Bridge/Rope_bridge_Rope_014.uasset delete mode 100644 Content/Assets/Objects/Rope_Bridge/Rope_bridge_Rope_015.uasset delete mode 100644 Content/Assets/Objects/Rope_Bridge/Rope_bridge_Rope_016.uasset delete mode 100644 Content/Assets/Objects/Rope_Bridge/Rope_bridge_Rope_017.uasset delete mode 100644 Content/Assets/Objects/Rope_Bridge/Rope_bridge_Rope_018.uasset delete mode 100644 Content/Assets/Objects/Rope_Bridge/Rope_bridge_Rope_pole.uasset delete mode 100644 Content/Assets/Objects/Rope_Bridge/Rope_bridge_Rope_pole_001.uasset delete mode 100644 Content/Assets/Objects/Rope_Bridge/Rope_bridge_Rope_pole_002.uasset delete mode 100644 Content/Assets/Objects/Rope_Bridge/Rope_bridge_Rope_pole_003.uasset delete mode 100644 Content/Assets/Objects/Rope_Bridge/Rope_bridge_Wood_planks.uasset delete mode 100644 Content/Assets/Objects/Rope_Bridge/Rope_bridge_wood_planks1.uasset delete mode 100644 Content/Assets/Objects/Rope_Bridge/Rope_bridge_wood_planks_001.uasset delete mode 100644 Content/Assets/Objects/Rope_Bridge/Wood_bark_real_001.uasset delete mode 100644 Content/Assets/Objects/Rope_Bridge/Wood_plank_002.uasset create mode 100644 Content/Assets/Objects/Rope_Bridge/bark_willow_ao_1k.uasset delete mode 100644 Content/Assets/Objects/Rope_Bridge/bark_willow_diff_1k_ncl1_1.uasset create mode 100644 Content/Assets/Objects/Rope_Bridge/bark_willow_disp_1k.uasset delete mode 100644 Content/Assets/Objects/Rope_Bridge/bark_willow_nor_dx_1k_ncl1_1.uasset delete mode 100644 Content/Assets/Objects/Rope_Bridge/bark_willow_rough_1k_ncl1_1.uasset delete mode 100644 Content/Assets/Objects/Rope_Bridge/wood_planks_grey_diff_2k.uasset delete mode 100644 Content/Assets/Objects/Rope_Bridge/wood_planks_grey_diff_2k_ncl1_1.uasset create mode 100644 Content/Assets/Objects/Rope_Bridge/wood_planks_grey_diff_2k_ncl1_2.uasset delete mode 100644 Content/Assets/Objects/Rope_Bridge/wood_planks_grey_nor_dx_2k.uasset delete mode 100644 Content/Assets/Objects/Rope_Bridge/wood_planks_grey_nor_dx_2k_ncl1_1.uasset create mode 100644 Content/Assets/Objects/Rope_Bridge/wood_planks_grey_nor_dx_2k_ncl1_2.uasset delete mode 100644 Content/Assets/Objects/Rope_Bridge/wood_planks_grey_rough_2k.uasset delete mode 100644 Content/Assets/Objects/Rope_Bridge/wood_planks_grey_rough_2k_ncl1_1.uasset create mode 100644 Content/Assets/Objects/Rope_Bridge/wood_planks_grey_rough_2k_ncl1_2.uasset diff --git a/Content/Assets/Objects/Rope_Bridge/Material_1722.uasset b/Content/Assets/Objects/Rope_Bridge/Material_1722.uasset index 81c8555..04d1f5d 100644 --- a/Content/Assets/Objects/Rope_Bridge/Material_1722.uasset +++ b/Content/Assets/Objects/Rope_Bridge/Material_1722.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:509680d40ff920501aa48356656693647ee65a5715b29082a4f1ef47de4149fd +oid sha256:56fcce2be5e8d17161e3b6a28764d1f35f4a0131d052572f9efcad6aef22f761 size 103815 diff --git a/Content/Assets/Objects/Rope_Bridge/Material_1722_ncl1_1.uasset b/Content/Assets/Objects/Rope_Bridge/Material_1722_ncl1_1.uasset deleted file mode 100644 index 7e983b4..0000000 --- a/Content/Assets/Objects/Rope_Bridge/Material_1722_ncl1_1.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:ff1d0b261afa29dc597bb095852a4a182ea3ef38c71a02e90a2a2735cfa16181 -size 103849 diff --git a/Content/Assets/Objects/Rope_Bridge/Material_1722_ncl1_2.uasset b/Content/Assets/Objects/Rope_Bridge/Material_1722_ncl1_2.uasset deleted file mode 100644 index 92ad9a8..0000000 --- a/Content/Assets/Objects/Rope_Bridge/Material_1722_ncl1_2.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:57a342ae162b8268d5387b1c808217621d4d8b3c28afcc37ade1585a972b805b -size 103849 diff --git a/Content/Assets/Objects/Rope_Bridge/Material_1722_ncl1_3.uasset b/Content/Assets/Objects/Rope_Bridge/Material_1722_ncl1_3.uasset deleted file mode 100644 index 243cb9c..0000000 --- a/Content/Assets/Objects/Rope_Bridge/Material_1722_ncl1_3.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:97077e59f939212afef732ded28efc55104fcb33d50207ba80de0951a1bc9482 -size 103849 diff --git a/Content/Assets/Objects/Rope_Bridge/Material_1722_ncl1_4.uasset b/Content/Assets/Objects/Rope_Bridge/Material_1722_ncl1_4.uasset deleted file mode 100644 index 7e2e898..0000000 --- a/Content/Assets/Objects/Rope_Bridge/Material_1722_ncl1_4.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:510589aa9ea8134ef59b267102b6b2b34a75f0e105bb39ad4c57c684dd00c4c3 -size 103849 diff --git a/Content/Assets/Objects/Rope_Bridge/Rope.uasset b/Content/Assets/Objects/Rope_Bridge/Rope.uasset index 1ebaa4a..896b5e8 100644 --- a/Content/Assets/Objects/Rope_Bridge/Rope.uasset +++ b/Content/Assets/Objects/Rope_Bridge/Rope.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:877d9dd612d9f4160c39b8b97c3b4933a322cb1af286041b666158632c664512 -size 12789 +oid sha256:59dd8ab550f3cc5c431bd90dc5a17006a98bdc2eb7d1ed04e0dbd790948d1238 +size 12783 diff --git a/Content/Assets/Objects/Rope_Bridge/Rope_001_normal.uasset b/Content/Assets/Objects/Rope_Bridge/Rope_001_normal.uasset index 7c8b717..314f1b0 100644 --- a/Content/Assets/Objects/Rope_Bridge/Rope_001_normal.uasset +++ b/Content/Assets/Objects/Rope_Bridge/Rope_001_normal.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4f3a25c9b0f70268ad49582f7625a7ef67ecb0f6713a0385e069d74594234af9 +oid sha256:ea80cc8215e3038e92d9aa86bc00bec36eca10ec730a3289e0ae325881a76064 size 228235 diff --git a/Content/Assets/Objects/Rope_Bridge/Rope_001_normal_ncl1_1.uasset b/Content/Assets/Objects/Rope_Bridge/Rope_001_normal_ncl1_1.uasset deleted file mode 100644 index 836c63e..0000000 --- a/Content/Assets/Objects/Rope_Bridge/Rope_001_normal_ncl1_1.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:d5932f5506de8b82dc641535de677e94a42c8a962173ea72b608c1384bc3b2f3 -size 228259 diff --git a/Content/Assets/Objects/Rope_Bridge/Rope_001_normal_ncl1_2.uasset b/Content/Assets/Objects/Rope_Bridge/Rope_001_normal_ncl1_2.uasset deleted file mode 100644 index e909eb6..0000000 --- a/Content/Assets/Objects/Rope_Bridge/Rope_001_normal_ncl1_2.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:03a42132305f0cc8ac6ce3dbd9879ee50ef446731b4ac840fe8abae24aa5b72e -size 228259 diff --git a/Content/Assets/Objects/Rope_Bridge/Rope_001_normal_ncl1_3.uasset b/Content/Assets/Objects/Rope_Bridge/Rope_001_normal_ncl1_3.uasset deleted file mode 100644 index b2e8414..0000000 --- a/Content/Assets/Objects/Rope_Bridge/Rope_001_normal_ncl1_3.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:8ac81432c78b0bf47ac7b2edac4d70ad168b037781abc84d9ec5ccb3ebfa0e88 -size 228259 diff --git a/Content/Assets/Objects/Rope_Bridge/Rope_001_normal_ncl1_4.uasset b/Content/Assets/Objects/Rope_Bridge/Rope_001_normal_ncl1_4.uasset deleted file mode 100644 index fd2fd31..0000000 --- a/Content/Assets/Objects/Rope_Bridge/Rope_001_normal_ncl1_4.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:7648db47a4d227f933fdf53dcf2516d22d41caef6d6cb855069efa229145245d -size 228259 diff --git a/Content/Assets/Objects/Rope_Bridge/Rope_001_roughness.uasset b/Content/Assets/Objects/Rope_Bridge/Rope_001_roughness.uasset index 567c3b8..3c22310 100644 --- a/Content/Assets/Objects/Rope_Bridge/Rope_001_roughness.uasset +++ b/Content/Assets/Objects/Rope_Bridge/Rope_001_roughness.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:7ca8024633c6415b80e019279fbab8d934e47dc7d76870f30f5538a778c2fc97 +oid sha256:bdc7416d8b801a5dd8d6902ad65209dd7da3ab8ca662e5c25940ba6a67a0c5fa size 45733 diff --git a/Content/Assets/Objects/Rope_Bridge/Rope_001_roughness_ncl1_1.uasset b/Content/Assets/Objects/Rope_Bridge/Rope_001_roughness_ncl1_1.uasset deleted file mode 100644 index cb30f9e..0000000 --- a/Content/Assets/Objects/Rope_Bridge/Rope_001_roughness_ncl1_1.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:036e32a2b5b8a3b81240d296212f9927c1f2740d9199580bc82871a6dc972c52 -size 45757 diff --git a/Content/Assets/Objects/Rope_Bridge/Rope_001_roughness_ncl1_2.uasset b/Content/Assets/Objects/Rope_Bridge/Rope_001_roughness_ncl1_2.uasset deleted file mode 100644 index 79f5f19..0000000 --- a/Content/Assets/Objects/Rope_Bridge/Rope_001_roughness_ncl1_2.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:aa83035536c84181cb4f7720c979950014079a2bc203ad4c49db302a7476b9bc -size 45757 diff --git a/Content/Assets/Objects/Rope_Bridge/Rope_001_roughness_ncl1_3.uasset b/Content/Assets/Objects/Rope_Bridge/Rope_001_roughness_ncl1_3.uasset deleted file mode 100644 index f2602a3..0000000 --- a/Content/Assets/Objects/Rope_Bridge/Rope_001_roughness_ncl1_3.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:57ab9e440842e6a60cdb070944e0503ee68a9c88937809dc805e6070a7385047 -size 45757 diff --git a/Content/Assets/Objects/Rope_Bridge/Rope_001_roughness_ncl1_4.uasset b/Content/Assets/Objects/Rope_Bridge/Rope_001_roughness_ncl1_4.uasset deleted file mode 100644 index 596b3be..0000000 --- a/Content/Assets/Objects/Rope_Bridge/Rope_001_roughness_ncl1_4.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:4f47b70fdd65070410dcd69658be94fdb342236cf1ff3dfebe1a7714e7a2f966 -size 45757 diff --git a/Content/Assets/Objects/Rope_Bridge/Rope_035.uasset b/Content/Assets/Objects/Rope_Bridge/Rope_035.uasset deleted file mode 100644 index f5711d5..0000000 --- a/Content/Assets/Objects/Rope_Bridge/Rope_035.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:4eb009115152c6c76e81e74611c57ccb263d187d8a7ee06f620dcf86b61b7d76 -size 12862 diff --git a/Content/Assets/Objects/Rope_Bridge/Rope_036.uasset b/Content/Assets/Objects/Rope_Bridge/Rope_036.uasset deleted file mode 100644 index 85e8852..0000000 --- a/Content/Assets/Objects/Rope_Bridge/Rope_036.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:b129704cad5601dae1ebb5207937385fcb2e152a4aec995d42db0cecebeb7e47 -size 12862 diff --git a/Content/Assets/Objects/Rope_Bridge/Rope_037.uasset b/Content/Assets/Objects/Rope_Bridge/Rope_037.uasset deleted file mode 100644 index 0dd069f..0000000 --- a/Content/Assets/Objects/Rope_Bridge/Rope_037.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:9898ceefe40ef903b4606135a8bc9ff55f39f9296e46b9dbd8d8cbfeba6b837d -size 12862 diff --git a/Content/Assets/Objects/Rope_Bridge/Rope_038.uasset b/Content/Assets/Objects/Rope_Bridge/Rope_038.uasset deleted file mode 100644 index c812be8..0000000 --- a/Content/Assets/Objects/Rope_Bridge/Rope_038.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:b471d494a7892447740d3ced41899c84ee6782e203a90b28791aac7afdfc694f -size 12862 diff --git a/Content/Assets/Objects/Rope_Bridge/Rope_bridge_Cube_001.uasset b/Content/Assets/Objects/Rope_Bridge/Rope_bridge_Cube_001.uasset new file mode 100644 index 0000000..7a9dedc --- /dev/null +++ b/Content/Assets/Objects/Rope_Bridge/Rope_bridge_Cube_001.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:fe2199c378c700b533a476b958ed8ca8bba22c4875b691a7b0c479cb1b71a342 +size 374345 diff --git a/Content/Assets/Objects/Rope_Bridge/Rope_bridge_Cube_002.uasset b/Content/Assets/Objects/Rope_Bridge/Rope_bridge_Cube_002.uasset new file mode 100644 index 0000000..3c05314 --- /dev/null +++ b/Content/Assets/Objects/Rope_Bridge/Rope_bridge_Cube_002.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:cb886c688029473fbc42e4cdb8f5476f64e9a8be5b2a4228a8dad39760997e4e +size 796224 diff --git a/Content/Assets/Objects/Rope_Bridge/Rope_bridge_Cube_006.uasset b/Content/Assets/Objects/Rope_Bridge/Rope_bridge_Cube_006.uasset new file mode 100644 index 0000000..b674418 --- /dev/null +++ b/Content/Assets/Objects/Rope_Bridge/Rope_bridge_Cube_006.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:65d8c23ae3fd2260167db5aaf1606197d4381f3c168f8ef81464e591b9292201 +size 796258 diff --git a/Content/Assets/Objects/Rope_Bridge/Rope_bridge_Rope.uasset b/Content/Assets/Objects/Rope_Bridge/Rope_bridge_Rope.uasset deleted file mode 100644 index d07ee1d..0000000 --- a/Content/Assets/Objects/Rope_Bridge/Rope_bridge_Rope.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:5fb709c4ec322ad7e4aa4d737a8561a6a96f3b97a7d951bf8b326ef2c08ddcbc -size 156278 diff --git a/Content/Assets/Objects/Rope_Bridge/Rope_bridge_Rope_001.uasset b/Content/Assets/Objects/Rope_Bridge/Rope_bridge_Rope_001.uasset deleted file mode 100644 index e95cbf9..0000000 --- a/Content/Assets/Objects/Rope_Bridge/Rope_bridge_Rope_001.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:fd8af9233bf415bf0f82e369b15666574af8e0cf36d0d9c9cb557345cb63f4df -size 103327 diff --git a/Content/Assets/Objects/Rope_Bridge/Rope_bridge_Rope_002.uasset b/Content/Assets/Objects/Rope_Bridge/Rope_bridge_Rope_002.uasset deleted file mode 100644 index 31df060..0000000 --- a/Content/Assets/Objects/Rope_Bridge/Rope_bridge_Rope_002.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:a52364eed437607b01b63c0975dd9100e094a7bb96d425dd6700f38c3927f2bf -size 104152 diff --git a/Content/Assets/Objects/Rope_Bridge/Rope_bridge_Rope_003.uasset b/Content/Assets/Objects/Rope_Bridge/Rope_bridge_Rope_003.uasset deleted file mode 100644 index 56142b8..0000000 --- a/Content/Assets/Objects/Rope_Bridge/Rope_bridge_Rope_003.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:e26c3f8b026148ca2f2acbde3a4ff11bbfef6b6e05ec01b91956c85bb222d7d6 -size 104275 diff --git a/Content/Assets/Objects/Rope_Bridge/Rope_bridge_Rope_004.uasset b/Content/Assets/Objects/Rope_Bridge/Rope_bridge_Rope_004.uasset deleted file mode 100644 index 24de88b..0000000 --- a/Content/Assets/Objects/Rope_Bridge/Rope_bridge_Rope_004.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:08ce72ff7271fd37664447359bfc7a5006382b1fd0f77edffca693077af80fe2 -size 89616 diff --git a/Content/Assets/Objects/Rope_Bridge/Rope_bridge_Rope_005.uasset b/Content/Assets/Objects/Rope_Bridge/Rope_bridge_Rope_005.uasset deleted file mode 100644 index 536e1e3..0000000 --- a/Content/Assets/Objects/Rope_Bridge/Rope_bridge_Rope_005.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:9aabe843f8cda8e281d83371f6f45cdd8751d03bdf79b089bba31da683b7ac95 -size 89646 diff --git a/Content/Assets/Objects/Rope_Bridge/Rope_bridge_Rope_006.uasset b/Content/Assets/Objects/Rope_Bridge/Rope_bridge_Rope_006.uasset deleted file mode 100644 index 7151a35..0000000 --- a/Content/Assets/Objects/Rope_Bridge/Rope_bridge_Rope_006.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:82f1ac30a11be22f3bb150ca1edd3f0d7d7377e6982c11f62b0acd064fd51291 -size 90016 diff --git a/Content/Assets/Objects/Rope_Bridge/Rope_bridge_Rope_007.uasset b/Content/Assets/Objects/Rope_Bridge/Rope_bridge_Rope_007.uasset deleted file mode 100644 index e25039e..0000000 --- a/Content/Assets/Objects/Rope_Bridge/Rope_bridge_Rope_007.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:3c242a9109191d0c519f734c93a1ca65c58a70138f26b8c05b5ed1a9ea813aaa -size 103184 diff --git a/Content/Assets/Objects/Rope_Bridge/Rope_bridge_Rope_008.uasset b/Content/Assets/Objects/Rope_Bridge/Rope_bridge_Rope_008.uasset deleted file mode 100644 index 7e5e4c4..0000000 --- a/Content/Assets/Objects/Rope_Bridge/Rope_bridge_Rope_008.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:36c6d2429ce803019282a28878fa3b235ea7eff08d7b29ff24b6b46049987ea0 -size 142216 diff --git a/Content/Assets/Objects/Rope_Bridge/Rope_bridge_Rope_009.uasset b/Content/Assets/Objects/Rope_Bridge/Rope_bridge_Rope_009.uasset deleted file mode 100644 index b026c9e..0000000 --- a/Content/Assets/Objects/Rope_Bridge/Rope_bridge_Rope_009.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:21457b872f337e0b0f837c966ff15582df339c97dbd70b46989527349361dea5 -size 142299 diff --git a/Content/Assets/Objects/Rope_Bridge/Rope_bridge_Rope_010.uasset b/Content/Assets/Objects/Rope_Bridge/Rope_bridge_Rope_010.uasset deleted file mode 100644 index 1f29f90..0000000 --- a/Content/Assets/Objects/Rope_Bridge/Rope_bridge_Rope_010.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:b510140a323e2a05e70e08703a1a8e63b7d9a9ea7680405e05f76cce4fab56da -size 103623 diff --git a/Content/Assets/Objects/Rope_Bridge/Rope_bridge_Rope_011.uasset b/Content/Assets/Objects/Rope_Bridge/Rope_bridge_Rope_011.uasset deleted file mode 100644 index 7347a58..0000000 --- a/Content/Assets/Objects/Rope_Bridge/Rope_bridge_Rope_011.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:498c306164fef13a434bd051161f2e6f959e0972e70204dea96fc12a3fb4a958 -size 103692 diff --git a/Content/Assets/Objects/Rope_Bridge/Rope_bridge_Rope_012.uasset b/Content/Assets/Objects/Rope_Bridge/Rope_bridge_Rope_012.uasset deleted file mode 100644 index 096b995..0000000 --- a/Content/Assets/Objects/Rope_Bridge/Rope_bridge_Rope_012.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:5981be272e38f59a92343e6b81c892b38ced509865c36697cd2e62c616a8c0f2 -size 103219 diff --git a/Content/Assets/Objects/Rope_Bridge/Rope_bridge_Rope_013.uasset b/Content/Assets/Objects/Rope_Bridge/Rope_bridge_Rope_013.uasset deleted file mode 100644 index 5bf9939..0000000 --- a/Content/Assets/Objects/Rope_Bridge/Rope_bridge_Rope_013.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:ef64ba278fac7147054dd694c2a371fc910e08b9edfe8debc9b69c1d4a1154d0 -size 103242 diff --git a/Content/Assets/Objects/Rope_Bridge/Rope_bridge_Rope_014.uasset b/Content/Assets/Objects/Rope_Bridge/Rope_bridge_Rope_014.uasset deleted file mode 100644 index a2b0aae..0000000 --- a/Content/Assets/Objects/Rope_Bridge/Rope_bridge_Rope_014.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:8194d301690078f045a4a37ef8ad97d4b364effe60161f670e3e36fae6e369e3 -size 157889 diff --git a/Content/Assets/Objects/Rope_Bridge/Rope_bridge_Rope_015.uasset b/Content/Assets/Objects/Rope_Bridge/Rope_bridge_Rope_015.uasset deleted file mode 100644 index ef45fe5..0000000 --- a/Content/Assets/Objects/Rope_Bridge/Rope_bridge_Rope_015.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:c7a4f77e8d066d030f07ed38c4598ca3050ec7c9bd57284c071611e59c51ed20 -size 233704 diff --git a/Content/Assets/Objects/Rope_Bridge/Rope_bridge_Rope_016.uasset b/Content/Assets/Objects/Rope_Bridge/Rope_bridge_Rope_016.uasset deleted file mode 100644 index 564c82d..0000000 --- a/Content/Assets/Objects/Rope_Bridge/Rope_bridge_Rope_016.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:6c8fb5c5f608ebd06ca9671d96c6ecbbc9a223a6e1e23f24c42e91c2ff929a71 -size 156802 diff --git a/Content/Assets/Objects/Rope_Bridge/Rope_bridge_Rope_017.uasset b/Content/Assets/Objects/Rope_Bridge/Rope_bridge_Rope_017.uasset deleted file mode 100644 index 0fcddd8..0000000 --- a/Content/Assets/Objects/Rope_Bridge/Rope_bridge_Rope_017.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:c013b60c4cc23c7e11e4ffe508387a87d6b126d8a7903350e856dccb14697f3a -size 143472 diff --git a/Content/Assets/Objects/Rope_Bridge/Rope_bridge_Rope_018.uasset b/Content/Assets/Objects/Rope_Bridge/Rope_bridge_Rope_018.uasset deleted file mode 100644 index 9b3ad98..0000000 --- a/Content/Assets/Objects/Rope_Bridge/Rope_bridge_Rope_018.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:74da684a024a09220a551b38a5df1d73130eafec063ef1984af9e86bb0879486 -size 142670 diff --git a/Content/Assets/Objects/Rope_Bridge/Rope_bridge_Rope_pole.uasset b/Content/Assets/Objects/Rope_Bridge/Rope_bridge_Rope_pole.uasset deleted file mode 100644 index 881f5b3..0000000 --- a/Content/Assets/Objects/Rope_Bridge/Rope_bridge_Rope_pole.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:95e5ee5d8e7e681febf6d387b29cf9014692a9211283f575c45d56be856d0d0a -size 31846 diff --git a/Content/Assets/Objects/Rope_Bridge/Rope_bridge_Rope_pole_001.uasset b/Content/Assets/Objects/Rope_Bridge/Rope_bridge_Rope_pole_001.uasset deleted file mode 100644 index 5903170..0000000 --- a/Content/Assets/Objects/Rope_Bridge/Rope_bridge_Rope_pole_001.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:ce6ee8755bd2f0e35766fd1636d900d1e6c87c9eb1dbdbdc32af7a77a83c791b -size 31846 diff --git a/Content/Assets/Objects/Rope_Bridge/Rope_bridge_Rope_pole_002.uasset b/Content/Assets/Objects/Rope_Bridge/Rope_bridge_Rope_pole_002.uasset deleted file mode 100644 index 2d951a0..0000000 --- a/Content/Assets/Objects/Rope_Bridge/Rope_bridge_Rope_pole_002.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:97401ad280fa61b5ed7abe01d7e3051168f8da16a1fcdf966fa162964fc5ca32 -size 31139 diff --git a/Content/Assets/Objects/Rope_Bridge/Rope_bridge_Rope_pole_003.uasset b/Content/Assets/Objects/Rope_Bridge/Rope_bridge_Rope_pole_003.uasset deleted file mode 100644 index 6d7bd6a..0000000 --- a/Content/Assets/Objects/Rope_Bridge/Rope_bridge_Rope_pole_003.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:85887706d246a013c3e0d947be97849024aa61ce5d2b854e5a60304d609a11c5 -size 31235 diff --git a/Content/Assets/Objects/Rope_Bridge/Rope_bridge_Wood_planks.uasset b/Content/Assets/Objects/Rope_Bridge/Rope_bridge_Wood_planks.uasset deleted file mode 100644 index 6037429..0000000 --- a/Content/Assets/Objects/Rope_Bridge/Rope_bridge_Wood_planks.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:3498395bd7eda9dc40ada9ecac8cebb76e8af31755b08659fdfc19a43732568f -size 26892 diff --git a/Content/Assets/Objects/Rope_Bridge/Rope_bridge_wood_planks1.uasset b/Content/Assets/Objects/Rope_Bridge/Rope_bridge_wood_planks1.uasset deleted file mode 100644 index 0d05b78..0000000 --- a/Content/Assets/Objects/Rope_Bridge/Rope_bridge_wood_planks1.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:3b1c992edace4b26fc2ea377269213cdcf3bc49d5c76f0affbae35a4cd818564 -size 26570 diff --git a/Content/Assets/Objects/Rope_Bridge/Rope_bridge_wood_planks_001.uasset b/Content/Assets/Objects/Rope_Bridge/Rope_bridge_wood_planks_001.uasset deleted file mode 100644 index 02da83e..0000000 --- a/Content/Assets/Objects/Rope_Bridge/Rope_bridge_wood_planks_001.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:a108c1c1107a2cecc97174b34d98144ee78a3cee2331085fa1ff862b0762fc4a -size 26953 diff --git a/Content/Assets/Objects/Rope_Bridge/Wood_bark_real.uasset b/Content/Assets/Objects/Rope_Bridge/Wood_bark_real.uasset index 9b4121f..8dccdfa 100644 --- a/Content/Assets/Objects/Rope_Bridge/Wood_bark_real.uasset +++ b/Content/Assets/Objects/Rope_Bridge/Wood_bark_real.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b072158ce82855cf4073c4f512bf5f91b052e159b39a103569dd6b30b4a086dc -size 8857 +oid sha256:9923cb05121e39a1bba89f3dcfdfa5c5274ddb98c9547fb55b37c3b377a9d6eb +size 13194 diff --git a/Content/Assets/Objects/Rope_Bridge/Wood_bark_real_001.uasset b/Content/Assets/Objects/Rope_Bridge/Wood_bark_real_001.uasset deleted file mode 100644 index 63593f2..0000000 --- a/Content/Assets/Objects/Rope_Bridge/Wood_bark_real_001.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:1c69b6b3c740bfd2be64cbf5abd073102ac82dd53ea69ed96f3affbaf0d0505b -size 8903 diff --git a/Content/Assets/Objects/Rope_Bridge/Wood_plank.uasset b/Content/Assets/Objects/Rope_Bridge/Wood_plank.uasset index c060cc5..ac1c817 100644 --- a/Content/Assets/Objects/Rope_Bridge/Wood_plank.uasset +++ b/Content/Assets/Objects/Rope_Bridge/Wood_plank.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c5161df650f7ac65d023eaec61d4d23cc12890c9b4513b13bb36e476238a6fae -size 8871 +oid sha256:746250bfff7b4ab30ff74cede86f309c1de094df828810c7bcea279a6d4664db +size 11808 diff --git a/Content/Assets/Objects/Rope_Bridge/Wood_plank_002.uasset b/Content/Assets/Objects/Rope_Bridge/Wood_plank_002.uasset deleted file mode 100644 index 7226b83..0000000 --- a/Content/Assets/Objects/Rope_Bridge/Wood_plank_002.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:f80ac2fd212b5c38fb0ecf2726a16705cd7f98f906a2b11ada6c8580265a861d -size 8917 diff --git a/Content/Assets/Objects/Rope_Bridge/bark_willow_ao_1k.uasset b/Content/Assets/Objects/Rope_Bridge/bark_willow_ao_1k.uasset new file mode 100644 index 0000000..c32a212 --- /dev/null +++ b/Content/Assets/Objects/Rope_Bridge/bark_willow_ao_1k.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e5f3236820c75f6777040cf24a5e41889a1e99577c1ebb896aaf65c79ce11915 +size 1011106 diff --git a/Content/Assets/Objects/Rope_Bridge/bark_willow_diff_1k.uasset b/Content/Assets/Objects/Rope_Bridge/bark_willow_diff_1k.uasset index 75d5a51..9c79581 100644 --- a/Content/Assets/Objects/Rope_Bridge/bark_willow_diff_1k.uasset +++ b/Content/Assets/Objects/Rope_Bridge/bark_willow_diff_1k.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c87d3b0ddd310a7baa4fd254153fde0999dc19a3e222b76df0a396e2415c8cf5 +oid sha256:2d780ab1643147e7091c9ac9ffc6634a3a72858f9ff33b47e98700caee13fa28 size 790316 diff --git a/Content/Assets/Objects/Rope_Bridge/bark_willow_diff_1k_ncl1_1.uasset b/Content/Assets/Objects/Rope_Bridge/bark_willow_diff_1k_ncl1_1.uasset deleted file mode 100644 index b59de4f..0000000 --- a/Content/Assets/Objects/Rope_Bridge/bark_willow_diff_1k_ncl1_1.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:b5af3af92232717e6259508a56d8863bc321610b046bfac08193d6ed590cda92 -size 790340 diff --git a/Content/Assets/Objects/Rope_Bridge/bark_willow_disp_1k.uasset b/Content/Assets/Objects/Rope_Bridge/bark_willow_disp_1k.uasset new file mode 100644 index 0000000..01eb149 --- /dev/null +++ b/Content/Assets/Objects/Rope_Bridge/bark_willow_disp_1k.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f1e799a8be6ea7edeb0f2d3fd74671c411287abe68d4ca0cc9e379f8e6a84239 +size 1682001 diff --git a/Content/Assets/Objects/Rope_Bridge/bark_willow_nor_dx_1k.uasset b/Content/Assets/Objects/Rope_Bridge/bark_willow_nor_dx_1k.uasset index 76769fc..3c41199 100644 --- a/Content/Assets/Objects/Rope_Bridge/bark_willow_nor_dx_1k.uasset +++ b/Content/Assets/Objects/Rope_Bridge/bark_willow_nor_dx_1k.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:9177ad4222c36369e6cba3734653aeeb02689f55dc7f0b9d01ac57bb0d352d51 +oid sha256:de4ef90c8c5458b4bbbf970ba00c4c1ca42c092f65e7714c8a162a9944b0b6c2 size 4696703 diff --git a/Content/Assets/Objects/Rope_Bridge/bark_willow_nor_dx_1k_ncl1_1.uasset b/Content/Assets/Objects/Rope_Bridge/bark_willow_nor_dx_1k_ncl1_1.uasset deleted file mode 100644 index 7255402..0000000 --- a/Content/Assets/Objects/Rope_Bridge/bark_willow_nor_dx_1k_ncl1_1.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:28cd6af6a9642feb492cdbc9bf458cd8ecf29eb8a4910bbca409a529a41e8d3f -size 4696727 diff --git a/Content/Assets/Objects/Rope_Bridge/bark_willow_rough_1k.uasset b/Content/Assets/Objects/Rope_Bridge/bark_willow_rough_1k.uasset index 643b5db..1395269 100644 --- a/Content/Assets/Objects/Rope_Bridge/bark_willow_rough_1k.uasset +++ b/Content/Assets/Objects/Rope_Bridge/bark_willow_rough_1k.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:194157d7512b36af80c7cb5655d16823c3e8a56959f7c0bec1b8e6ca7e5d18e8 +oid sha256:bd72e397659f9a432900aef75c589bc1237c0ffd1960168ad84e326981e7c220 size 918460 diff --git a/Content/Assets/Objects/Rope_Bridge/bark_willow_rough_1k_ncl1_1.uasset b/Content/Assets/Objects/Rope_Bridge/bark_willow_rough_1k_ncl1_1.uasset deleted file mode 100644 index 0e510de..0000000 --- a/Content/Assets/Objects/Rope_Bridge/bark_willow_rough_1k_ncl1_1.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:15b0a43ab2c906d01d6880435410d3f11c3a9d8185c6d69435e94e3542211d87 -size 918484 diff --git a/Content/Assets/Objects/Rope_Bridge/wood_planks_grey_diff_2k.uasset b/Content/Assets/Objects/Rope_Bridge/wood_planks_grey_diff_2k.uasset deleted file mode 100644 index 07fdd58..0000000 --- a/Content/Assets/Objects/Rope_Bridge/wood_planks_grey_diff_2k.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:e54175b47273b3457a9e68324afa64033cbb0bc21bf2198d810d2ddb459edd68 -size 1009266 diff --git a/Content/Assets/Objects/Rope_Bridge/wood_planks_grey_diff_2k_ncl1_1.uasset b/Content/Assets/Objects/Rope_Bridge/wood_planks_grey_diff_2k_ncl1_1.uasset deleted file mode 100644 index 7a4800d..0000000 --- a/Content/Assets/Objects/Rope_Bridge/wood_planks_grey_diff_2k_ncl1_1.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:7a4eab9449d5d00b11c5449ea5d6255e5e86cf79d09678564f89fc18455702e0 -size 1009290 diff --git a/Content/Assets/Objects/Rope_Bridge/wood_planks_grey_diff_2k_ncl1_2.uasset b/Content/Assets/Objects/Rope_Bridge/wood_planks_grey_diff_2k_ncl1_2.uasset new file mode 100644 index 0000000..f3fede2 --- /dev/null +++ b/Content/Assets/Objects/Rope_Bridge/wood_planks_grey_diff_2k_ncl1_2.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:5547e46bdd7aefa6b6a93123f8edff5b69311326914344f05357610ae058ebe2 +size 1009290 diff --git a/Content/Assets/Objects/Rope_Bridge/wood_planks_grey_nor_dx_2k.uasset b/Content/Assets/Objects/Rope_Bridge/wood_planks_grey_nor_dx_2k.uasset deleted file mode 100644 index 8c03c17..0000000 --- a/Content/Assets/Objects/Rope_Bridge/wood_planks_grey_nor_dx_2k.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:0b39c989b4951f5074791555df15eb9809b20aae518c8e37056df8a7d112f93e -size 13185652 diff --git a/Content/Assets/Objects/Rope_Bridge/wood_planks_grey_nor_dx_2k_ncl1_1.uasset b/Content/Assets/Objects/Rope_Bridge/wood_planks_grey_nor_dx_2k_ncl1_1.uasset deleted file mode 100644 index ce6ad45..0000000 --- a/Content/Assets/Objects/Rope_Bridge/wood_planks_grey_nor_dx_2k_ncl1_1.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:0c444f0f713abe79ff5f320040a139826a843e231f8425553d8e1f4414aeab99 -size 13185676 diff --git a/Content/Assets/Objects/Rope_Bridge/wood_planks_grey_nor_dx_2k_ncl1_2.uasset b/Content/Assets/Objects/Rope_Bridge/wood_planks_grey_nor_dx_2k_ncl1_2.uasset new file mode 100644 index 0000000..6ff1628 --- /dev/null +++ b/Content/Assets/Objects/Rope_Bridge/wood_planks_grey_nor_dx_2k_ncl1_2.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c593a9fe6c7bdeb795d3e8df854aac0471360ed6c2fe75a5e7f8b973952b5bf1 +size 13185676 diff --git a/Content/Assets/Objects/Rope_Bridge/wood_planks_grey_rough_2k.uasset b/Content/Assets/Objects/Rope_Bridge/wood_planks_grey_rough_2k.uasset deleted file mode 100644 index 35a5ac4..0000000 --- a/Content/Assets/Objects/Rope_Bridge/wood_planks_grey_rough_2k.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:d57d3d95de84feceb48b5ecf24144a0fdef50107b6b698dfa00572b408636f46 -size 15103 diff --git a/Content/Assets/Objects/Rope_Bridge/wood_planks_grey_rough_2k_ncl1_1.uasset b/Content/Assets/Objects/Rope_Bridge/wood_planks_grey_rough_2k_ncl1_1.uasset deleted file mode 100644 index e83f726..0000000 --- a/Content/Assets/Objects/Rope_Bridge/wood_planks_grey_rough_2k_ncl1_1.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:7245f92593fec0e0bbc304443ffeced13e71e18e2adf1d51c2583e16889ef3ed -size 15127 diff --git a/Content/Assets/Objects/Rope_Bridge/wood_planks_grey_rough_2k_ncl1_2.uasset b/Content/Assets/Objects/Rope_Bridge/wood_planks_grey_rough_2k_ncl1_2.uasset new file mode 100644 index 0000000..578c316 --- /dev/null +++ b/Content/Assets/Objects/Rope_Bridge/wood_planks_grey_rough_2k_ncl1_2.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:9d65e8b6469a02e6a0ba72e5b02bce6e3ee8167f022702a3cd88068101d4f748 +size 15127 From bea8e8c3965d867c0a4e0b1fedddb3b001b52807 Mon Sep 17 00:00:00 2001 From: KACPER Szelest Date: Mon, 16 Jan 2023 16:16:54 +0000 Subject: [PATCH 30/43] Added new tunnels Added a new tunnel asset --- Content/Assets/Objects/Abyss/Abyss_Cylinder.uasset | 4 ++-- Content/Assets/Objects/Caves/Rock_tunnels_Cube.uasset | 3 +++ Content/Assets/Objects/Caves/Rock_tunnels_Cube_003.uasset | 4 ++-- Content/Assets/Objects/Caves/Rock_tunnels_Curve.uasset | 4 ++-- Content/Assets/Objects/Caves/Rock_tunnels_Ramp.uasset | 4 ++-- Content/Assets/Objects/Caves/Rock_tunnels_Straight.uasset | 3 --- Content/Assets/Objects/Caves/Rock_tunnels_Straight_001.uasset | 4 ++-- .../science_buildings_large_building_door_wall_001.uasset | 4 ++-- Content/Assets/Objects/Stalegtite/Stalegtite.uasset | 4 ++-- Content/Levels/Top_layer_level.umap | 4 ++-- 10 files changed, 19 insertions(+), 19 deletions(-) create mode 100644 Content/Assets/Objects/Caves/Rock_tunnels_Cube.uasset delete mode 100644 Content/Assets/Objects/Caves/Rock_tunnels_Straight.uasset diff --git a/Content/Assets/Objects/Abyss/Abyss_Cylinder.uasset b/Content/Assets/Objects/Abyss/Abyss_Cylinder.uasset index 903c4a3..1fe8eb1 100644 --- a/Content/Assets/Objects/Abyss/Abyss_Cylinder.uasset +++ b/Content/Assets/Objects/Abyss/Abyss_Cylinder.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ba841289eaded1e97ec831fae4e5edaba05b57060cabef0c13abc9cf03f63e7e -size 504169 +oid sha256:fd6ed024a6f15d09ac31f87c00eafaab28d2cb8317a68c2757afacba53a2afba +size 512735 diff --git a/Content/Assets/Objects/Caves/Rock_tunnels_Cube.uasset b/Content/Assets/Objects/Caves/Rock_tunnels_Cube.uasset new file mode 100644 index 0000000..54e3988 --- /dev/null +++ b/Content/Assets/Objects/Caves/Rock_tunnels_Cube.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:6ad79af5f291ff4ca32134abf28cdf9abd9e9ff0ae4e6ba83637531ac079bc0b +size 116556 diff --git a/Content/Assets/Objects/Caves/Rock_tunnels_Cube_003.uasset b/Content/Assets/Objects/Caves/Rock_tunnels_Cube_003.uasset index 6697f7d..4bc51f4 100644 --- a/Content/Assets/Objects/Caves/Rock_tunnels_Cube_003.uasset +++ b/Content/Assets/Objects/Caves/Rock_tunnels_Cube_003.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e8ae255d67106c4a36d6d4442370172c708437524e8dad85d1f01f22856338ac -size 7156064 +oid sha256:dc2aea89afb0d062dfd7da6cfaee5c6d5fc60b00435aeac8633086851f49e66f +size 7156376 diff --git a/Content/Assets/Objects/Caves/Rock_tunnels_Curve.uasset b/Content/Assets/Objects/Caves/Rock_tunnels_Curve.uasset index 7483f15..1229fc5 100644 --- a/Content/Assets/Objects/Caves/Rock_tunnels_Curve.uasset +++ b/Content/Assets/Objects/Caves/Rock_tunnels_Curve.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e88322b3c874bcdb1bcecc8f7e12bb0ffae389569c3e5949d14449b69d26317d -size 121649 +oid sha256:d052d2d36b49e47f741221c2dcc0a21d87fcdbceb6d68cb1f1be9790439bb7c5 +size 122153 diff --git a/Content/Assets/Objects/Caves/Rock_tunnels_Ramp.uasset b/Content/Assets/Objects/Caves/Rock_tunnels_Ramp.uasset index 173a34d..06aa016 100644 --- a/Content/Assets/Objects/Caves/Rock_tunnels_Ramp.uasset +++ b/Content/Assets/Objects/Caves/Rock_tunnels_Ramp.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:0d9a7eabe7885b8c87ae2b0f987c9c094106f41fdbba8b96640d4e618a7d0ace -size 43264 +oid sha256:6ca591cbfce4708bf68056fb6da596a6d3fdcf078083b9403ca70e87e1a09f87 +size 43958 diff --git a/Content/Assets/Objects/Caves/Rock_tunnels_Straight.uasset b/Content/Assets/Objects/Caves/Rock_tunnels_Straight.uasset deleted file mode 100644 index b0cf122..0000000 --- a/Content/Assets/Objects/Caves/Rock_tunnels_Straight.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:86898f206db00a8b48303daa22af91f084c1657eafc9d27adc24e995ad847633 -size 42011 diff --git a/Content/Assets/Objects/Caves/Rock_tunnels_Straight_001.uasset b/Content/Assets/Objects/Caves/Rock_tunnels_Straight_001.uasset index 83df269..c4d41f8 100644 --- a/Content/Assets/Objects/Caves/Rock_tunnels_Straight_001.uasset +++ b/Content/Assets/Objects/Caves/Rock_tunnels_Straight_001.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:0b17423bc3f4010acb12a1ff663d6898f5020617af81cdf906360707fe362777 -size 49523 +oid sha256:3d8dba7e30c7f83b554b4ff2ec7c3647034301f7ed19b5ce50fac412c7326eae +size 50435 diff --git a/Content/Assets/Objects/Science_buildings/science_buildings_large_building_door_wall_001.uasset b/Content/Assets/Objects/Science_buildings/science_buildings_large_building_door_wall_001.uasset index b8e7cc6..da90715 100644 --- a/Content/Assets/Objects/Science_buildings/science_buildings_large_building_door_wall_001.uasset +++ b/Content/Assets/Objects/Science_buildings/science_buildings_large_building_door_wall_001.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f3795db0b151cf39b9779f6c041facb642e509af33e87703d920cb548707b428 -size 38695 +oid sha256:ca862d399281cd27d5892acaa161792431d492531ffd8a17acd571a9a9ac4c13 +size 98968 diff --git a/Content/Assets/Objects/Stalegtite/Stalegtite.uasset b/Content/Assets/Objects/Stalegtite/Stalegtite.uasset index a823318..fc6ef00 100644 --- a/Content/Assets/Objects/Stalegtite/Stalegtite.uasset +++ b/Content/Assets/Objects/Stalegtite/Stalegtite.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:059355422386ff6930e160ae4b9bbce7b42aac0f16db64dd027473bfc0795864 -size 1341287 +oid sha256:b6a4cdbe831fc972b6ea27f5a71d756c83382117ec885b3151ccfff8736e92dc +size 1342431 diff --git a/Content/Levels/Top_layer_level.umap b/Content/Levels/Top_layer_level.umap index d5b716d..03235f6 100644 --- a/Content/Levels/Top_layer_level.umap +++ b/Content/Levels/Top_layer_level.umap @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:352a8432e36505e271199d9ec825297d8ed792ca7184540458d6ff30732e31c8 -size 41419 +oid sha256:3a5830b6948f2d147c55d3cacd6a6f298498eb228eae105d9056d965fb113001 +size 95094 From 58243e8ccca403151d506a6ca0088f09a2259d01 Mon Sep 17 00:00:00 2001 From: MH261677 Date: Mon, 16 Jan 2023 17:01:04 +0000 Subject: [PATCH 31/43] Updated BP_ShopSelector, BP_MerchantInteraction Added interactivity for the buttons to activate functions in the interaction.cpp --- Content/Blueprints/Merchant/BP_MerchantInteraction.uasset | 4 ++-- .../Blueprints/Merchant/Merchant_UI/BP_ShopSelector.uasset | 4 ++-- Content/Levels/MerchantPrototype.umap | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Content/Blueprints/Merchant/BP_MerchantInteraction.uasset b/Content/Blueprints/Merchant/BP_MerchantInteraction.uasset index 2d5275a..b339768 100644 --- a/Content/Blueprints/Merchant/BP_MerchantInteraction.uasset +++ b/Content/Blueprints/Merchant/BP_MerchantInteraction.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:cbe759df6480175f1e18986bfb5b5d43047dfd4d67f0ccbaf962d41ad1aba1e8 -size 26818 +oid sha256:93c2579a50581de90958bd63c90f5844eed16729abeba05616fac1d57f10c0a5 +size 27054 diff --git a/Content/Blueprints/Merchant/Merchant_UI/BP_ShopSelector.uasset b/Content/Blueprints/Merchant/Merchant_UI/BP_ShopSelector.uasset index b8dacd0..324ee1a 100644 --- a/Content/Blueprints/Merchant/Merchant_UI/BP_ShopSelector.uasset +++ b/Content/Blueprints/Merchant/Merchant_UI/BP_ShopSelector.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:48ca274e48ad60e875654b1511a6b4ff981f6a079d0435a15ed3590b03c497ec -size 52563 +oid sha256:266dd1cd8999c193b756d5df106f2c83214b266d64402b11cb055fde1b9a46a4 +size 56067 diff --git a/Content/Levels/MerchantPrototype.umap b/Content/Levels/MerchantPrototype.umap index d9c7cf4..94b0c8b 100644 --- a/Content/Levels/MerchantPrototype.umap +++ b/Content/Levels/MerchantPrototype.umap @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:7561f73b5996a2170a51911f08cd6265413876a28382fe5d3d16a416683da860 +oid sha256:f35c864a6b8974a4b6c0767ba88e2aa4c2d1784c2a305f2b339a1fddc09875e4 size 27636 From ab2d2118dd1060ab5da21fbb85b314b5742627c1 Mon Sep 17 00:00:00 2001 From: MH261677 Date: Mon, 16 Jan 2023 17:02:12 +0000 Subject: [PATCH 32/43] Updated Interaction.cpp Added base functionality for both functions to make camera move --- .../MerchantInteraction/Interaction.cpp | 23 ++++++++++++++++++- .../MerchantInteraction/Interaction.h | 6 +++++ 2 files changed, 28 insertions(+), 1 deletion(-) diff --git a/Source/the_twilight_abyss/MerchantInteraction/Interaction.cpp b/Source/the_twilight_abyss/MerchantInteraction/Interaction.cpp index 27c894f..df602b7 100644 --- a/Source/the_twilight_abyss/MerchantInteraction/Interaction.cpp +++ b/Source/the_twilight_abyss/MerchantInteraction/Interaction.cpp @@ -4,6 +4,7 @@ #include "Interaction.h" #include "Chaos/BoundingVolumeUtilities.h" +#include "Components/Button.h" #include "Components/WidgetComponent.h" @@ -52,6 +53,16 @@ void AInteraction::RemoveWidget() ShopDialogWidget->RemoveFromViewport(); UE_LOG(LogTemp, Display, TEXT("setting isDisabled to true")); ItemSelectorWidget = CreateWidget(GetWorld(), ItemSelector); + UProperty* Property = ItemSelectorWidget->GetClass()->FindPropertyByName("publicActor"); + if (Property == nullptr) + { + UE_LOG(LogTemp, Error, TEXT("Property not found")); + } + else + { + FObjectPropertyBase* ObjectProperty = static_cast(Property); + ObjectProperty->SetObjectPropertyValue(ObjectProperty->ContainerPtrToValuePtr(ItemSelectorWidget), this); + } if (ItemSelectorWidget == nullptr) { return; @@ -61,4 +72,14 @@ void AInteraction::RemoveWidget() ItemSelectorWidget->AddToViewport(0); bisDisabled = false; } -} \ No newline at end of file +} + +void AInteraction::CameraLeftMover() +{ + UE_LOG(LogTemp, Display, TEXT("Button Left is being pressed")); +} + +void AInteraction::CameraRightMover() +{ + UE_LOG(LogTemp, Display, TEXT("Button Right is being pressed")); +} diff --git a/Source/the_twilight_abyss/MerchantInteraction/Interaction.h b/Source/the_twilight_abyss/MerchantInteraction/Interaction.h index fbeb15d..0c41e49 100644 --- a/Source/the_twilight_abyss/MerchantInteraction/Interaction.h +++ b/Source/the_twilight_abyss/MerchantInteraction/Interaction.h @@ -44,5 +44,11 @@ public: UPROPERTY() bool bisDisabled = false; + + UFUNCTION(BlueprintCallable, Category= "ButtonLeft") + virtual void CameraLeftMover(); + + UFUNCTION(BlueprintCallable, Category= "ButtonLeft") + virtual void CameraRightMover(); }; From 832efe418bcc7f78efd2876253363461563f740b Mon Sep 17 00:00:00 2001 From: KACPER Szelest Date: Mon, 16 Jan 2023 17:18:32 +0000 Subject: [PATCH 33/43] Created top layer level I created the tutorial of our top layer level, where there will be a few enemies to fight and the ability of seeing what else the player will be able to do in the game --- Content/Assets/Objects/Caves/Blue_rocks.uasset | 4 ++-- Content/Assets/Objects/Caves/Rock_tunnels_Cube.uasset | 3 --- Content/Assets/Objects/Caves/Rock_tunnels_Cube_003.uasset | 3 --- Content/Assets/Objects/Caves/Rock_tunnels_Curve.uasset | 4 ++-- Content/Assets/Objects/Caves/Rock_tunnels_Open_tunnel.uasset | 3 +++ Content/Assets/Objects/Caves/Rock_tunnels_Ramp.uasset | 4 ++-- Content/Assets/Objects/Caves/Rock_tunnels_Room.uasset | 3 +++ Content/Assets/Objects/Caves/Rock_tunnels_Stalegtite.uasset | 3 +++ Content/Assets/Objects/Caves/Rock_tunnels_Straight.uasset | 3 +++ Content/Assets/Objects/Caves/Rock_tunnels_Straight_001.uasset | 3 --- Content/Assets/Objects/Counter/Material.uasset | 4 ++-- Content/Assets/Objects/Counter/Material_001.uasset | 4 ++-- Content/Assets/Objects/Rope_Bridge/Rope.uasset | 4 ++-- Content/Assets/Objects/Rope_Bridge/Wood_bark_real.uasset | 4 ++-- Content/Assets/Objects/Rope_Bridge/Wood_plank.uasset | 4 ++-- Content/Assets/Objects/Science_buildings/Dirty_metal.uasset | 4 ++-- .../Assets/Objects/Science_buildings/Dirty_metal_001.uasset | 4 ++-- Content/Assets/Objects/Science_buildings/Metal.uasset | 4 ++-- Content/Assets/Objects/Science_buildings/Metal_002.uasset | 4 ++-- Content/Assets/Objects/Science_buildings/NewMaterial.uasset | 4 ++-- Content/Assets/Objects/Shelf/Material.uasset | 4 ++-- Content/Assets/Objects/Stalegtite/Material.uasset | 4 ++-- .../Objects/Steel_Rope_and_metal_beam/Metal_Grid.uasset | 4 ++-- .../Objects/Steel_Rope_and_metal_beam/Steel_Rope.uasset | 4 ++-- Content/Levels/Top_layer_level.umap | 4 ++-- 25 files changed, 48 insertions(+), 45 deletions(-) delete mode 100644 Content/Assets/Objects/Caves/Rock_tunnels_Cube.uasset delete mode 100644 Content/Assets/Objects/Caves/Rock_tunnels_Cube_003.uasset create mode 100644 Content/Assets/Objects/Caves/Rock_tunnels_Open_tunnel.uasset create mode 100644 Content/Assets/Objects/Caves/Rock_tunnels_Room.uasset create mode 100644 Content/Assets/Objects/Caves/Rock_tunnels_Stalegtite.uasset create mode 100644 Content/Assets/Objects/Caves/Rock_tunnels_Straight.uasset delete mode 100644 Content/Assets/Objects/Caves/Rock_tunnels_Straight_001.uasset diff --git a/Content/Assets/Objects/Caves/Blue_rocks.uasset b/Content/Assets/Objects/Caves/Blue_rocks.uasset index 2c170f9..8bd085a 100644 --- a/Content/Assets/Objects/Caves/Blue_rocks.uasset +++ b/Content/Assets/Objects/Caves/Blue_rocks.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:71d692c8faf65abfe095b323c201c8ebaf1ca07a187adf94f2f08b1ccd10d6ba -size 17611 +oid sha256:fcd050bbb60987754b5901bb0bdae71a95fd8dfb8f8db0c2c3286a64b2936912 +size 17673 diff --git a/Content/Assets/Objects/Caves/Rock_tunnels_Cube.uasset b/Content/Assets/Objects/Caves/Rock_tunnels_Cube.uasset deleted file mode 100644 index 54e3988..0000000 --- a/Content/Assets/Objects/Caves/Rock_tunnels_Cube.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:6ad79af5f291ff4ca32134abf28cdf9abd9e9ff0ae4e6ba83637531ac079bc0b -size 116556 diff --git a/Content/Assets/Objects/Caves/Rock_tunnels_Cube_003.uasset b/Content/Assets/Objects/Caves/Rock_tunnels_Cube_003.uasset deleted file mode 100644 index 4bc51f4..0000000 --- a/Content/Assets/Objects/Caves/Rock_tunnels_Cube_003.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:dc2aea89afb0d062dfd7da6cfaee5c6d5fc60b00435aeac8633086851f49e66f -size 7156376 diff --git a/Content/Assets/Objects/Caves/Rock_tunnels_Curve.uasset b/Content/Assets/Objects/Caves/Rock_tunnels_Curve.uasset index 1229fc5..959652c 100644 --- a/Content/Assets/Objects/Caves/Rock_tunnels_Curve.uasset +++ b/Content/Assets/Objects/Caves/Rock_tunnels_Curve.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d052d2d36b49e47f741221c2dcc0a21d87fcdbceb6d68cb1f1be9790439bb7c5 -size 122153 +oid sha256:8cadd3fe4e5d153aee3522f30d3eec32ead44ae7cdc609e93a21db3b3595bc76 +size 120871 diff --git a/Content/Assets/Objects/Caves/Rock_tunnels_Open_tunnel.uasset b/Content/Assets/Objects/Caves/Rock_tunnels_Open_tunnel.uasset new file mode 100644 index 0000000..afd1626 --- /dev/null +++ b/Content/Assets/Objects/Caves/Rock_tunnels_Open_tunnel.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c1c2cccc26ca73c7dac8b17c22adb4dd7bf8535b593afa74977ca65787c8e3aa +size 63772 diff --git a/Content/Assets/Objects/Caves/Rock_tunnels_Ramp.uasset b/Content/Assets/Objects/Caves/Rock_tunnels_Ramp.uasset index 06aa016..1837df3 100644 --- a/Content/Assets/Objects/Caves/Rock_tunnels_Ramp.uasset +++ b/Content/Assets/Objects/Caves/Rock_tunnels_Ramp.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:6ca591cbfce4708bf68056fb6da596a6d3fdcf078083b9403ca70e87e1a09f87 -size 43958 +oid sha256:8ec0636d0a97338b8e0daecd5f6219a8e0067d967614f09032e1d8d83362048a +size 55055 diff --git a/Content/Assets/Objects/Caves/Rock_tunnels_Room.uasset b/Content/Assets/Objects/Caves/Rock_tunnels_Room.uasset new file mode 100644 index 0000000..ef411bd --- /dev/null +++ b/Content/Assets/Objects/Caves/Rock_tunnels_Room.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:455ddc59555edf29e90ce6eabf4a6de3d40d206daa080d50b162d89631bcd264 +size 113673 diff --git a/Content/Assets/Objects/Caves/Rock_tunnels_Stalegtite.uasset b/Content/Assets/Objects/Caves/Rock_tunnels_Stalegtite.uasset new file mode 100644 index 0000000..37311a2 --- /dev/null +++ b/Content/Assets/Objects/Caves/Rock_tunnels_Stalegtite.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:5f678fe1d94f473c3b1b868d40ebdc44743369d68e3d7467b78351310626b73d +size 7156384 diff --git a/Content/Assets/Objects/Caves/Rock_tunnels_Straight.uasset b/Content/Assets/Objects/Caves/Rock_tunnels_Straight.uasset new file mode 100644 index 0000000..bc46916 --- /dev/null +++ b/Content/Assets/Objects/Caves/Rock_tunnels_Straight.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:73df5f14d19a0e1f5326d698bd305a30cb2216d72e27e1d7ee94773e9ed731f0 +size 51508 diff --git a/Content/Assets/Objects/Caves/Rock_tunnels_Straight_001.uasset b/Content/Assets/Objects/Caves/Rock_tunnels_Straight_001.uasset deleted file mode 100644 index c4d41f8..0000000 --- a/Content/Assets/Objects/Caves/Rock_tunnels_Straight_001.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:3d8dba7e30c7f83b554b4ff2ec7c3647034301f7ed19b5ce50fac412c7326eae -size 50435 diff --git a/Content/Assets/Objects/Counter/Material.uasset b/Content/Assets/Objects/Counter/Material.uasset index 318aa33..ca59e69 100644 --- a/Content/Assets/Objects/Counter/Material.uasset +++ b/Content/Assets/Objects/Counter/Material.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:11b09844fe8acb6b66314237c9133e8cda5bbc56dfb7c35bd3570a420784b808 -size 13750 +oid sha256:6a9859bf6341bd066083721e57c92086308eaf1b00efda6c52fa5742b00ce856 +size 13808 diff --git a/Content/Assets/Objects/Counter/Material_001.uasset b/Content/Assets/Objects/Counter/Material_001.uasset index 746b6bd..941e8d0 100644 --- a/Content/Assets/Objects/Counter/Material_001.uasset +++ b/Content/Assets/Objects/Counter/Material_001.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:822d334fd8468f672f703bdf3e66cb85245e6c64fea121538816fdf84547ee5f -size 10453 +oid sha256:7b2ead6bf0bb7b22dda7af02090527f56d628b5090b6a26c0f33d400cc4801f5 +size 10517 diff --git a/Content/Assets/Objects/Rope_Bridge/Rope.uasset b/Content/Assets/Objects/Rope_Bridge/Rope.uasset index 896b5e8..38288f1 100644 --- a/Content/Assets/Objects/Rope_Bridge/Rope.uasset +++ b/Content/Assets/Objects/Rope_Bridge/Rope.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:59dd8ab550f3cc5c431bd90dc5a17006a98bdc2eb7d1ed04e0dbd790948d1238 -size 12783 +oid sha256:bb7db3f6b09af4aee54e6e3c1151616793d39fccb613a5788be23f8eec60c32e +size 12496 diff --git a/Content/Assets/Objects/Rope_Bridge/Wood_bark_real.uasset b/Content/Assets/Objects/Rope_Bridge/Wood_bark_real.uasset index 8dccdfa..588fb84 100644 --- a/Content/Assets/Objects/Rope_Bridge/Wood_bark_real.uasset +++ b/Content/Assets/Objects/Rope_Bridge/Wood_bark_real.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:9923cb05121e39a1bba89f3dcfdfa5c5274ddb98c9547fb55b37c3b377a9d6eb -size 13194 +oid sha256:b2f3073a036df19347e8c4c28873181eb88e0261842275c08f9c378cfd572b20 +size 11088 diff --git a/Content/Assets/Objects/Rope_Bridge/Wood_plank.uasset b/Content/Assets/Objects/Rope_Bridge/Wood_plank.uasset index ac1c817..0044f0f 100644 --- a/Content/Assets/Objects/Rope_Bridge/Wood_plank.uasset +++ b/Content/Assets/Objects/Rope_Bridge/Wood_plank.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:746250bfff7b4ab30ff74cede86f309c1de094df828810c7bcea279a6d4664db -size 11808 +oid sha256:1aeb7ecffc76d3c4b3e293402c135432b4ed5303d2cfe8b867c9b4494d8a0b2e +size 9907 diff --git a/Content/Assets/Objects/Science_buildings/Dirty_metal.uasset b/Content/Assets/Objects/Science_buildings/Dirty_metal.uasset index 2dfa505..a3fc08e 100644 --- a/Content/Assets/Objects/Science_buildings/Dirty_metal.uasset +++ b/Content/Assets/Objects/Science_buildings/Dirty_metal.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:23f8aff15c25a22d26124cf8fda2f122f672f2731e699ab7daaa7a85c620befb -size 12424 +oid sha256:914f940d1787faaca98a90ce41a3fafc3e75070e0cd5c6d22f89270342a4027d +size 9547 diff --git a/Content/Assets/Objects/Science_buildings/Dirty_metal_001.uasset b/Content/Assets/Objects/Science_buildings/Dirty_metal_001.uasset index 45829a5..683ec06 100644 --- a/Content/Assets/Objects/Science_buildings/Dirty_metal_001.uasset +++ b/Content/Assets/Objects/Science_buildings/Dirty_metal_001.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:6ff98d6086c6bd0cad77980d020d8f3cfc0383a550eeda091200daf5dd74b8ac -size 12470 +oid sha256:e19b009c8ad3fa7f77400fc5c931673c0150a81d835442856ca8b43965151a93 +size 9593 diff --git a/Content/Assets/Objects/Science_buildings/Metal.uasset b/Content/Assets/Objects/Science_buildings/Metal.uasset index b0a5831..7ba9933 100644 --- a/Content/Assets/Objects/Science_buildings/Metal.uasset +++ b/Content/Assets/Objects/Science_buildings/Metal.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:8aa8f89056197a667fafa2c3b38fa7388632719fc6e051ce10ee16cc2005a5dc -size 13783 +oid sha256:58f37578870904d1e1b37163bd863632ec9b257e486553994845f932f9201fe6 +size 10653 diff --git a/Content/Assets/Objects/Science_buildings/Metal_002.uasset b/Content/Assets/Objects/Science_buildings/Metal_002.uasset index bf0d572..0b57d08 100644 --- a/Content/Assets/Objects/Science_buildings/Metal_002.uasset +++ b/Content/Assets/Objects/Science_buildings/Metal_002.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d0506a4ba39e352c2bf74ea81b80cc7ce25e02a2b46ae38307a8cf12cc5e3250 -size 13829 +oid sha256:b0c3f916dd91882a728cc6a91a54723eecf751700416ff91a488968d48567a9c +size 10699 diff --git a/Content/Assets/Objects/Science_buildings/NewMaterial.uasset b/Content/Assets/Objects/Science_buildings/NewMaterial.uasset index 158255b..5876596 100644 --- a/Content/Assets/Objects/Science_buildings/NewMaterial.uasset +++ b/Content/Assets/Objects/Science_buildings/NewMaterial.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d6d41dd08955fea99f9fcee22a0a9bc251207290ef3349922c0646f90a0e5772 -size 12159 +oid sha256:8d67ce633b20a44e8037e4995385a93b56fe79231de5bbcd6af70763e26d6696 +size 12221 diff --git a/Content/Assets/Objects/Shelf/Material.uasset b/Content/Assets/Objects/Shelf/Material.uasset index 604b8c1..010cf9b 100644 --- a/Content/Assets/Objects/Shelf/Material.uasset +++ b/Content/Assets/Objects/Shelf/Material.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:75fc26885780e9ae9933ac125823b67535caa327f9f1a0fc5ba6c695f697a7e3 -size 12702 +oid sha256:c083598f38afbe8137aef8dcd8bf068362898dfbc64ba583f9f99b29a66907de +size 12741 diff --git a/Content/Assets/Objects/Stalegtite/Material.uasset b/Content/Assets/Objects/Stalegtite/Material.uasset index 269aa3d..512ce04 100644 --- a/Content/Assets/Objects/Stalegtite/Material.uasset +++ b/Content/Assets/Objects/Stalegtite/Material.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:6d1ed215b520515ef38856b86c8f58f7f38c1608683da710e4ea40c01cb9fd8b -size 17800 +oid sha256:ed9a13b2cc1e2cf3fa38078bf5fd363345db85eef115eabf1d2eae0cb1edd310 +size 17864 diff --git a/Content/Assets/Objects/Steel_Rope_and_metal_beam/Metal_Grid.uasset b/Content/Assets/Objects/Steel_Rope_and_metal_beam/Metal_Grid.uasset index 01ae186..e316d8c 100644 --- a/Content/Assets/Objects/Steel_Rope_and_metal_beam/Metal_Grid.uasset +++ b/Content/Assets/Objects/Steel_Rope_and_metal_beam/Metal_Grid.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d049e8aa94206a4f5cc46d7a1cec161ade2cea442ea7a441f2ed8918a38a4d58 -size 18505 +oid sha256:c60d10bb6f05f3dd62a506bf00e90e49ed6b1892345f7f72a8bcaccf23073ccd +size 15904 diff --git a/Content/Assets/Objects/Steel_Rope_and_metal_beam/Steel_Rope.uasset b/Content/Assets/Objects/Steel_Rope_and_metal_beam/Steel_Rope.uasset index f5e34ec..8ef44cd 100644 --- a/Content/Assets/Objects/Steel_Rope_and_metal_beam/Steel_Rope.uasset +++ b/Content/Assets/Objects/Steel_Rope_and_metal_beam/Steel_Rope.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d449d8abfb187dc8ef3876ab1565fe3a5bd95acdfb409fa2e06d0d76173d3af0 -size 15259 +oid sha256:70afa5d610581d939658b0ceb2a4603dda3012f48a98c3948c9268fc4c8e091d +size 10100 diff --git a/Content/Levels/Top_layer_level.umap b/Content/Levels/Top_layer_level.umap index 03235f6..993da06 100644 --- a/Content/Levels/Top_layer_level.umap +++ b/Content/Levels/Top_layer_level.umap @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3a5830b6948f2d147c55d3cacd6a6f298498eb228eae105d9056d965fb113001 -size 95094 +oid sha256:219e22b2fdb988eac65f5c664d28f6feb9a5811b1a0ec270a6c904992006c36a +size 114661 From 74a14f68c77385e08ac9cb7b0cfb14a9eba2d804 Mon Sep 17 00:00:00 2001 From: KACPER Szelest Date: Mon, 16 Jan 2023 17:20:50 +0000 Subject: [PATCH 34/43] Added destructable objects Added a few things that are able to be destroyed --- Content/Levels/Top_layer_level.umap | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Content/Levels/Top_layer_level.umap b/Content/Levels/Top_layer_level.umap index 993da06..16ed719 100644 --- a/Content/Levels/Top_layer_level.umap +++ b/Content/Levels/Top_layer_level.umap @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:219e22b2fdb988eac65f5c664d28f6feb9a5811b1a0ec270a6c904992006c36a -size 114661 +oid sha256:73bcd3f475fbb786a38e5997deeb6d8090ec8a7bf8b42aa7188dc8cc655828ba +size 118093 From 7aa3a702d6504e4a76080b4cca98f34843542051 Mon Sep 17 00:00:00 2001 From: MH261677 Date: Mon, 16 Jan 2023 17:35:11 +0000 Subject: [PATCH 35/43] Updated Interaction.cpp Script now looks for the camera on the player making it ready to start moving the camera to the items --- .../MerchantInteraction/Interaction.cpp | 42 +++++++++++++++++++ .../MerchantInteraction/Interaction.h | 7 ++++ 2 files changed, 49 insertions(+) diff --git a/Source/the_twilight_abyss/MerchantInteraction/Interaction.cpp b/Source/the_twilight_abyss/MerchantInteraction/Interaction.cpp index df602b7..b6f63ab 100644 --- a/Source/the_twilight_abyss/MerchantInteraction/Interaction.cpp +++ b/Source/the_twilight_abyss/MerchantInteraction/Interaction.cpp @@ -3,8 +3,10 @@ #include "Interaction.h" +#include "NetworkMessage.h" #include "Chaos/BoundingVolumeUtilities.h" #include "Components/Button.h" +#include "GameFramework/Character.h" #include "Components/WidgetComponent.h" @@ -77,9 +79,49 @@ void AInteraction::RemoveWidget() void AInteraction::CameraLeftMover() { UE_LOG(LogTemp, Display, TEXT("Button Left is being pressed")); + TempCharacter = GetWorld()->GetFirstPlayerController()->GetCharacter(); + MainCamera = Cast(TempCharacter->FindComponentByClass()); + if (TempCharacter == nullptr) + { + UE_LOG(LogTemp, Display, TEXT("Character not found in Interaction.cpp")); + return; + } + else + { + UE_LOG(LogTemp, Display, TEXT("Character Found in interaction.cpp")); + if (MainCamera == nullptr) + { + UE_LOG(LogTemp, Display, TEXT("Camera not found in Interaction.cpp")); + return; + } + else + { + UE_LOG(LogTemp, Display, TEXT("Camera functionality here in Interaction.cpp")); + } + } } void AInteraction::CameraRightMover() { UE_LOG(LogTemp, Display, TEXT("Button Right is being pressed")); + TempCharacter = GetWorld()->GetFirstPlayerController()->GetCharacter(); + MainCamera = Cast(TempCharacter->FindComponentByClass()); + if (TempCharacter == nullptr) + { + UE_LOG(LogTemp, Display, TEXT("Character not found in Interaction.cpp")); + return; + } + else + { + UE_LOG(LogTemp, Display, TEXT("Character Found in interaction.cpp")); + if (MainCamera == nullptr) + { + UE_LOG(LogTemp, Display, TEXT("Camera not found in Interaction.cpp")); + return; + } + else + { + UE_LOG(LogTemp, Display, TEXT("Camera functionality here in Interaction.cpp")); + } + } } diff --git a/Source/the_twilight_abyss/MerchantInteraction/Interaction.h b/Source/the_twilight_abyss/MerchantInteraction/Interaction.h index 0c41e49..4231b2a 100644 --- a/Source/the_twilight_abyss/MerchantInteraction/Interaction.h +++ b/Source/the_twilight_abyss/MerchantInteraction/Interaction.h @@ -3,6 +3,7 @@ #pragma once #include "CoreMinimal.h" +#include "Camera/CameraComponent.h" #include "GameFramework/Actor.h" #include "Interaction.generated.h" @@ -50,5 +51,11 @@ public: UFUNCTION(BlueprintCallable, Category= "ButtonLeft") virtual void CameraRightMover(); + + UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = "Camera") + UCameraComponent* MainCamera; + + UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = "Player") + ACharacter* TempCharacter; }; From 77328aa8878dc05ed74399e5197da0e55941ce46 Mon Sep 17 00:00:00 2001 From: MH261677 Date: Mon, 16 Jan 2023 20:42:16 +0000 Subject: [PATCH 36/43] Created WBP_BuyHealing Created the buy healing jelly promt and gave it functionality to trigger buyitem which triggers linetrace logic --- .../Blueprints/Merchant/Merchant_UI/BP_ShopSelector.uasset | 4 ++-- Content/Blueprints/Merchant/Merchant_UI/WBP_BuyHealing.uasset | 3 +++ Content/Levels/MerchantPrototype.umap | 4 ++-- 3 files changed, 7 insertions(+), 4 deletions(-) create mode 100644 Content/Blueprints/Merchant/Merchant_UI/WBP_BuyHealing.uasset diff --git a/Content/Blueprints/Merchant/Merchant_UI/BP_ShopSelector.uasset b/Content/Blueprints/Merchant/Merchant_UI/BP_ShopSelector.uasset index 324ee1a..976a05d 100644 --- a/Content/Blueprints/Merchant/Merchant_UI/BP_ShopSelector.uasset +++ b/Content/Blueprints/Merchant/Merchant_UI/BP_ShopSelector.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:266dd1cd8999c193b756d5df106f2c83214b266d64402b11cb055fde1b9a46a4 -size 56067 +oid sha256:76ed9d24b439af10032d04bca6332b6c83c495437f91107a053567b3c292e7ce +size 63079 diff --git a/Content/Blueprints/Merchant/Merchant_UI/WBP_BuyHealing.uasset b/Content/Blueprints/Merchant/Merchant_UI/WBP_BuyHealing.uasset new file mode 100644 index 0000000..e5b7da1 --- /dev/null +++ b/Content/Blueprints/Merchant/Merchant_UI/WBP_BuyHealing.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:18df7e579d921e01ef2e3bd23df885c9225828f21c914e0a92ad766b4e25a26a +size 42158 diff --git a/Content/Levels/MerchantPrototype.umap b/Content/Levels/MerchantPrototype.umap index 94b0c8b..7daa7d9 100644 --- a/Content/Levels/MerchantPrototype.umap +++ b/Content/Levels/MerchantPrototype.umap @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f35c864a6b8974a4b6c0767ba88e2aa4c2d1784c2a305f2b339a1fddc09875e4 -size 27636 +oid sha256:0ffba42fc8f6527bb83238b65ee72d5d2de2589f1d1bc825c23c5d86fc732889 +size 27144 From 3752a24eab631d9b174c2800c286c06fda137c1b Mon Sep 17 00:00:00 2001 From: MH261677 Date: Mon, 16 Jan 2023 20:44:23 +0000 Subject: [PATCH 37/43] Updated TempCharacter Created camera function which pans the camera to the object and raises FOV, Fixed multiple bugs to do with disabling input, Created BuyItem function which raises the TraceDistance temporarily so user can purchase at longer distances --- .../PlayerTemp/TempCharacter.cpp | 50 +++++++++++++++---- .../PlayerTemp/TempCharacter.h | 14 ++++++ 2 files changed, 55 insertions(+), 9 deletions(-) diff --git a/Source/the_twilight_abyss/PlayerTemp/TempCharacter.cpp b/Source/the_twilight_abyss/PlayerTemp/TempCharacter.cpp index 9a8920b..2bec2af 100644 --- a/Source/the_twilight_abyss/PlayerTemp/TempCharacter.cpp +++ b/Source/the_twilight_abyss/PlayerTemp/TempCharacter.cpp @@ -64,11 +64,12 @@ void ATempCharacter::KeyPressed() // Line trace logic void ATempCharacter::LineTraceLogic() { + UE_LOG(LogTemp, Display, TEXT("LineTraceLogic firing")); float GlobalTrace = TraceDistance; FHitResult OutHit; - FVector Start = GetActorLocation(); - FVector End = Start + GlobalTrace * GetActorForwardVector(); - + ThisCamera = Cast(this->FindComponentByClass()); + FVector Start = ThisCamera->GetComponentLocation(); + FVector End = Start + GlobalTrace * ThisCamera->GetForwardVector(); FCollisionQueryParams TraceParams; TraceParams.AddIgnoredActor(this); @@ -106,14 +107,11 @@ void ATempCharacter::LineTraceLogic() UE_LOG(LogTemp, Display, TEXT("HIT: %s"), *OutHit.GetActor()->GetName()); // While loop to check bisDisabled var until it changes to true - while (MyInteractable->bisDisabled == false) + while (MyInteractable->bisDisabled == false || MyInteractable->bDisableShopDialMove == false) { - if (MyInteractable->bisDisabled == true) + if (MyInteractable->bisDisabled == true || MyInteractable->bDisableShopDialMove == true) { - //I am creating a 5 second timer here that then executes the inputdisabler function - FTimerHandle TimerHandle; - FTimerDelegate TimerDelegate = FTimerDelegate::CreateUObject(this, &ATempCharacter::InputDisabler); - GetWorld()->GetTimerManager().SetTimer(TimerHandle, TimerDelegate, 6.0f, false); + InputDisabler(); break; } } @@ -129,6 +127,19 @@ void ATempCharacter::InputDisabler() GetWorld()->GetFirstPlayerController()->bShowMouseCursor = true; GetWorld()->GetFirstPlayerController()->bEnableClickEvents = true; GetWorld()->GetFirstPlayerController()->bEnableMouseOverEvents = true; + ThisCamera = Cast(this->FindComponentByClass()); + if (ThisCamera == nullptr) + { + return; + } + else + { + OriginalCameraLocation = ThisCamera->GetComponentLocation(); + OriginalCameraRotation = ThisCamera->GetComponentRotation(); + OriginalCameraFOV = ThisCamera->FieldOfView; + //ulog the originalcameralocation value + UE_LOG(LogTemp, Display, TEXT("Original Camera Location: %s"), *OriginalCameraLocation.ToString()); + } } void ATempCharacter::InputEnabler() @@ -139,6 +150,20 @@ void ATempCharacter::InputEnabler() GetWorld()->GetFirstPlayerController()->bShowMouseCursor = false; GetWorld()->GetFirstPlayerController()->bEnableClickEvents = false; GetWorld()->GetFirstPlayerController()->bEnableMouseOverEvents = false; + ThisCamera = Cast(this->FindComponentByClass()); + if (ThisCamera == nullptr) + { + return; + } + else + { + ThisCamera->SetWorldLocation(OriginalCameraLocation); + ThisCamera->SetWorldRotation(OriginalCameraRotation); + ThisCamera->FieldOfView = OriginalCameraFOV; + + //ulog the originalcameralocation value + UE_LOG(LogTemp, Display, TEXT("Original Camera Location: %s"), *OriginalCameraLocation.ToString()); + } } void ATempCharacter::UseItem(class UBaseItem* Item) @@ -150,5 +175,12 @@ void ATempCharacter::UseItem(class UBaseItem* Item) } } +void ATempCharacter::BuyItem() +{ + TraceDistance = 1000; + LineTraceLogic(); +} + + diff --git a/Source/the_twilight_abyss/PlayerTemp/TempCharacter.h b/Source/the_twilight_abyss/PlayerTemp/TempCharacter.h index cc97668..4cf0350 100644 --- a/Source/the_twilight_abyss/PlayerTemp/TempCharacter.h +++ b/Source/the_twilight_abyss/PlayerTemp/TempCharacter.h @@ -5,6 +5,9 @@ #include "CoreMinimal.h" #include "GameFramework/Character.h" #include "the_twilight_abyss/BaseItems/Items/BaseItem.h" +#include "Camera/CameraComponent.h" +#include "Evaluation/MovieSceneCameraAnimTemplate.h" +#include "Kismet/KismetMathLibrary.h" #include "TempCharacter.generated.h" UCLASS() @@ -56,5 +59,16 @@ public: UFUNCTION(BlueprintCallable) void InputEnabler(); + + UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = "Camera") + UCameraComponent* ThisCamera; + + FVector OriginalCameraLocation; + FRotator OriginalCameraRotation; + + int OriginalCameraFOV; + + UFUNCTION(BlueprintCallable, Category= "Items") + void BuyItem(); }; From 6f28d139ac1dcf821036822596c72337e7281aeb Mon Sep 17 00:00:00 2001 From: MH261677 Date: Mon, 16 Jan 2023 20:44:47 +0000 Subject: [PATCH 38/43] Updated Interaction.cpp Created camera movement functions and updating input disabler functions --- .../MerchantInteraction/Interaction.cpp | 16 +++++++++++++--- .../MerchantInteraction/Interaction.h | 3 +++ 2 files changed, 16 insertions(+), 3 deletions(-) diff --git a/Source/the_twilight_abyss/MerchantInteraction/Interaction.cpp b/Source/the_twilight_abyss/MerchantInteraction/Interaction.cpp index b6f63ab..86044f6 100644 --- a/Source/the_twilight_abyss/MerchantInteraction/Interaction.cpp +++ b/Source/the_twilight_abyss/MerchantInteraction/Interaction.cpp @@ -8,7 +8,8 @@ #include "Components/Button.h" #include "GameFramework/Character.h" #include "Components/WidgetComponent.h" - +#include "Evaluation/MovieSceneCameraAnimTemplate.h" +#include "Kismet/KismetMathLibrary.h" // Sets default values @@ -34,6 +35,7 @@ void AInteraction::Tick(float DeltaTime) void AInteraction::OnInteract() { + bDisableShopDialMove = true; ShopDialogWidget = CreateWidget(GetWorld(), ShopDialog); if (ShopDialogWidget == nullptr) { @@ -96,7 +98,11 @@ void AInteraction::CameraLeftMover() } else { - UE_LOG(LogTemp, Display, TEXT("Camera functionality here in Interaction.cpp")); + FVector TargetLocation = FVector(1290, 530, 50); + FVector CameraLocation = MainCamera->GetComponentLocation(); + FRotator CameraRotation = UKismetMathLibrary::FindLookAtRotation(CameraLocation, TargetLocation); + MainCamera->SetWorldRotation(CameraRotation); + MainCamera->SetFieldOfView(40); } } } @@ -121,7 +127,11 @@ void AInteraction::CameraRightMover() } else { - UE_LOG(LogTemp, Display, TEXT("Camera functionality here in Interaction.cpp")); + FVector TargetLocation = FVector(470, 510, 80); + FVector CameraLocation = MainCamera->GetComponentLocation(); + FRotator CameraRotation = UKismetMathLibrary::FindLookAtRotation(CameraLocation, TargetLocation); + MainCamera->SetWorldRotation(CameraRotation); + MainCamera->SetFieldOfView(40); } } } diff --git a/Source/the_twilight_abyss/MerchantInteraction/Interaction.h b/Source/the_twilight_abyss/MerchantInteraction/Interaction.h index 4231b2a..fb771a9 100644 --- a/Source/the_twilight_abyss/MerchantInteraction/Interaction.h +++ b/Source/the_twilight_abyss/MerchantInteraction/Interaction.h @@ -46,6 +46,9 @@ public: UPROPERTY() bool bisDisabled = false; + UPROPERTY() + bool bDisableShopDialMove = false; + UFUNCTION(BlueprintCallable, Category= "ButtonLeft") virtual void CameraLeftMover(); From 6b131213a6d53f805b13c69cdcfa792ff5715e5b Mon Sep 17 00:00:00 2001 From: MH261677 Date: Mon, 16 Jan 2023 21:24:24 +0000 Subject: [PATCH 39/43] Created WBP_BuyBuff Created the buy screen for the buff jelly --- Content/Blueprints/Merchant/Merchant_UI/WBP_BuyBuff.uasset | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 Content/Blueprints/Merchant/Merchant_UI/WBP_BuyBuff.uasset diff --git a/Content/Blueprints/Merchant/Merchant_UI/WBP_BuyBuff.uasset b/Content/Blueprints/Merchant/Merchant_UI/WBP_BuyBuff.uasset new file mode 100644 index 0000000..d6f1fc3 --- /dev/null +++ b/Content/Blueprints/Merchant/Merchant_UI/WBP_BuyBuff.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:282af58ed1e390ad06a0fbb40278abff87c90331de1f1cc708033de67100bab4 +size 51768 From 355dd06aae586b83ac783343a5197d659f906f10 Mon Sep 17 00:00:00 2001 From: MH261677 Date: Mon, 16 Jan 2023 21:25:18 +0000 Subject: [PATCH 40/43] Updated BP_ShopSelector,WBP_BuyHealing Added it so when you click the arrows it swaps to the different widgets and made the widget remove from viewport --- .../Blueprints/Merchant/Merchant_UI/BP_ShopSelector.uasset | 4 ++-- Content/Blueprints/Merchant/Merchant_UI/WBP_BuyHealing.uasset | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Content/Blueprints/Merchant/Merchant_UI/BP_ShopSelector.uasset b/Content/Blueprints/Merchant/Merchant_UI/BP_ShopSelector.uasset index 976a05d..0c71209 100644 --- a/Content/Blueprints/Merchant/Merchant_UI/BP_ShopSelector.uasset +++ b/Content/Blueprints/Merchant/Merchant_UI/BP_ShopSelector.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:76ed9d24b439af10032d04bca6332b6c83c495437f91107a053567b3c292e7ce -size 63079 +oid sha256:22b2132cd76cdc49d851a897a8295bac996dd4b048ee16722f3747a0b0a0fd42 +size 68094 diff --git a/Content/Blueprints/Merchant/Merchant_UI/WBP_BuyHealing.uasset b/Content/Blueprints/Merchant/Merchant_UI/WBP_BuyHealing.uasset index e5b7da1..5420305 100644 --- a/Content/Blueprints/Merchant/Merchant_UI/WBP_BuyHealing.uasset +++ b/Content/Blueprints/Merchant/Merchant_UI/WBP_BuyHealing.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:18df7e579d921e01ef2e3bd23df885c9225828f21c914e0a92ad766b4e25a26a -size 42158 +oid sha256:4f15b92c944a3038b636058b7f8fb3a6573a2ec271c3a6a1670bb5b9541c9d7c +size 52018 From e15a7076c4811b4b4df9fe0b6a05320bd6f3591b Mon Sep 17 00:00:00 2001 From: MH261677 Date: Mon, 16 Jan 2023 21:25:54 +0000 Subject: [PATCH 41/43] Updated TempCharacter.cpp Fixed the tracedistance not defaulting back once the player exits the shop --- Source/the_twilight_abyss/PlayerTemp/TempCharacter.cpp | 1 + Source/the_twilight_abyss/PlayerTemp/TempCharacter.h | 5 +++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/Source/the_twilight_abyss/PlayerTemp/TempCharacter.cpp b/Source/the_twilight_abyss/PlayerTemp/TempCharacter.cpp index 2bec2af..813cc2e 100644 --- a/Source/the_twilight_abyss/PlayerTemp/TempCharacter.cpp +++ b/Source/the_twilight_abyss/PlayerTemp/TempCharacter.cpp @@ -150,6 +150,7 @@ void ATempCharacter::InputEnabler() GetWorld()->GetFirstPlayerController()->bShowMouseCursor = false; GetWorld()->GetFirstPlayerController()->bEnableClickEvents = false; GetWorld()->GetFirstPlayerController()->bEnableMouseOverEvents = false; + TraceDistance = 200; ThisCamera = Cast(this->FindComponentByClass()); if (ThisCamera == nullptr) { diff --git a/Source/the_twilight_abyss/PlayerTemp/TempCharacter.h b/Source/the_twilight_abyss/PlayerTemp/TempCharacter.h index 4cf0350..4300689 100644 --- a/Source/the_twilight_abyss/PlayerTemp/TempCharacter.h +++ b/Source/the_twilight_abyss/PlayerTemp/TempCharacter.h @@ -69,6 +69,7 @@ public: int OriginalCameraFOV; - UFUNCTION(BlueprintCallable, Category= "Items") - void BuyItem(); + UFUNCTION(BlueprintCallable, Category= "Items") + void BuyItem(); + }; From 084ad419c573caf92e8cf81f60e8b617c6f8f11e Mon Sep 17 00:00:00 2001 From: MH261677 Date: Mon, 16 Jan 2023 23:41:22 +0000 Subject: [PATCH 42/43] Updated TempCharacter.cpp Fixed double linetracing issue --- Content/Blueprints/Merchant/Merchant_UI/WBP_BuyBuff.uasset | 4 ++-- Source/the_twilight_abyss/PlayerTemp/TempCharacter.cpp | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/Content/Blueprints/Merchant/Merchant_UI/WBP_BuyBuff.uasset b/Content/Blueprints/Merchant/Merchant_UI/WBP_BuyBuff.uasset index d6f1fc3..3d3b44f 100644 --- a/Content/Blueprints/Merchant/Merchant_UI/WBP_BuyBuff.uasset +++ b/Content/Blueprints/Merchant/Merchant_UI/WBP_BuyBuff.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:282af58ed1e390ad06a0fbb40278abff87c90331de1f1cc708033de67100bab4 -size 51768 +oid sha256:8cc4e9151595d71a12c6f44c47b8f62ebb2687944cc124a6927fb8cddcf6a1fc +size 51431 diff --git a/Source/the_twilight_abyss/PlayerTemp/TempCharacter.cpp b/Source/the_twilight_abyss/PlayerTemp/TempCharacter.cpp index 813cc2e..4e29916 100644 --- a/Source/the_twilight_abyss/PlayerTemp/TempCharacter.cpp +++ b/Source/the_twilight_abyss/PlayerTemp/TempCharacter.cpp @@ -178,6 +178,7 @@ void ATempCharacter::UseItem(class UBaseItem* Item) void ATempCharacter::BuyItem() { + UE_LOG(LogTemp, Display, TEXT("BUY ITEM FIRING")); TraceDistance = 1000; LineTraceLogic(); } From e892260e322c91a2799f6e77a93952390816a942 Mon Sep 17 00:00:00 2001 From: MH261677 Date: Tue, 17 Jan 2023 01:22:38 +0000 Subject: [PATCH 43/43] Updated TempCharacter.cpp Changed ULOG in function LineTraceLogic --- Source/the_twilight_abyss/PlayerTemp/TempCharacter.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Source/the_twilight_abyss/PlayerTemp/TempCharacter.cpp b/Source/the_twilight_abyss/PlayerTemp/TempCharacter.cpp index 4e29916..c3ecbb5 100644 --- a/Source/the_twilight_abyss/PlayerTemp/TempCharacter.cpp +++ b/Source/the_twilight_abyss/PlayerTemp/TempCharacter.cpp @@ -64,7 +64,7 @@ void ATempCharacter::KeyPressed() // Line trace logic void ATempCharacter::LineTraceLogic() { - UE_LOG(LogTemp, Display, TEXT("LineTraceLogic firing")); + UE_LOG(LogTemp, Display, TEXT("LineTraceLogic activated")); float GlobalTrace = TraceDistance; FHitResult OutHit; ThisCamera = Cast(this->FindComponentByClass());