Rafal/EndlessVendetta
Rafal/EndlessVendetta
1
0
Fork 0
Code Issues Pull Requests Releases 1 Activity

Merge branch 'dev' into PuaseMenuTabs

Browse Source 
# Conflicts:
#	EndlessVendetta/Content/Dialogue/BP_DialogueUI.uasset
#	EndlessVendetta/Content/FirstPerson/Blueprints/BP_FirstPersonCharacter.uasset
This commit is contained in:
Rafal Swierczek 2024-02-10 14:20:25 +00:00
commit 3b748bc504
13 changed files with 23 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
EndlessVendetta/Content/BountySystem/ApartmentBounty/CinematicFrmaes/TimothyEliminatedSequence1.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
EndlessVendetta/Content/BountySystem/ApartmentBounty/CinematicFrmaes/TimothyEliminatedSequence2.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
EndlessVendetta/Content/BountySystem/ApartmentBounty/CinematicFrmaes/TimothyEliminatedSequence3.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
EndlessVendetta/Content/Dialogue/BP_DialogueUI.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
EndlessVendetta/Content/Dialogue/Testing/BP_Mayor.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
EndlessVendetta/Content/Dialogue/Testing/mccreescetchfab.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
EndlessVendetta/Content/FirstPerson/Blueprints/BP_FirstPersonCharacter.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
EndlessVendetta/Content/MainMenu/Music/Manu_maybe_3.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
EndlessVendetta/Content/MainMenu/Music/Menu_maybe_1.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
EndlessVendetta/Content/MainMenu/Music/Menu_maybe_2.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
EndlessVendetta/Content/MainMenu/Music/Menu_maybe_3_1.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
EndlessVendetta/Content/PauseMenu/PauseMenuBackground.uasset (Stored with Git LFS)
View File

Binary file not shown.

3
EndlessVendetta/Source/EndlessVendetta/DialogueSystem/AC_PlayerDialogueInterpreter.cpp
View File

@ -69,6 +69,7 @@ void UAC_PlayerDialogueInterpreter::StartDialogue(UDialogueTree* DialogueTree)
void UAC_PlayerDialogueInterpreter::NextDialogue() void UAC_PlayerDialogueInterpreter::NextDialogue()
{ {
if (!IsValid(CurrentTextNode)) return; if (!IsValid(CurrentTextNode)) return;
if (IsValid(CurrentChoiceNode)) return;
if (CurrentTextNode->ChildrenNodes.Num() == 0) if (CurrentTextNode->ChildrenNodes.Num() == 0)
{ {
EndDialogue(); EndDialogue();
@ -116,7 +117,7 @@ void UAC_PlayerDialogueInterpreter::EndDialogue()
if (APlayerController* PlayerController = GetWorld()->GetFirstPlayerController()) if (APlayerController* PlayerController = GetWorld()->GetFirstPlayerController())
{ {
const FInputModeGameAndUI InputModeData; const FInputModeGameOnly InputModeData;
PlayerController->SetInputMode(InputModeData); PlayerController->SetInputMode(InputModeData);
PlayerController->bShowMouseCursor = false; PlayerController->bShowMouseCursor = false;
} }