From 0e268c28f9babf470b999dfb2b36f7e3a8c717fc Mon Sep 17 00:00:00 2001 From: PHILIP WHITE Date: Mon, 5 Feb 2024 17:04:03 +0000 Subject: [PATCH 1/3] Bugfix Game Mode Not Correctly Being Set On Dialogue End --- .../CinematicFrmaes/TimothyEliminatedSequence1.uasset | 4 ++-- .../CinematicFrmaes/TimothyEliminatedSequence2.uasset | 4 ++-- .../CinematicFrmaes/TimothyEliminatedSequence3.uasset | 4 ++-- EndlessVendetta/Content/Dialogue/Testing/BP_Mayor.uasset | 4 ++-- .../Content/Dialogue/Testing/mccreescetchfab.uasset | 3 +++ EndlessVendetta/Content/MainMenu/Music/Menu_maybe_1.uasset | 2 +- EndlessVendetta/Content/MainMenu/Music/Menu_maybe_2.uasset | 2 +- .../DialogueSystem/AC_PlayerDialogueInterpreter.cpp | 2 +- 8 files changed, 14 insertions(+), 11 deletions(-) create mode 100644 EndlessVendetta/Content/Dialogue/Testing/mccreescetchfab.uasset diff --git a/EndlessVendetta/Content/BountySystem/ApartmentBounty/CinematicFrmaes/TimothyEliminatedSequence1.uasset b/EndlessVendetta/Content/BountySystem/ApartmentBounty/CinematicFrmaes/TimothyEliminatedSequence1.uasset index c61f6f3d..2fefa4b1 100644 --- a/EndlessVendetta/Content/BountySystem/ApartmentBounty/CinematicFrmaes/TimothyEliminatedSequence1.uasset +++ b/EndlessVendetta/Content/BountySystem/ApartmentBounty/CinematicFrmaes/TimothyEliminatedSequence1.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:9a9afa23ae558b83cb702459c867762949f69aef33c0f2f8a56e183deef52932 -size 194758 +oid sha256:fd48ed44b7418ebe41e2ecfa34fc5255516804e276a362a70ed254c94d1f5948 +size 194853 diff --git a/EndlessVendetta/Content/BountySystem/ApartmentBounty/CinematicFrmaes/TimothyEliminatedSequence2.uasset b/EndlessVendetta/Content/BountySystem/ApartmentBounty/CinematicFrmaes/TimothyEliminatedSequence2.uasset index 6f47784b..46345e7c 100644 --- a/EndlessVendetta/Content/BountySystem/ApartmentBounty/CinematicFrmaes/TimothyEliminatedSequence2.uasset +++ b/EndlessVendetta/Content/BountySystem/ApartmentBounty/CinematicFrmaes/TimothyEliminatedSequence2.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b42f7563773dec9db697b0e2621bf9ce0f4f66c973f77ef24e3ffec0f633e14a -size 187754 +oid sha256:3e831a54780e268243e807dba5db877a6e4a11de39c0cf215bf7a80a4ebd8ae8 +size 187849 diff --git a/EndlessVendetta/Content/BountySystem/ApartmentBounty/CinematicFrmaes/TimothyEliminatedSequence3.uasset b/EndlessVendetta/Content/BountySystem/ApartmentBounty/CinematicFrmaes/TimothyEliminatedSequence3.uasset index ac6f5814..5b7f3dc1 100644 --- a/EndlessVendetta/Content/BountySystem/ApartmentBounty/CinematicFrmaes/TimothyEliminatedSequence3.uasset +++ b/EndlessVendetta/Content/BountySystem/ApartmentBounty/CinematicFrmaes/TimothyEliminatedSequence3.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:161d5bd4b9ad1fd63d358155ca4612b125d7471c35dd39219bb0727fdf255cf0 -size 46015 +oid sha256:2e7637dc22779c553d568c5cba824c68f7adc5bb4d03bd2b05c441b047dd511e +size 46110 diff --git a/EndlessVendetta/Content/Dialogue/Testing/BP_Mayor.uasset b/EndlessVendetta/Content/Dialogue/Testing/BP_Mayor.uasset index 86869ecb..5b47134c 100644 --- a/EndlessVendetta/Content/Dialogue/Testing/BP_Mayor.uasset +++ b/EndlessVendetta/Content/Dialogue/Testing/BP_Mayor.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4280fd261e4b0d85f410669264906255cdcc74e55477faa4fe5e46c3d33aeee4 -size 30273 +oid sha256:bff7d38f762b18dc8b6df862bf514792adbb9f6099f05cb80c736bfa0dccd5b8 +size 30562 diff --git a/EndlessVendetta/Content/Dialogue/Testing/mccreescetchfab.uasset b/EndlessVendetta/Content/Dialogue/Testing/mccreescetchfab.uasset new file mode 100644 index 00000000..a5638509 --- /dev/null +++ b/EndlessVendetta/Content/Dialogue/Testing/mccreescetchfab.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:dad03734a28fc42ba603a08122576da60906a7a06ccc74fe609c3ae6f5548c46 +size 96940 diff --git a/EndlessVendetta/Content/MainMenu/Music/Menu_maybe_1.uasset b/EndlessVendetta/Content/MainMenu/Music/Menu_maybe_1.uasset index 94c0b816..b1fdda66 100644 --- a/EndlessVendetta/Content/MainMenu/Music/Menu_maybe_1.uasset +++ b/EndlessVendetta/Content/MainMenu/Music/Menu_maybe_1.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c45189d39477bb218b76eb906ade0e079d528c9b0bd97dcd91595d3d84c5498b +oid sha256:1e53da13134e860e42c8c1c5c5e8641e6ecc134686cc5bf58b366fdc40e331f4 size 10175168 diff --git a/EndlessVendetta/Content/MainMenu/Music/Menu_maybe_2.uasset b/EndlessVendetta/Content/MainMenu/Music/Menu_maybe_2.uasset index 02149b54..9751764d 100644 --- a/EndlessVendetta/Content/MainMenu/Music/Menu_maybe_2.uasset +++ b/EndlessVendetta/Content/MainMenu/Music/Menu_maybe_2.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4ab7d47d6559b81d51e0575f55eb4a10aa96504500b0ab5ddce0fb4b9c40cc2e +oid sha256:e0096c0ffd77ec2c55ba562f83e4ffc4fbfbce7ac792ca28404db386be285cc8 size 4793489 diff --git a/EndlessVendetta/Source/EndlessVendetta/DialogueSystem/AC_PlayerDialogueInterpreter.cpp b/EndlessVendetta/Source/EndlessVendetta/DialogueSystem/AC_PlayerDialogueInterpreter.cpp index f11997ca..ee03cad5 100644 --- a/EndlessVendetta/Source/EndlessVendetta/DialogueSystem/AC_PlayerDialogueInterpreter.cpp +++ b/EndlessVendetta/Source/EndlessVendetta/DialogueSystem/AC_PlayerDialogueInterpreter.cpp @@ -116,7 +116,7 @@ void UAC_PlayerDialogueInterpreter::EndDialogue() if (APlayerController* PlayerController = GetWorld()->GetFirstPlayerController()) { - const FInputModeGameAndUI InputModeData; + const FInputModeGameOnly InputModeData; PlayerController->SetInputMode(InputModeData); PlayerController->bShowMouseCursor = false; } From 6b34ee2401ccfd198272b2e1db1bb28ae36c1f89 Mon Sep 17 00:00:00 2001 From: PHILIP WHITE Date: Mon, 5 Feb 2024 17:19:01 +0000 Subject: [PATCH 2/3] Update Dialogue to be Able to Click to Progress --- EndlessVendetta/Content/Dialogue/BP_DialogueUI.uasset | 4 ++-- EndlessVendetta/Content/MainMenu/Music/Manu_maybe_3.uasset | 2 +- EndlessVendetta/Content/MainMenu/Music/Menu_maybe_3_1.uasset | 2 +- EndlessVendetta/Content/PauseMenu/PauseMenuBackground.uasset | 4 ++-- .../DialogueSystem/AC_PlayerDialogueInterpreter.cpp | 1 + 5 files changed, 7 insertions(+), 6 deletions(-) diff --git a/EndlessVendetta/Content/Dialogue/BP_DialogueUI.uasset b/EndlessVendetta/Content/Dialogue/BP_DialogueUI.uasset index 085864ef..f2032bc7 100644 --- a/EndlessVendetta/Content/Dialogue/BP_DialogueUI.uasset +++ b/EndlessVendetta/Content/Dialogue/BP_DialogueUI.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:35908c5dcdb5143afd98a83341d8cb46d90ab1430b3d365f1b4707d85c793c70 -size 224018 +oid sha256:18f25031baa2166bb6085631ad0d09eacb61140da74137347709274b8caac5ca +size 233135 diff --git a/EndlessVendetta/Content/MainMenu/Music/Manu_maybe_3.uasset b/EndlessVendetta/Content/MainMenu/Music/Manu_maybe_3.uasset index 4fc01cf4..bf26a840 100644 --- a/EndlessVendetta/Content/MainMenu/Music/Manu_maybe_3.uasset +++ b/EndlessVendetta/Content/MainMenu/Music/Manu_maybe_3.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:eb8f4c9f8b54f6f6bf65b0d41ff7f1ea5c8a9c25e494a0ceae061faa431279f9 +oid sha256:d6b53e65d1478291402898cdcc39158cedac1091873500d8429a0050ba4b6e40 size 6023064 diff --git a/EndlessVendetta/Content/MainMenu/Music/Menu_maybe_3_1.uasset b/EndlessVendetta/Content/MainMenu/Music/Menu_maybe_3_1.uasset index 41087f44..48b24b2a 100644 --- a/EndlessVendetta/Content/MainMenu/Music/Menu_maybe_3_1.uasset +++ b/EndlessVendetta/Content/MainMenu/Music/Menu_maybe_3_1.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b1d6ac457cec4cc6d963b0522d8adbd8ce6e90f7e1d290c482c548cb596017c4 +oid sha256:a9a4773b9ec5db370898639bd618f51024a541b99b41ab8ea5b33b43ac341947 size 15907164 diff --git a/EndlessVendetta/Content/PauseMenu/PauseMenuBackground.uasset b/EndlessVendetta/Content/PauseMenu/PauseMenuBackground.uasset index 2cc1da9e..364b534b 100644 --- a/EndlessVendetta/Content/PauseMenu/PauseMenuBackground.uasset +++ b/EndlessVendetta/Content/PauseMenu/PauseMenuBackground.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:1f5ba48d09af24b7bd6d2265d08899b4e0237ac470f4b9d9326ed388289b5ce6 -size 47717 +oid sha256:e859baaadbcc2e64ec682e5450d17cca1b1d3040358c6ccce4366300054a29bf +size 47812 diff --git a/EndlessVendetta/Source/EndlessVendetta/DialogueSystem/AC_PlayerDialogueInterpreter.cpp b/EndlessVendetta/Source/EndlessVendetta/DialogueSystem/AC_PlayerDialogueInterpreter.cpp index ee03cad5..40096b70 100644 --- a/EndlessVendetta/Source/EndlessVendetta/DialogueSystem/AC_PlayerDialogueInterpreter.cpp +++ b/EndlessVendetta/Source/EndlessVendetta/DialogueSystem/AC_PlayerDialogueInterpreter.cpp @@ -69,6 +69,7 @@ void UAC_PlayerDialogueInterpreter::StartDialogue(UDialogueTree* DialogueTree) void UAC_PlayerDialogueInterpreter::NextDialogue() { if (!IsValid(CurrentTextNode)) return; + if (IsValid(CurrentChoiceNode)) return; if (CurrentTextNode->ChildrenNodes.Num() == 0) { EndDialogue(); From 61dfe7467bf186cc694cd777e30453e4f165253b Mon Sep 17 00:00:00 2001 From: PHILIP WHITE Date: Mon, 5 Feb 2024 20:12:29 +0000 Subject: [PATCH 3/3] Update Dialogue to Skip Typewriter Effect --- EndlessVendetta/Content/Dialogue/BP_DialogueUI.uasset | 4 ++-- .../FirstPerson/Blueprints/BP_FirstPersonCharacter.uasset | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/EndlessVendetta/Content/Dialogue/BP_DialogueUI.uasset b/EndlessVendetta/Content/Dialogue/BP_DialogueUI.uasset index f2032bc7..44c7551f 100644 --- a/EndlessVendetta/Content/Dialogue/BP_DialogueUI.uasset +++ b/EndlessVendetta/Content/Dialogue/BP_DialogueUI.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:18f25031baa2166bb6085631ad0d09eacb61140da74137347709274b8caac5ca -size 233135 +oid sha256:2cd40ad218e1f5f1472eeaeceeeb174e200b78fa10e739e06b7284439ebdbfd1 +size 329748 diff --git a/EndlessVendetta/Content/FirstPerson/Blueprints/BP_FirstPersonCharacter.uasset b/EndlessVendetta/Content/FirstPerson/Blueprints/BP_FirstPersonCharacter.uasset index 56637590..93acb514 100644 --- a/EndlessVendetta/Content/FirstPerson/Blueprints/BP_FirstPersonCharacter.uasset +++ b/EndlessVendetta/Content/FirstPerson/Blueprints/BP_FirstPersonCharacter.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:8940bc41955ada96468ffc747fadce7e4ffd6e694118e4367d00dcf18407f17a -size 494513 +oid sha256:42ea885a3728084f3a0fc2945847391504503bbc7a8476c490624a90d35ad53b +size 468474