Merge remote-tracking branch 'origin/master'

This commit is contained in:
Evan Husted 2024-10-23 14:19:47 -05:00
commit 59277a9301
3 changed files with 26 additions and 46 deletions

View file

@ -898,7 +898,7 @@ namespace Ryujinx.UI.Common.Configuration
Backend = InputBackendType.WindowKeyboard,
Id = "0",
PlayerIndex = PlayerIndex.Player1,
ControllerType = ControllerType.JoyconPair,
ControllerType = ControllerType.ProController,
LeftJoycon = new LeftJoyconCommonConfig<Key>
{
DpadUp = Key.Up,
@ -1128,7 +1128,7 @@ namespace Ryujinx.UI.Common.Configuration
Backend = InputBackendType.WindowKeyboard,
Id = "0",
PlayerIndex = PlayerIndex.Player1,
ControllerType = ControllerType.JoyconPair,
ControllerType = ControllerType.ProController,
LeftJoycon = new LeftJoyconCommonConfig<Key>
{
DpadUp = Key.Up,