Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Blaster.uproject
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"FileVersion": 3,
"EngineAssociation": "5.0",
"EngineAssociation": "5.1",
"Category": "",
"Description": "",
"Modules": [
Expand Down
9 changes: 7 additions & 2 deletions Config/DefaultInput.ini
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,11 @@ bUseMouseForTouch=False
bEnableMouseSmoothing=True
bEnableFOVScaling=True
bCaptureMouseOnLaunch=True
bEnableLegacyInputScales=True
bEnableMotionControls=True
bFilterInputByPlatformUser=False
bShouldFlushPressedKeysOnViewportFocusLost=True
bEnableDynamicComponentInputBinding=True
bAlwaysShowTouchInterface=False
bShowConsoleOnFourFingerTap=True
bEnableGestureRecognizer=False
Expand All @@ -93,8 +98,8 @@ DoubleClickTime=0.200000
+AxisMappings=(AxisName="MoveRight",Scale=-1.000000,Key=A)
+AxisMappings=(AxisName="Turn",Scale=1.000000,Key=MouseX)
+AxisMappings=(AxisName="LookUp",Scale=-1.000000,Key=MouseY)
DefaultPlayerInputClass=/Script/Engine.PlayerInput
DefaultInputComponentClass=/Script/Engine.InputComponent
DefaultPlayerInputClass=/Script/EnhancedInput.EnhancedPlayerInput
DefaultInputComponentClass=/Script/EnhancedInput.EnhancedInputComponent
DefaultTouchInterface=/Engine/MobileResources/HUD/DefaultVirtualJoysticks.DefaultVirtualJoysticks
-ConsoleKeys=Tilde
+ConsoleKeys=Tilde
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -64,12 +64,18 @@ bool UMenu::Initialize()

return true;
}

/*
void UMenu::OnLevelRemovedFromWorld(ULevel* InLevel, UWorld* InWorld)
{
MenuTearDown();
Super::OnLevelRemovedFromWorld(InLevel, InWorld);
}
*/
void UMenu::NativeDestruct()
{
MenuTearDown();
Super::NativeDestruct();
}

void UMenu::OnCreateSession(bool bWasSuccessful)
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,9 @@ class MULTIPLAYERSESSIONS_API UMenu : public UUserWidget
protected:

virtual bool Initialize() override;
virtual void OnLevelRemovedFromWorld(ULevel* InLevel, UWorld* InWorld) override;
// UE5.1 is abandon
//virtual void OnLevelRemovedFromWorld(ULevel* InLevel, UWorld* InWorld) override;
virtual void NativeDestruct() override;

//
// Callbacks for the custom delegates on the MultiplayerSessionsSubsystem
Expand Down
12 changes: 10 additions & 2 deletions Source/Blaster/HUD/OverheadWidget.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,16 @@ void UOverheadWidget::ShowPlayerNetRole(APawn* InPawn)
SetDisplayText(RemoteRoleString);
}

void UOverheadWidget::OnLevelRemovedFromWorld(ULevel* InLevel, UWorld* InWorld)
/*
void UOverheadWidget::OnLevelRemovedFromWorld(ULevel* InLevel, UWorld* InWorld)
{
RemoveFromParent();
Super::OnLevelRemovedFromWorld(InLevel, InWorld);
}
*/
void UOverheadWidget::NativeDestruct()
{
RemoveFromParent();
Super::OnLevelRemovedFromWorld(InLevel, InWorld);
Super::NativeDestruct();
}

3 changes: 2 additions & 1 deletion Source/Blaster/HUD/OverheadWidget.h
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ class BLASTER_API UOverheadWidget : public UUserWidget
void ShowPlayerNetRole(APawn* InPawn);

protected:
virtual void OnLevelRemovedFromWorld(ULevel* InLevel, UWorld* InWorld) override;
// virtual void OnLevelRemovedFromWorld(ULevel* InLevel, UWorld* InWorld) override;
virtual void NativeDestruct() override;

};