diff --git a/Config/DefaultGame.ini b/Config/DefaultGame.ini index 6d8ee3b57..ea39b49de 100644 --- a/Config/DefaultGame.ini +++ b/Config/DefaultGame.ini @@ -8,20 +8,21 @@ bRequiresPushToTalk=true [/Script/AssetTools.AssetToolsSettings] [/Script/CommonInput.CommonInputSettings] -InputData=/CommonUI/GenericInputData.GenericInputData_C +InputData=/Game/UI/Input/TestCommonInputData.TestCommonInputData_C bEnableEnhancedInputSupport=True - - +bAllowOutOfFocusDeviceInput=False [CommonInputPlatformSettings_Windows CommonInputPlatformSettings] DefaultInputType=MouseAndKeyboard bSupportsMouseAndKeyboard=True bSupportsTouch=False bSupportsGamepad=True -DefaultGamepadName=Generic +DefaultGamepadName=Windows bCanChangeGamepadType=True ++ControllerData=/Game/UI/Foundation/Platform/Input/KeyboardMouse/CommonInput_KeyboardMouse.CommonInput_KeyboardMouse_C ++ControllerData=/Game/UI/Foundation/Platform/Input/GamepadPS4/CommonInput_Gamepad_PS4.CommonInput_Gamepad_PS4_C +ControllerData=/Game/UI/Foundation/Platform/Input/GamepadPS5/CommonInput_Gamepad_PS5.CommonInput_Gamepad_PS5_C ++ControllerData=/Game/UI/Foundation/Platform/Input/GamepadSwitch/CommonInput_Gamepad_Switch.CommonInput_Gamepad_Switch_C +ControllerData=/Game/UI/Foundation/Platform/Input/GamepadXboxOne/CommonInput_Gamepad_XboxOne.CommonInput_Gamepad_XboxOne_C -+ControllerData=None -+ControllerData=None ++ControllerData=/Game/UI/Foundation/Platform/Input/GamepadXboxSeriesX/CommonInput_Gamepad_XSX.CommonInput_Gamepad_XSX_C diff --git a/Config/DefaultGameplayTags.ini b/Config/DefaultGameplayTags.ini index 01476864a..6c74ccc45 100644 --- a/Config/DefaultGameplayTags.ini +++ b/Config/DefaultGameplayTags.ini @@ -21,4 +21,6 @@ NetIndexFirstBitSegment=16 +GameplayTagList=(Tag="Pawn.Identity.Enemy",DevComment="") +GameplayTagList=(Tag="Pawn.Identity.NPC",DevComment="") +GameplayTagList=(Tag="Pawn.Identity.Player",DevComment="") ++GameplayTagList=(Tag="UI.Layer.Game",DevComment="") ++GameplayTagList=(Tag="UI.Layer.GameMenu",DevComment="") diff --git a/Config/DefaultInput.ini b/Config/DefaultInput.ini index 58fc9cbaa..ef4a1ff50 100644 --- a/Config/DefaultInput.ini +++ b/Config/DefaultInput.ini @@ -84,3 +84,6 @@ DefaultTouchInterface=/Engine/MobileResources/HUD/DefaultVirtualJoysticks.Defaul -ConsoleKeys=Tilde +ConsoleKeys=Tilde +[EnhancedInputPlatformSettings_Windows EnhancedInputPlatformSettings] +bShouldLogMappingContextRedirects=False + diff --git a/Content/Blueprint/Character/BP_PlayerBase.uasset b/Content/Blueprint/Character/BP_PlayerBase.uasset index f2bc04629..5762f66c2 100644 Binary files a/Content/Blueprint/Character/BP_PlayerBase.uasset and b/Content/Blueprint/Character/BP_PlayerBase.uasset differ diff --git a/Content/Blueprint/Character/BP_PlayerGamePlay.uasset b/Content/Blueprint/Character/BP_PlayerGamePlay.uasset index f14c39cfd..91f7d6ae7 100644 Binary files a/Content/Blueprint/Character/BP_PlayerGamePlay.uasset and b/Content/Blueprint/Character/BP_PlayerGamePlay.uasset differ diff --git a/Content/Blueprint/Lobby/TG_PlayerControllerLobby.uasset b/Content/Blueprint/Lobby/TG_PlayerControllerLobby.uasset index e9082334a..b4e5ba96f 100644 Binary files a/Content/Blueprint/Lobby/TG_PlayerControllerLobby.uasset and b/Content/Blueprint/Lobby/TG_PlayerControllerLobby.uasset differ diff --git a/Content/Maps/Login.umap b/Content/Maps/Login.umap index 7b0275d14..d52860a10 100644 Binary files a/Content/Maps/Login.umap and b/Content/Maps/Login.umap differ diff --git a/Content/Tengen/Input/IA_MainMenu.uasset b/Content/Tengen/Input/IA_MainMenu.uasset index aa9c1d2dc..6263884d4 100644 Binary files a/Content/Tengen/Input/IA_MainMenu.uasset and b/Content/Tengen/Input/IA_MainMenu.uasset differ diff --git a/Content/Tengen/Input/IA_UI_Back.uasset b/Content/Tengen/Input/IA_UI_Back.uasset new file mode 100644 index 000000000..830b7a52b Binary files /dev/null and b/Content/Tengen/Input/IA_UI_Back.uasset differ diff --git a/Content/Tengen/Input/IA_UI_MainMenu.uasset b/Content/Tengen/Input/IA_UI_MainMenu.uasset new file mode 100644 index 000000000..fb05ca4f1 Binary files /dev/null and b/Content/Tengen/Input/IA_UI_MainMenu.uasset differ diff --git a/Content/ThirdPerson/Blueprints/BP_ThirdPersonCharacter.uasset b/Content/ThirdPerson/Blueprints/BP_ThirdPersonCharacter.uasset index 2d98a426e..55ad1abb6 100644 Binary files a/Content/ThirdPerson/Blueprints/BP_ThirdPersonCharacter.uasset and b/Content/ThirdPerson/Blueprints/BP_ThirdPersonCharacter.uasset differ diff --git a/Content/ThirdPerson/Input/Actions/IA_Jump.uasset b/Content/ThirdPerson/Input/Actions/IA_Jump.uasset index 4e39676c3..841bfdf2a 100644 Binary files a/Content/ThirdPerson/Input/Actions/IA_Jump.uasset and b/Content/ThirdPerson/Input/Actions/IA_Jump.uasset differ diff --git a/Content/ThirdPerson/Input/Actions/IA_Look.uasset b/Content/ThirdPerson/Input/Actions/IA_Look.uasset index 5710da08c..b689d6804 100644 Binary files a/Content/ThirdPerson/Input/Actions/IA_Look.uasset and b/Content/ThirdPerson/Input/Actions/IA_Look.uasset differ diff --git a/Content/ThirdPerson/Input/Actions/IA_Move.uasset b/Content/ThirdPerson/Input/Actions/IA_Move.uasset index cc8f7e4d7..2684f5e75 100644 Binary files a/Content/ThirdPerson/Input/Actions/IA_Move.uasset and b/Content/ThirdPerson/Input/Actions/IA_Move.uasset differ diff --git a/Content/ThirdPerson/Input/Actions/IA_UI_Up.uasset b/Content/ThirdPerson/Input/Actions/IA_UI_Up.uasset index a40fa6a72..c06f146ee 100644 Binary files a/Content/ThirdPerson/Input/Actions/IA_UI_Up.uasset and b/Content/ThirdPerson/Input/Actions/IA_UI_Up.uasset differ diff --git a/Content/ThirdPerson/Input/IMC_Default.uasset b/Content/ThirdPerson/Input/IMC_Default.uasset index 85eadbad0..7c5eeac51 100644 Binary files a/Content/ThirdPerson/Input/IMC_Default.uasset and b/Content/ThirdPerson/Input/IMC_Default.uasset differ diff --git a/Content/ThirdPerson/Input/IMC_GamePlay.uasset b/Content/ThirdPerson/Input/IMC_GamePlay.uasset index a773effa1..a8400c365 100644 Binary files a/Content/ThirdPerson/Input/IMC_GamePlay.uasset and b/Content/ThirdPerson/Input/IMC_GamePlay.uasset differ diff --git a/Content/ThirdPerson/Input/IMC_UI_GenericActions.uasset b/Content/ThirdPerson/Input/IMC_UI_GenericActions.uasset index a2232c260..8474c2cb8 100644 Binary files a/Content/ThirdPerson/Input/IMC_UI_GenericActions.uasset and b/Content/ThirdPerson/Input/IMC_UI_GenericActions.uasset differ diff --git a/Content/ThirdPerson/Input/UI_IA_GenericMetadata.uasset b/Content/ThirdPerson/Input/UI_IA_GenericMetadata.uasset index 063bc6b27..4270a7732 100644 Binary files a/Content/ThirdPerson/Input/UI_IA_GenericMetadata.uasset and b/Content/ThirdPerson/Input/UI_IA_GenericMetadata.uasset differ diff --git a/Content/ThirdPerson/Input/UI_IA_SpecificMetadata.uasset b/Content/ThirdPerson/Input/UI_IA_SpecificMetadata.uasset index f7cf134fd..82c336f26 100644 Binary files a/Content/ThirdPerson/Input/UI_IA_SpecificMetadata.uasset and b/Content/ThirdPerson/Input/UI_IA_SpecificMetadata.uasset differ diff --git a/Content/UI/B_CommonInputData.uasset b/Content/UI/B_CommonInputData.uasset new file mode 100644 index 000000000..7fc8a89ab Binary files /dev/null and b/Content/UI/B_CommonInputData.uasset differ diff --git a/Content/UI/DT_UniversalActions.uasset b/Content/UI/DT_UniversalActions.uasset new file mode 100644 index 000000000..e284808b6 Binary files /dev/null and b/Content/UI/DT_UniversalActions.uasset differ diff --git a/Content/UI/Input/Actions/IA_Jump.uasset b/Content/UI/Input/Actions/IA_Jump.uasset new file mode 100644 index 000000000..0ab63a9ce Binary files /dev/null and b/Content/UI/Input/Actions/IA_Jump.uasset differ diff --git a/Content/UI/Input/Actions/IA_Look.uasset b/Content/UI/Input/Actions/IA_Look.uasset new file mode 100644 index 000000000..d70e423f1 Binary files /dev/null and b/Content/UI/Input/Actions/IA_Look.uasset differ diff --git a/Content/UI/Input/Actions/IA_Move.uasset b/Content/UI/Input/Actions/IA_Move.uasset new file mode 100644 index 000000000..9e7269a75 Binary files /dev/null and b/Content/UI/Input/Actions/IA_Move.uasset differ diff --git a/Content/UI/Input/Actions/IA_UI_Up.uasset b/Content/UI/Input/Actions/IA_UI_Up.uasset new file mode 100644 index 000000000..86174b467 Binary files /dev/null and b/Content/UI/Input/Actions/IA_UI_Up.uasset differ diff --git a/Content/UI/Input/CommonInputBase.uasset b/Content/UI/Input/CommonInputBase.uasset new file mode 100644 index 000000000..7e29aa855 Binary files /dev/null and b/Content/UI/Input/CommonInputBase.uasset differ diff --git a/Content/UI/Input/IMC_Default.uasset b/Content/UI/Input/IMC_Default.uasset new file mode 100644 index 000000000..8a990a5cd Binary files /dev/null and b/Content/UI/Input/IMC_Default.uasset differ diff --git a/Content/UI/Input/IMC_GamePlay.uasset b/Content/UI/Input/IMC_GamePlay.uasset new file mode 100644 index 000000000..5c21d9018 Binary files /dev/null and b/Content/UI/Input/IMC_GamePlay.uasset differ diff --git a/Content/UI/Input/IMC_UI_GenericActions.uasset b/Content/UI/Input/IMC_UI_GenericActions.uasset new file mode 100644 index 000000000..8bffd025e Binary files /dev/null and b/Content/UI/Input/IMC_UI_GenericActions.uasset differ diff --git a/Content/UI/Input/MenuCommonButtonBase.uasset b/Content/UI/Input/MenuCommonButtonBase.uasset new file mode 100644 index 000000000..655284bfe Binary files /dev/null and b/Content/UI/Input/MenuCommonButtonBase.uasset differ diff --git a/Content/UI/Input/TGInputData.uasset b/Content/UI/Input/TGInputData.uasset new file mode 100644 index 000000000..0de8d31ca Binary files /dev/null and b/Content/UI/Input/TGInputData.uasset differ diff --git a/Content/UI/Input/TestCommonInputData.uasset b/Content/UI/Input/TestCommonInputData.uasset new file mode 100644 index 000000000..dfd2d4e6a Binary files /dev/null and b/Content/UI/Input/TestCommonInputData.uasset differ diff --git a/Content/UI/Input/UI_IA_GenericMetadata.uasset b/Content/UI/Input/UI_IA_GenericMetadata.uasset new file mode 100644 index 000000000..764a3b3c2 Binary files /dev/null and b/Content/UI/Input/UI_IA_GenericMetadata.uasset differ diff --git a/Content/UI/Input/UI_IA_SpecificMetadata.uasset b/Content/UI/Input/UI_IA_SpecificMetadata.uasset new file mode 100644 index 000000000..64dd85ca1 Binary files /dev/null and b/Content/UI/Input/UI_IA_SpecificMetadata.uasset differ diff --git a/Content/Widget/Comm/CW_BaseHUD_Lobby.uasset b/Content/Widget/Comm/CW_BaseHUD_Lobby.uasset index 39b57acb0..5d5c4b80f 100644 Binary files a/Content/Widget/Comm/CW_BaseHUD_Lobby.uasset and b/Content/Widget/Comm/CW_BaseHUD_Lobby.uasset differ diff --git a/Content/Widget/Comm/Menu/W_CommonMenu.uasset b/Content/Widget/Comm/Menu/W_CommonMenu.uasset new file mode 100644 index 000000000..1db240fa1 Binary files /dev/null and b/Content/Widget/Comm/Menu/W_CommonMenu.uasset differ diff --git a/Content/Widget/Lobby/CWB_MainBar.uasset b/Content/Widget/Lobby/CWB_MainBar.uasset index 8a805f2d0..fccc75aae 100644 Binary files a/Content/Widget/Lobby/CWB_MainBar.uasset and b/Content/Widget/Lobby/CWB_MainBar.uasset differ diff --git a/Content/Widget/Lobby/CWB_MainBarBotton.uasset b/Content/Widget/Lobby/CWB_MainBarBotton.uasset index 040b47f97..e5deb5888 100644 Binary files a/Content/Widget/Lobby/CWB_MainBarBotton.uasset and b/Content/Widget/Lobby/CWB_MainBarBotton.uasset differ diff --git a/Content/Widget/Lobby/OSTes.uasset b/Content/Widget/Lobby/OSTes.uasset new file mode 100644 index 000000000..642fbb3f4 Binary files /dev/null and b/Content/Widget/Lobby/OSTes.uasset differ diff --git a/Content/Widget/Lobby/WB_Main_Lobby.uasset b/Content/Widget/Lobby/WB_Main_Lobby.uasset index e3604f22c..0958803b2 100644 Binary files a/Content/Widget/Lobby/WB_Main_Lobby.uasset and b/Content/Widget/Lobby/WB_Main_Lobby.uasset differ diff --git a/Content/Widget/UITest/HUDLayout.uasset b/Content/Widget/UITest/HUDLayout.uasset new file mode 100644 index 000000000..29a4201ce Binary files /dev/null and b/Content/Widget/UITest/HUDLayout.uasset differ diff --git a/Content/Widget/UITest/HudTest.uasset b/Content/Widget/UITest/HudTest.uasset new file mode 100644 index 000000000..d5ac884ca Binary files /dev/null and b/Content/Widget/UITest/HudTest.uasset differ diff --git a/Content/Widget/UITest/NewBlueprint.uasset b/Content/Widget/UITest/NewBlueprint.uasset new file mode 100644 index 000000000..fc5551acc Binary files /dev/null and b/Content/Widget/UITest/NewBlueprint.uasset differ diff --git a/Content/Widget/UITest/NewWorld.umap b/Content/Widget/UITest/NewWorld.umap new file mode 100644 index 000000000..52313ea0e Binary files /dev/null and b/Content/Widget/UITest/NewWorld.umap differ diff --git a/Content/Widget/UITest/UITest.uasset b/Content/Widget/UITest/UITest.uasset new file mode 100644 index 000000000..e49c6d9f6 Binary files /dev/null and b/Content/Widget/UITest/UITest.uasset differ