diff --git a/Config/DefaultEngine.ini b/Config/DefaultEngine.ini index 9c747bb..856425d 100644 --- a/Config/DefaultEngine.ini +++ b/Config/DefaultEngine.ini @@ -54,7 +54,7 @@ r.DefaultFeature.AutoExposure=False r.AntiAliasingMethod=3 r.Mobile.AntiAliasing=3 r.ForwardShading=True -r.DefaultFeature.LightUnits=3 +r.DefaultFeature.LightUnits=2 r.MSAACount=4 r.DefaultFeature.LensFlare=False r.ReflectionCaptureResolution=128 @@ -72,6 +72,10 @@ r.DefaultFeature.AmbientOcclusionStaticFraction=True r.DefaultFeature.AmbientOcclusion=True r.AllowOcclusionQueries=True vr.RoundRobinOcclusion=False +r.DefaultFeature.AutoExposure.Method=2 +r.DefaultFeature.AutoExposure.Bias=0.100000 +r.Substrate=False +r.CustomDepthTemporalAAJitter=False [/Script/WorldPartitionEditor.WorldPartitionEditorSettings] CommandletClass=Class'/Script/UnrealEd.WorldPartitionConvertCommandlet' diff --git a/Content/Blueprints/Items/BP_BookOfFear.uasset b/Content/Blueprints/Items/BP_BookOfFear.uasset index 1931982..7ed421c 100644 Binary files a/Content/Blueprints/Items/BP_BookOfFear.uasset and b/Content/Blueprints/Items/BP_BookOfFear.uasset differ diff --git a/Content/Blueprints/Items/BP_CompanionCube.uasset b/Content/Blueprints/Items/BP_CompanionCube.uasset new file mode 100644 index 0000000..b8610db --- /dev/null +++ b/Content/Blueprints/Items/BP_CompanionCube.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:2b9660bb6e1de93ac49a75a29779ac8bbac2f4230b1aec0f7eca4604a8f79467 +size 23557 diff --git a/Content/Blueprints/Items/BP_PictureMalevic.uasset b/Content/Blueprints/Items/BP_PictureMalevic.uasset new file mode 100644 index 0000000..60cc27e --- /dev/null +++ b/Content/Blueprints/Items/BP_PictureMalevic.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:cdfd454f77d4a73d60223d4660daf1aa1a111884df625bafe20adbb144b7d21a +size 30072 diff --git a/Content/Blueprints/Minigames/AgeOfWar/BP_Minigame_AgeOfWar.uasset b/Content/Blueprints/Minigames/AgeOfWar/BP_Minigame_AgeOfWar.uasset index 8a5cdf5..9146144 100644 --- a/Content/Blueprints/Minigames/AgeOfWar/BP_Minigame_AgeOfWar.uasset +++ b/Content/Blueprints/Minigames/AgeOfWar/BP_Minigame_AgeOfWar.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:921cf84b1441404bc14b1def272a6ffcb75a515f2f3a45facbff5966a7fcb3f8 -size 22822 +oid sha256:f824f9463511401dd695e86e2d6552cd74f848042adb901442355d379a3e6015 +size 20104 diff --git a/Content/Levels/Level_3/Actors/BP_Level3_LayersOfFearRoom_Cupboard.uasset b/Content/Levels/Level_3/Actors/BP_Level3_LayersOfFearRoom_Cupboard.uasset new file mode 100644 index 0000000..da60e3e --- /dev/null +++ b/Content/Levels/Level_3/Actors/BP_Level3_LayersOfFearRoom_Cupboard.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b95caa307e8e06510f268d0b2e0db0bc5fb36095d29de8f4b290afcd63aa3f51 +size 49176 diff --git a/Content/Levels/Level_3/Actors/BP_Level3_PortalRoom_PressurePlate.uasset b/Content/Levels/Level_3/Actors/BP_Level3_PortalRoom_PressurePlate.uasset new file mode 100644 index 0000000..ea0f110 --- /dev/null +++ b/Content/Levels/Level_3/Actors/BP_Level3_PortalRoom_PressurePlate.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f260d1b3510980ff5d8c2402947509052994140a1f7c32a92f15ddc7dbb53b68 +size 45344 diff --git a/Content/Levels/Level_3/Actors/BP_Level3_StartRoom_EndButton.uasset b/Content/Levels/Level_3/Actors/BP_Level3_StartRoom_EndButton.uasset new file mode 100644 index 0000000..afca338 --- /dev/null +++ b/Content/Levels/Level_3/Actors/BP_Level3_StartRoom_EndButton.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ca3344df52f75daa1ae69b8efd7ff5fb83fc617e1e4e714788109e30e22b0d25 +size 33294 diff --git a/Content/Levels/Level_3/Actors/BP_Level3_WitnessRoom_Button.uasset b/Content/Levels/Level_3/Actors/BP_Level3_WitnessRoom_Button.uasset new file mode 100644 index 0000000..5e25747 --- /dev/null +++ b/Content/Levels/Level_3/Actors/BP_Level3_WitnessRoom_Button.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:41b776e42c758565e0aaf72f63fb88063192d2afdba05ecd2f60056212724a1c +size 32867 diff --git a/Content/Levels/Level_3/BP_Level3_PortalRoom_PressurePlate.uasset b/Content/Levels/Level_3/BP_Level3_PortalRoom_PressurePlate.uasset new file mode 100644 index 0000000..e92349b --- /dev/null +++ b/Content/Levels/Level_3/BP_Level3_PortalRoom_PressurePlate.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:21cde5f846552e8fdd4b62582ab3960d0615a2fff38939788661ddfabad3497b +size 2908 diff --git a/Content/Levels/Level_3/L_Level3.umap b/Content/Levels/Level_3/L_Level3.umap new file mode 100644 index 0000000..5d74411 --- /dev/null +++ b/Content/Levels/Level_3/L_Level3.umap @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:414cead8bfc77a8f33e8d2d962f4f85c9c8b6fb0a40ace79418af8e4a158bc43 +size 362220 diff --git a/Content/Levels/Level_3/L_Level3_BuiltData.uasset b/Content/Levels/Level_3/L_Level3_BuiltData.uasset new file mode 100644 index 0000000..62a84ce --- /dev/null +++ b/Content/Levels/Level_3/L_Level3_BuiltData.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ad121afb8318660a558bedaaaab5004d161fffa7c13d13660e70229d7ec2e53d +size 747352 diff --git a/Content/Levels/Level_3/Sequences/Seq_Level3_PuzzlePortal_Platform.uasset b/Content/Levels/Level_3/Sequences/Seq_Level3_PuzzlePortal_Platform.uasset new file mode 100644 index 0000000..941d61b --- /dev/null +++ b/Content/Levels/Level_3/Sequences/Seq_Level3_PuzzlePortal_Platform.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:6d4498d20d6167ed9b94b6d069f693eca450419fb3de85047d8e5b660fe8282d +size 17354 diff --git a/Content/Levels/Test/L_Test.umap b/Content/Levels/Test/L_Test.umap index 2047a7e..4c263d1 100644 --- a/Content/Levels/Test/L_Test.umap +++ b/Content/Levels/Test/L_Test.umap @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:2473597e7884c3270ca415b3cf766d35d22e50dc6040f6ba2800ba71af84d973 -size 2253453 +oid sha256:32b529a688497fb905320d7415fb5723f585eb0cd18469f113ecae2c3d12e046 +size 2253739 diff --git a/Content/MaterialsLibrary/Colors/M_Color_Black.uasset b/Content/MaterialsLibrary/Colors/M_Color_Black.uasset index 99a4cd8..a80343b 100644 --- a/Content/MaterialsLibrary/Colors/M_Color_Black.uasset +++ b/Content/MaterialsLibrary/Colors/M_Color_Black.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:fa7a5ec6523e19394f0effda03b11c19f3727592f8dd2fe1206846e6b224248e -size 10812 +oid sha256:7d419a5fc003a9cc163bbd097eb1408b03c2f95ca39d3a2fbbb9be71c02cae23 +size 10394 diff --git a/Content/MaterialsLibrary/M_CompanionCube.uasset b/Content/MaterialsLibrary/M_CompanionCube.uasset index 1ffe246..e212b51 100644 --- a/Content/MaterialsLibrary/M_CompanionCube.uasset +++ b/Content/MaterialsLibrary/M_CompanionCube.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:da0ea86d274eece08ac0a48f4f70c6e697f588b250833e2c8c4be13b37d075eb -size 15415 +oid sha256:2261425f3f32fecbd18853edaff8baa767133e5d249bfb49c5b4fa6a29ae93a7 +size 17822 diff --git a/Content/Misc/Interactables/M_InteractableScreencapturerPP.uasset b/Content/Misc/Interactables/M_InteractableScreencapturerPP.uasset index 4bf45b5..3608928 100644 --- a/Content/Misc/Interactables/M_InteractableScreencapturerPP.uasset +++ b/Content/Misc/Interactables/M_InteractableScreencapturerPP.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:69deb8bbc592f03981df8b752f29e5aa9ece43500ff2dc928c22fc13e38fbe99 -size 21793 +oid sha256:aaf1a13873ce99ce917cf37af293ddcf0001ed38d483600545d1ac87726fb754 +size 22666 diff --git a/Content/Models/GrayBoxes/SM_WallDoorBig.uasset b/Content/Models/GrayBoxes/SM_WallDoorBig.uasset index 8ce1625..ea22207 100644 --- a/Content/Models/GrayBoxes/SM_WallDoorBig.uasset +++ b/Content/Models/GrayBoxes/SM_WallDoorBig.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3b516457d216311bad22c7cdd842e6d7ebde3a94572c4dccb02c68c3b0defa92 -size 18660 +oid sha256:8dc626d725332e6ec45d62bfb3f03df22304d92681f62fc0ab98993ce26ac738 +size 19078 diff --git a/Plugins/FMODStudio/Binaries/Win64/UnrealEditor.modules b/Plugins/FMODStudio/Binaries/Win64/UnrealEditor.modules index 36d9568..e21c6fa 100644 --- a/Plugins/FMODStudio/Binaries/Win64/UnrealEditor.modules +++ b/Plugins/FMODStudio/Binaries/Win64/UnrealEditor.modules @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:30f8195fc56588656454b97b3781e8953a79ddd97bef5560bd45dfa65058a047 -size 168 +oid sha256:4c1ef8b0abfa9c027ee2413c6f4ce856664a5674a700e4a60a4038ab85c5dd67 +size 158 diff --git a/Plugins/FMODStudioNiagara/Binaries/Win64/UnrealEditor.modules b/Plugins/FMODStudioNiagara/Binaries/Win64/UnrealEditor.modules index 1ba0274..bab1c38 100644 --- a/Plugins/FMODStudioNiagara/Binaries/Win64/UnrealEditor.modules +++ b/Plugins/FMODStudioNiagara/Binaries/Win64/UnrealEditor.modules @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:5acd55d51b24ded019ebe189677b8e00c89c54d0ad9a383122e0228052235427 -size 117 +oid sha256:a8b8269f1aae9783c4984fdf4c86ec1046e6f258803e9d5d81a3c1aacc61e955 +size 112 diff --git a/Source/Lost_Edge/Private/Interactable/Activators/InteractableScreenCapturer.cpp b/Source/Lost_Edge/Private/Interactable/Activators/InteractableScreenCapturer.cpp index 5f37b19..ea2fd42 100644 --- a/Source/Lost_Edge/Private/Interactable/Activators/InteractableScreenCapturer.cpp +++ b/Source/Lost_Edge/Private/Interactable/Activators/InteractableScreenCapturer.cpp @@ -284,5 +284,5 @@ void UInteractableScreenCapturer::Process() running = false; } ); - } - } \ No newline at end of file + } +} \ No newline at end of file diff --git a/Source/Lost_Edge/Private/Interactable/Interactable.cpp b/Source/Lost_Edge/Private/Interactable/Interactable.cpp index 8538c3e..832cae8 100644 --- a/Source/Lost_Edge/Private/Interactable/Interactable.cpp +++ b/Source/Lost_Edge/Private/Interactable/Interactable.cpp @@ -81,6 +81,17 @@ void AInteractable::BeginPlay() player = Cast(PC->GetPawn()); } +void AInteractable::EndPlay(const EEndPlayReason::Type EndPlayReason) +{ + if(activated) + { + activationLockers.Empty(); + _Deactivate(static_cast(activated)); + } + + Super::EndPlay(EndPlayReason); +} + void AInteractable::_Activate(EActivatorType type) { #ifdef INTERACTABLE_DEBUG diff --git a/Source/Lost_Edge/Private/Interactable/Interactable.h b/Source/Lost_Edge/Private/Interactable/Interactable.h index b5052be..33d4358 100644 --- a/Source/Lost_Edge/Private/Interactable/Interactable.h +++ b/Source/Lost_Edge/Private/Interactable/Interactable.h @@ -49,10 +49,12 @@ public: protected: virtual void BeginPlay() override; + virtual void EndPlay(const EEndPlayReason::Type EndPlayReason) override; UPROPERTY(EditAnywhere, BlueprintReadWrite, meta = (Bitmask, BitmaskEnum = "EActivatorType")) int32 activated = 0; + UPROPERTY() TMap modificators; class APlayerBase* player = nullptr; diff --git a/Source/Lost_Edge/Private/Levels/LevelBase.cpp b/Source/Lost_Edge/Private/Levels/LevelBase.cpp index 10acc8f..9686572 100644 --- a/Source/Lost_Edge/Private/Levels/LevelBase.cpp +++ b/Source/Lost_Edge/Private/Levels/LevelBase.cpp @@ -3,8 +3,11 @@ #include "LevelBase.h" +#include "Engine/StaticMesh.h" +#include "Engine/StaticMeshActor.h" #include "EngineUtils.h" #include "InputMappingContext.h" +#include "Kismet/GameplayStatics.h" #include "LevelSequencePlayer.h" #include "CommonFunctions.h" @@ -36,6 +39,19 @@ void ALevelBase::BeginPlay() BroadcastNewLevelBeginPlay(); StartLevelAnimations(); ApplySaveData(); + + // workaround for forward shading renderer skipping meshes without custom depth, + // so custom objects are visible through obstacles + TArray actors; + UGameplayStatics::GetAllActorsOfClass(GetWorld(), AStaticMeshActor::StaticClass(), actors); + for(auto actor : actors) + { + if(!actor) + continue; + auto mesh = reinterpret_cast(actor)->GetStaticMeshComponent(); + if(!mesh->bRenderCustomDepth) + mesh->SetRenderCustomDepth(true); + } } void ALevelBase::IterateToState(int32 to) diff --git a/Source/Lost_Edge/Private/MainGameModeBase.cpp b/Source/Lost_Edge/Private/MainGameModeBase.cpp index 1e8056c..5517836 100644 --- a/Source/Lost_Edge/Private/MainGameModeBase.cpp +++ b/Source/Lost_Edge/Private/MainGameModeBase.cpp @@ -16,20 +16,20 @@ #include "QuickTimeEvent.h" #include "Widgets/WidgetsManager.h" +AMainGameModeBase* AMainGameModeBase::_instance = nullptr; TStrongObjectPtr AMainGameModeBase::_widgetsManager = nullptr; TStrongObjectPtr AMainGameModeBase::_cutsceneManager = nullptr; TStrongObjectPtr AMainGameModeBase::_quickTimeEventManager = nullptr; TStrongObjectPtr AMainGameModeBase::_dialogueManager = nullptr; -TStrongObjectPtr AMainGameModeBase::_questManager = nullptr; TStrongObjectPtr AMainGameModeBase::leadLevel = nullptr; void AMainGameModeBase::StartPlay() { + _instance = this; _widgetsManager = TStrongObjectPtr{ NewObject(this, widgetManagerClass) }; _cutsceneManager = TStrongObjectPtr{ NewObject(this) }; _quickTimeEventManager = TStrongObjectPtr{ NewObject(this) }; _dialogueManager = TStrongObjectPtr{ NewObject(this) }; - _questManager = TStrongObjectPtr{ NewObject(this) }; AGameModeBase::StartPlay(); @@ -90,6 +90,12 @@ void AMainGameModeBase::CallLevelEvent(int32 id) leadLevel->CallEvent(id); } +void AMainGameModeBase::UpdateQuests(TArray items) +{ + if(_instance && _instance->questsUpdateDelegate.IsBound()) + _instance->questsUpdateDelegate.Broadcast(items); +} + void AMainGameModeBase::SwitchCameraMode() { static TWeakObjectPtr _playerPawn = nullptr; diff --git a/Source/Lost_Edge/Private/MainGameModeBase.h b/Source/Lost_Edge/Private/MainGameModeBase.h index 80d0661..4aee14b 100644 --- a/Source/Lost_Edge/Private/MainGameModeBase.h +++ b/Source/Lost_Edge/Private/MainGameModeBase.h @@ -32,6 +32,9 @@ public: UFUNCTION(BlueprintCallable) static void CallLevelEvent(int32 id); + UFUNCTION(BlueprintCallable) + static void UpdateQuests(TArray items); + void SwitchCameraMode(); static TStrongObjectPtr leadLevel; @@ -43,9 +46,9 @@ protected: TSubclassOf widgetManagerClass; private: + static AMainGameModeBase* _instance; static TStrongObjectPtr _widgetsManager; static TStrongObjectPtr _cutsceneManager; static TStrongObjectPtr _quickTimeEventManager; static TStrongObjectPtr _dialogueManager; - static TStrongObjectPtr _questManager; }; diff --git a/Source/Lost_Edge/Private/Minigame/CrossyRoad/CrossyRoadManager.cpp b/Source/Lost_Edge/Private/Minigame/CrossyRoad/CrossyRoadManager.cpp index 050a08e..1c6a8e7 100644 --- a/Source/Lost_Edge/Private/Minigame/CrossyRoad/CrossyRoadManager.cpp +++ b/Source/Lost_Edge/Private/Minigame/CrossyRoad/CrossyRoadManager.cpp @@ -70,7 +70,7 @@ void ACrossyRoadManager::End() PrimaryActorTick.SetTickFunctionEnable(false); for(int32 handler : inputHandlers) - player->inputComponent->RemoveActionBindingForHandle(handler); + player->inputComponent->RemoveBindingByHandle(handler); player->UnlockPlayer(FPlayerLock::All()); player->ReturnPlayerView(); @@ -196,9 +196,6 @@ void ACrossyRoadManager::RotateLine(USplineComponent* line) void ACrossyRoadManager::Up() { - if(ended) - return; - auto line = lines[0]; auto diffY = lines[0]->GetComponentLocation().Y - lines[1]->GetComponentLocation().Y; for(int32 i = 1; i < lines.Num(); ++i) @@ -222,7 +219,7 @@ void ACrossyRoadManager::Down() void ACrossyRoadManager::Left() { - if(ended || playerLineTime >= 1.0f) + if(playerLineTime >= 1.0f) return; playerLineTime += 0.1f; @@ -237,7 +234,7 @@ void ACrossyRoadManager::Left() void ACrossyRoadManager::Right() { - if(ended || playerLineTime <= 0.0f) + if(playerLineTime <= 0.0f) return; playerLineTime -= 0.1f; diff --git a/Source/Lost_Edge/Private/Minigame/SubwaySurf/SubwaySurfManager.cpp b/Source/Lost_Edge/Private/Minigame/SubwaySurf/SubwaySurfManager.cpp index 2350786..16b8f00 100644 --- a/Source/Lost_Edge/Private/Minigame/SubwaySurf/SubwaySurfManager.cpp +++ b/Source/Lost_Edge/Private/Minigame/SubwaySurf/SubwaySurfManager.cpp @@ -66,7 +66,7 @@ void ASubwaySurfManager::End() PrimaryActorTick.SetTickFunctionEnable(false); for(int32 handler : inputHandlers) - player->inputComponent->RemoveActionBindingForHandle(handler); + player->inputComponent->RemoveBindingByHandle(handler); player->UnlockPlayer(FPlayerLock::All()); player->ReturnPlayerView(); diff --git a/Source/Lost_Edge/Private/PlayerBase.cpp b/Source/Lost_Edge/Private/PlayerBase.cpp index a4b058b..d46bbb3 100644 --- a/Source/Lost_Edge/Private/PlayerBase.cpp +++ b/Source/Lost_Edge/Private/PlayerBase.cpp @@ -274,7 +274,7 @@ void APlayerBase::InteractableActivated(AInteractable* interactable, EActivatorT if(!interactable) return; - if(interactionLocked) + if(interactionLocked || interactable->IsHidden()) return; interactable->_Activate(type); diff --git a/Source/Lost_Edge/Private/QuestManager.cpp b/Source/Lost_Edge/Private/QuestManager.cpp index e02000e..3daabd8 100644 --- a/Source/Lost_Edge/Private/QuestManager.cpp +++ b/Source/Lost_Edge/Private/QuestManager.cpp @@ -9,18 +9,18 @@ #include "MainGameModeBase.h" #include "Widgets/WidgetsManager.h" -UQuestManager::UQuestManager() +void AQuestManager::BeginPlay() { if(auto gamemode_base = UGameplayStatics::GetGameMode(GetWorld())) { if(auto gamemode = Cast(gamemode_base)) { - //gamemode->questsUpdateDelegate.AddDynamic(this, &UQuestManager::Update); + gamemode->questsUpdateDelegate.AddDynamic(this, &AQuestManager::Update); } } } -void UQuestManager::Update(TArray quests) +void AQuestManager::Update(TArray quests) { if(auto WM = AMainGameModeBase::GetWidgetsManager()) WM->UpdateJournal(quests); diff --git a/Source/Lost_Edge/Private/QuestManager.h b/Source/Lost_Edge/Private/QuestManager.h index 005ec18..678dda8 100644 --- a/Source/Lost_Edge/Private/QuestManager.h +++ b/Source/Lost_Edge/Private/QuestManager.h @@ -2,19 +2,22 @@ #pragma once -#include "UObject/Object.h" +#include "GameFramework/Actor.h" #include "QuestManager.generated.h" -UCLASS(BlueprintType) -class UQuestManager : public UObject +UCLASS(Blueprintable, BlueprintType) +class AQuestManager : public AActor { GENERATED_BODY() public: - UQuestManager(); + protected: + virtual void BeginPlay() override; + + UFUNCTION() void Update(TArray quests); }; diff --git a/Source/Lost_Edge/Private/Widgets/InteractableHintWidgetManager.cpp b/Source/Lost_Edge/Private/Widgets/InteractableHintWidgetManager.cpp index 9f4520d..0e3a7ce 100644 --- a/Source/Lost_Edge/Private/Widgets/InteractableHintWidgetManager.cpp +++ b/Source/Lost_Edge/Private/Widgets/InteractableHintWidgetManager.cpp @@ -17,13 +17,13 @@ void UInteractableHintWidgetManager::Append(const UInteractableModificator* modi { FScopeLock Lock(&hintsLock); - if(!IsValid(modificator)) + if(!modificator) { hints->SetVisibility(ESlateVisibility::Visible); return; } - if(hintsMap.Contains(modificator)) + if(hintsMap.Contains(modificator) || !modificator->GetMappingContext()) return; const auto& mappings = modificator->GetMappingContext()->GetMappings(); @@ -57,7 +57,7 @@ void UInteractableHintWidgetManager::Remove(const UInteractableModificator* modi { FScopeLock Lock(&hintsLock); - if(!IsValid(modificator)) + if(!modificator) { hints->SetVisibility(ESlateVisibility::Hidden); return; diff --git a/Source/Lost_Edge/Private/Widgets/WidgetsManager.cpp b/Source/Lost_Edge/Private/Widgets/WidgetsManager.cpp index 53bfa79..9921317 100644 --- a/Source/Lost_Edge/Private/Widgets/WidgetsManager.cpp +++ b/Source/Lost_Edge/Private/Widgets/WidgetsManager.cpp @@ -255,4 +255,5 @@ void UWidgetsManager::ShowJournal() void UWidgetsManager::UpdateJournal(TArray text) { journalWidget->Update(text); + ShowJournal(); }