diff --git a/Content/Misc/ImportTest/Build/pakchunk100-Windows.pak b/Content/Misc/ImportTest/Build/pakchunk100-Windows.pak index 2f77b5d..b9a4593 100644 Binary files a/Content/Misc/ImportTest/Build/pakchunk100-Windows.pak and b/Content/Misc/ImportTest/Build/pakchunk100-Windows.pak differ diff --git a/Content/Misc/ImportTest/DA_ImportTest.uasset b/Content/Misc/ImportTest/DA_ImportTest.uasset index 4dd8f34..a2e2dcc 100644 Binary files a/Content/Misc/ImportTest/DA_ImportTest.uasset and b/Content/Misc/ImportTest/DA_ImportTest.uasset differ diff --git a/Content/Misc/Interactables/T_InteractableScreencapturerDebugInput.uasset b/Content/Misc/Interactables/T_InteractableScreencapturerDebugInput.uasset index 7c5c7bb..79aa70b 100644 Binary files a/Content/Misc/Interactables/T_InteractableScreencapturerDebugInput.uasset and b/Content/Misc/Interactables/T_InteractableScreencapturerDebugInput.uasset differ diff --git a/Content/Misc/Interactables/T_InteractableScreencapturerDebugOutput.uasset b/Content/Misc/Interactables/T_InteractableScreencapturerDebugOutput.uasset index 12a85ce..d4d9d3e 100644 Binary files a/Content/Misc/Interactables/T_InteractableScreencapturerDebugOutput.uasset and b/Content/Misc/Interactables/T_InteractableScreencapturerDebugOutput.uasset differ diff --git a/Content/Splash/EdSplash.bmp b/Content/Splash/EdSplash.bmp index 550f9fd..dcd69b8 100644 Binary files a/Content/Splash/EdSplash.bmp and b/Content/Splash/EdSplash.bmp differ diff --git a/Content/Splash/Splash.bmp b/Content/Splash/Splash.bmp index 914b257..434c732 100644 Binary files a/Content/Splash/Splash.bmp and b/Content/Splash/Splash.bmp differ diff --git a/Content/UI/Blueprints/Dialogues/UI_DialogueManager.uasset b/Content/UI/Blueprints/Dialogues/UI_DialogueManager.uasset index 84445e2..dafbde9 100644 Binary files a/Content/UI/Blueprints/Dialogues/UI_DialogueManager.uasset and b/Content/UI/Blueprints/Dialogues/UI_DialogueManager.uasset differ diff --git a/Content/UI/Blueprints/Dialogues/UI_DialogueRow.uasset b/Content/UI/Blueprints/Dialogues/UI_DialogueRow.uasset index da010bf..16d046a 100644 Binary files a/Content/UI/Blueprints/Dialogues/UI_DialogueRow.uasset and b/Content/UI/Blueprints/Dialogues/UI_DialogueRow.uasset differ diff --git a/Content/UI/Blueprints/Dialogues/UI_DialogueSkip.uasset b/Content/UI/Blueprints/Dialogues/UI_DialogueSkip.uasset index 637e3ce..ff9a36d 100644 Binary files a/Content/UI/Blueprints/Dialogues/UI_DialogueSkip.uasset and b/Content/UI/Blueprints/Dialogues/UI_DialogueSkip.uasset differ diff --git a/Content/UI/Blueprints/Interactables/UI_InteractableHintManager.uasset b/Content/UI/Blueprints/Interactables/UI_InteractableHintManager.uasset index 15a99d5..7ad744c 100644 Binary files a/Content/UI/Blueprints/Interactables/UI_InteractableHintManager.uasset and b/Content/UI/Blueprints/Interactables/UI_InteractableHintManager.uasset differ diff --git a/Content/UI/Blueprints/Overlays/UI_DevelopBuildWarning.uasset b/Content/UI/Blueprints/Overlays/UI_DevelopBuildWarning.uasset index 30775c1..635ea81 100644 Binary files a/Content/UI/Blueprints/Overlays/UI_DevelopBuildWarning.uasset and b/Content/UI/Blueprints/Overlays/UI_DevelopBuildWarning.uasset differ diff --git a/Content/UI/Blueprints/UI_CutsceneSkip.uasset b/Content/UI/Blueprints/UI_CutsceneSkip.uasset index b6205c5..3ad1e04 100644 Binary files a/Content/UI/Blueprints/UI_CutsceneSkip.uasset and b/Content/UI/Blueprints/UI_CutsceneSkip.uasset differ diff --git a/Content/UI/Blueprints/UI_Inventory.uasset b/Content/UI/Blueprints/UI_Inventory.uasset index 8a64754..6b96804 100644 Binary files a/Content/UI/Blueprints/UI_Inventory.uasset and b/Content/UI/Blueprints/UI_Inventory.uasset differ diff --git a/Content/UI/Materials/MM_Diagonal.uasset b/Content/UI/Materials/MM_Diagonal.uasset index 59377b6..eb8fc15 100644 Binary files a/Content/UI/Materials/MM_Diagonal.uasset and b/Content/UI/Materials/MM_Diagonal.uasset differ diff --git a/Content/UI/Materials/MM_Diagonal_2.uasset b/Content/UI/Materials/MM_Diagonal_2.uasset index 44e2c9e..103da24 100644 Binary files a/Content/UI/Materials/MM_Diagonal_2.uasset and b/Content/UI/Materials/MM_Diagonal_2.uasset differ diff --git a/Content/UI/Materials/MM_GradientLeft.uasset b/Content/UI/Materials/MM_GradientLeft.uasset index a3a0c02..7455cb8 100644 Binary files a/Content/UI/Materials/MM_GradientLeft.uasset and b/Content/UI/Materials/MM_GradientLeft.uasset differ diff --git a/Content/UI/Materials/MM_GradientLeftNegative.uasset b/Content/UI/Materials/MM_GradientLeftNegative.uasset index a130d2d..ed0e66d 100644 Binary files a/Content/UI/Materials/MM_GradientLeftNegative.uasset and b/Content/UI/Materials/MM_GradientLeftNegative.uasset differ diff --git a/Content/UI/Materials/MM_GradientTop.uasset b/Content/UI/Materials/MM_GradientTop.uasset index 0e1362d..21b2bbd 100644 Binary files a/Content/UI/Materials/MM_GradientTop.uasset and b/Content/UI/Materials/MM_GradientTop.uasset differ diff --git a/Content/UI/Materials/MM_GradientTopBig.uasset b/Content/UI/Materials/MM_GradientTopBig.uasset index 80673cb..1f07479 100644 Binary files a/Content/UI/Materials/MM_GradientTopBig.uasset and b/Content/UI/Materials/MM_GradientTopBig.uasset differ diff --git a/Content/UI/Materials/MM_GradientTopNegative.uasset b/Content/UI/Materials/MM_GradientTopNegative.uasset index 7f2f603..7665327 100644 Binary files a/Content/UI/Materials/MM_GradientTopNegative.uasset and b/Content/UI/Materials/MM_GradientTopNegative.uasset differ diff --git a/Content/UI/Materials/MM_LineTopBottom.uasset b/Content/UI/Materials/MM_LineTopBottom.uasset index 8b9242c..d0dc4a2 100644 Binary files a/Content/UI/Materials/MM_LineTopBottom.uasset and b/Content/UI/Materials/MM_LineTopBottom.uasset differ diff --git a/Content/UI/Materials/MM_RoundSquare.uasset b/Content/UI/Materials/MM_RoundSquare.uasset index 358e000..f3e9021 100644 Binary files a/Content/UI/Materials/MM_RoundSquare.uasset and b/Content/UI/Materials/MM_RoundSquare.uasset differ diff --git a/Source/Lost_Edge/Private/Interactable/Modificators/MoveInteractableModificator.cpp b/Source/Lost_Edge/Private/Interactable/Modificators/MoveInteractableModificator.cpp index a081215..5aef7c9 100644 --- a/Source/Lost_Edge/Private/Interactable/Modificators/MoveInteractableModificator.cpp +++ b/Source/Lost_Edge/Private/Interactable/Modificators/MoveInteractableModificator.cpp @@ -97,6 +97,7 @@ void UMoveInteractableModificator::Unbind_Implementation() void UMoveInteractableModificator::TurnOnHolding() { + FScopeLock lock1(&critical); holding = true; ProcessState(); distance = (player->GetCameraLocation() - actor->GetActorLocation()).Length(); @@ -105,6 +106,7 @@ void UMoveInteractableModificator::TurnOnHolding() } void UMoveInteractableModificator::TurnOffHolding() { + FScopeLock lock1(&critical); holding = false; ProcessState(); AMainGameModeBase::GetWidgetsManager()->AnimateInteractionHint(this, 0, EInputAnimatedWidgetAnimation::Unhold); @@ -112,6 +114,7 @@ void UMoveInteractableModificator::TurnOffHolding() void UMoveInteractableModificator::TurnOnRotating() { + FScopeLock lock1(&critical); rotating = true; player->LockPlayer({ .camera = true }); ProcessState(); @@ -120,6 +123,7 @@ void UMoveInteractableModificator::TurnOnRotating() } void UMoveInteractableModificator::TurnOffRotating() { + FScopeLock lock1(&critical); rotating = false; player->UnlockPlayer({ .camera = true }); ProcessState(); @@ -130,7 +134,8 @@ void UMoveInteractableModificator::ProcessState() { if(holding || rotating) { - actor->activationLockers.Add(this); + if(!actor->activationLockers.Contains(this)) + actor->activationLockers.Add(this); } else { diff --git a/Source/Lost_Edge/Private/Interactable/Modificators/MoveInteractableModificator.h b/Source/Lost_Edge/Private/Interactable/Modificators/MoveInteractableModificator.h index 8117f20..8413435 100644 --- a/Source/Lost_Edge/Private/Interactable/Modificators/MoveInteractableModificator.h +++ b/Source/Lost_Edge/Private/Interactable/Modificators/MoveInteractableModificator.h @@ -58,4 +58,5 @@ private: bool rotating = false; class AInteractable* actor = nullptr; class APlayerBase* player = nullptr; + FCriticalSection critical; };