diff --git a/Blaster.uproject b/Blaster.uproject index ea3b9fb3..9a1636a1 100644 --- a/Blaster.uproject +++ b/Blaster.uproject @@ -1,6 +1,6 @@ { "FileVersion": 3, - "EngineAssociation": "5.0", + "EngineAssociation": "5.1", "Category": "", "Description": "", "Modules": [ diff --git a/Config/DefaultInput.ini b/Config/DefaultInput.ini index a01735b3..1e31cf13 100644 --- a/Config/DefaultInput.ini +++ b/Config/DefaultInput.ini @@ -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 @@ -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 diff --git a/Plugins/MultiplayerSessions/Source/MultiplayerSessions/Private/Menu.cpp b/Plugins/MultiplayerSessions/Source/MultiplayerSessions/Private/Menu.cpp index f9117e32..605e0fbd 100644 --- a/Plugins/MultiplayerSessions/Source/MultiplayerSessions/Private/Menu.cpp +++ b/Plugins/MultiplayerSessions/Source/MultiplayerSessions/Private/Menu.cpp @@ -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) { diff --git a/Plugins/MultiplayerSessions/Source/MultiplayerSessions/Public/Menu.h b/Plugins/MultiplayerSessions/Source/MultiplayerSessions/Public/Menu.h index 4e3a4ad2..994e82c9 100644 --- a/Plugins/MultiplayerSessions/Source/MultiplayerSessions/Public/Menu.h +++ b/Plugins/MultiplayerSessions/Source/MultiplayerSessions/Public/Menu.h @@ -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 diff --git a/Source/Blaster/HUD/OverheadWidget.cpp b/Source/Blaster/HUD/OverheadWidget.cpp index ddf4e2ba..5ef2eacc 100644 --- a/Source/Blaster/HUD/OverheadWidget.cpp +++ b/Source/Blaster/HUD/OverheadWidget.cpp @@ -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(); } + diff --git a/Source/Blaster/HUD/OverheadWidget.h b/Source/Blaster/HUD/OverheadWidget.h index d7f77f14..49417a80 100644 --- a/Source/Blaster/HUD/OverheadWidget.h +++ b/Source/Blaster/HUD/OverheadWidget.h @@ -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; };