From faf37bce52920f948cf5f27828e6e2e3cba77893 Mon Sep 17 00:00:00 2001 From: PHILIP White Date: Tue, 17 Jan 2023 05:13:02 +0000 Subject: [PATCH] Bugfix Collisions on Tunnel Pathways Partially Corrected --- Content/Assets/Objects/Caves/Rock_tunnels_Curve.uasset | 4 ++-- Content/Assets/Objects/Caves/Rock_tunnels_Ramp.uasset | 4 ++-- Content/Assets/Objects/Caves/Rock_tunnels_Room.uasset | 4 ++-- Content/Levels/Top_layer_level.umap | 4 ++-- Source/the_twilight_abyss/MerchantInteraction/Interaction.cpp | 3 +-- Source/the_twilight_abyss/PlayerTemp/TempCharacter.h | 1 - the_twilight_abyss.uproject | 2 +- 7 files changed, 10 insertions(+), 12 deletions(-) diff --git a/Content/Assets/Objects/Caves/Rock_tunnels_Curve.uasset b/Content/Assets/Objects/Caves/Rock_tunnels_Curve.uasset index 959652c..8cda3bf 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:8cadd3fe4e5d153aee3522f30d3eec32ead44ae7cdc609e93a21db3b3595bc76 -size 120871 +oid sha256:8cd29ae40981ceaba710b20fad34949f80b56e1c527695ea08c2489180a0bac8 +size 123649 diff --git a/Content/Assets/Objects/Caves/Rock_tunnels_Ramp.uasset b/Content/Assets/Objects/Caves/Rock_tunnels_Ramp.uasset index 1837df3..640dd03 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:8ec0636d0a97338b8e0daecd5f6219a8e0067d967614f09032e1d8d83362048a -size 55055 +oid sha256:fc269b1130a30e0041f6849c8d4c063ce818ae4db2e0a56ee34a68f2a58715ae +size 55058 diff --git a/Content/Assets/Objects/Caves/Rock_tunnels_Room.uasset b/Content/Assets/Objects/Caves/Rock_tunnels_Room.uasset index ef411bd..d393e25 100644 --- a/Content/Assets/Objects/Caves/Rock_tunnels_Room.uasset +++ b/Content/Assets/Objects/Caves/Rock_tunnels_Room.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:455ddc59555edf29e90ce6eabf4a6de3d40d206daa080d50b162d89631bcd264 -size 113673 +oid sha256:c71baf06575728c718f8b4312c958820131b78f951abc975db9705fa798a40a2 +size 113008 diff --git a/Content/Levels/Top_layer_level.umap b/Content/Levels/Top_layer_level.umap index 91a5b8f..9051e07 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:7b0f0c0493cb4d49229e3ac0727d2a1608d4273cbd6a329e7c1934412a66e6cb -size 125869 +oid sha256:c381a5877c6e7b582983cb02e356a4c4e6e8ab6c46515d35ff0f45e0b0719109 +size 124099 diff --git a/Source/the_twilight_abyss/MerchantInteraction/Interaction.cpp b/Source/the_twilight_abyss/MerchantInteraction/Interaction.cpp index 071d2b5..192d23c 100644 --- a/Source/the_twilight_abyss/MerchantInteraction/Interaction.cpp +++ b/Source/the_twilight_abyss/MerchantInteraction/Interaction.cpp @@ -8,7 +8,6 @@ #include "Components/Button.h" #include "GameFramework/Character.h" #include "Components/WidgetComponent.h" -#include "Evaluation/MovieSceneCameraAnimTemplate.h" #include "Kismet/KismetMathLibrary.h" @@ -57,7 +56,7 @@ void AInteraction::RemoveWidget() ShopDialogWidget->RemoveFromViewport(); UE_LOG(LogTemp, Display, TEXT("setting isDisabled to true")); ItemSelectorWidget = CreateWidget(GetWorld(), ItemSelector); - UProperty* Property = ItemSelectorWidget->GetClass()->FindPropertyByName("publicActor"); + FProperty* Property = ItemSelectorWidget->GetClass()->FindPropertyByName("publicActor"); if (Property == nullptr) { UE_LOG(LogTemp, Error, TEXT("Property not found")); diff --git a/Source/the_twilight_abyss/PlayerTemp/TempCharacter.h b/Source/the_twilight_abyss/PlayerTemp/TempCharacter.h index 66b27db..052239c 100644 --- a/Source/the_twilight_abyss/PlayerTemp/TempCharacter.h +++ b/Source/the_twilight_abyss/PlayerTemp/TempCharacter.h @@ -6,7 +6,6 @@ #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" diff --git a/the_twilight_abyss.uproject b/the_twilight_abyss.uproject index 73e857f..4f33989 100644 --- a/the_twilight_abyss.uproject +++ b/the_twilight_abyss.uproject @@ -1,6 +1,6 @@ { "FileVersion": 3, - "EngineAssociation": "5.1", + "EngineAssociation": "5.0", "Category": "", "Description": "", "Modules": [