Merge remote-tracking branch 'upstream/cooker-0.8.0b' into cooker-0.8.0b-icenine451

This commit is contained in:
icenine451 2024-04-11 09:03:21 -04:00
commit 58f30cdd38
9 changed files with 358 additions and 52 deletions

View file

@ -7,7 +7,7 @@ PauseOnFocusLoss = true
StartFullscreen = true StartFullscreen = true
StartPaused = false StartPaused = false
ConfirmShutdown = false ConfirmShutdown = false
HideMouseCursor = false HideMouseCursor = true
RenderToSeparateWindow = false RenderToSeparateWindow = false
HideMainWindowWhenRunning = false HideMainWindowWhenRunning = false
DisableWindowResize = false DisableWindowResize = false

View file

@ -91,11 +91,11 @@
"enable_keyboard": false, "enable_keyboard": false,
"enable_mouse": false, "enable_mouse": false,
"hotkeys": { "hotkeys": {
"toggle_vsync": "", "toggle_vsync": "Tab",
"screenshot": "", "screenshot": "F8",
"show_ui": "ESC", "show_ui": "F4",
"pause": "", "pause": "F5",
"toggle_mute": "", "toggle_mute": "F2",
"res_scale_up": "Unbound", "res_scale_up": "Unbound",
"res_scale_down": "Unbound", "res_scale_down": "Unbound",
"volume_up": "Unbound", "volume_up": "Unbound",
@ -119,11 +119,11 @@
"rotate90_cw": false, "rotate90_cw": false,
"stick_button": "RightStick" "stick_button": "RightStick"
}, },
"deadzone_left": 0, "deadzone_left": 0.1,
"deadzone_right": 0, "deadzone_right": 0.1,
"range_left": 1.2, "range_left": 1,
"range_right": 1, "range_right": 1,
"trigger_threshold": 0, "trigger_threshold": 0.5,
"motion": { "motion": {
"slot": 0, "slot": 0,
"alt_slot": 0, "alt_slot": 0,
@ -136,12 +136,12 @@
"enable_motion": true "enable_motion": true
}, },
"rumble": { "rumble": {
"strong_rumble": 2.1, "strong_rumble": 1,
"weak_rumble": 1, "weak_rumble": 1,
"enable_rumble": true "enable_rumble": true
}, },
"left_joycon": { "left_joycon": {
"button_minus": "Minus", "button_minus": "Back",
"button_l": "LeftShoulder", "button_l": "LeftShoulder",
"button_zl": "LeftTrigger", "button_zl": "LeftTrigger",
"button_sl": "Unbound", "button_sl": "Unbound",
@ -152,20 +152,20 @@
"dpad_right": "DpadRight" "dpad_right": "DpadRight"
}, },
"right_joycon": { "right_joycon": {
"button_plus": "Plus", "button_plus": "Start",
"button_r": "RightShoulder", "button_r": "RightShoulder",
"button_zr": "RightTrigger", "button_zr": "RightTrigger",
"button_sl": "Unbound", "button_sl": "Unbound",
"button_sr": "Unbound", "button_sr": "Unbound",
"button_x": "X", "button_x": "Y",
"button_b": "B", "button_b": "A",
"button_y": "Y", "button_y": "X",
"button_a": "A" "button_a": "B"
}, },
"version": 1, "version": 1,
"backend": "GamepadSDL2", "backend": "GamepadSDL2",
"id": "0-00000003-28de-0000-ff11-000001000000", "id": "0-36b80003-28de-0000-ff11-000001000000",
"controller_type": "JoyconPair", "controller_type": "ProController",
"player_index": "Player1" "player_index": "Player1"
}, },
{ {
@ -183,11 +183,11 @@
"rotate90_cw": false, "rotate90_cw": false,
"stick_button": "RightStick" "stick_button": "RightStick"
}, },
"deadzone_left": 0, "deadzone_left": 0.1,
"deadzone_right": 0, "deadzone_right": 0.1,
"range_left": 1.2, "range_left": 1,
"range_right": 1, "range_right": 1,
"trigger_threshold": 0, "trigger_threshold": 0.5,
"motion": { "motion": {
"motion_backend": "GamepadDriver", "motion_backend": "GamepadDriver",
"sensitivity": 100, "sensitivity": 100,
@ -200,7 +200,7 @@
"enable_rumble": true "enable_rumble": true
}, },
"left_joycon": { "left_joycon": {
"button_minus": "Minus", "button_minus": "Back",
"button_l": "LeftShoulder", "button_l": "LeftShoulder",
"button_zl": "LeftTrigger", "button_zl": "LeftTrigger",
"button_sl": "Unbound", "button_sl": "Unbound",
@ -211,19 +211,19 @@
"dpad_right": "DpadRight" "dpad_right": "DpadRight"
}, },
"right_joycon": { "right_joycon": {
"button_plus": "Plus", "button_plus": "Start",
"button_r": "RightShoulder", "button_r": "RightShoulder",
"button_zr": "RightTrigger", "button_zr": "RightTrigger",
"button_sl": "Unbound", "button_sl": "Unbound",
"button_sr": "Unbound", "button_sr": "Unbound",
"button_x": "X", "button_x": "Y",
"button_b": "B", "button_b": "A",
"button_y": "Y", "button_y": "X",
"button_a": "A" "button_a": "B"
}, },
"version": 1, "version": 1,
"backend": "GamepadSDL2", "backend": "GamepadSDL2",
"id": "1-00000003-28de-0000-ff11-000001000000", "id": "1-36b80003-28de-0000-ff11-000001000000",
"controller_type": "ProController", "controller_type": "ProController",
"player_index": "Player2" "player_index": "Player2"
}, },
@ -242,11 +242,11 @@
"rotate90_cw": false, "rotate90_cw": false,
"stick_button": "RightStick" "stick_button": "RightStick"
}, },
"deadzone_left": 0, "deadzone_left": 0.1,
"deadzone_right": 0, "deadzone_right": 0.1,
"range_left": 1.2, "range_left": 1,
"range_right": 1, "range_right": 1,
"trigger_threshold": 0, "trigger_threshold": 0.5,
"motion": { "motion": {
"motion_backend": "GamepadDriver", "motion_backend": "GamepadDriver",
"sensitivity": 100, "sensitivity": 100,
@ -259,7 +259,7 @@
"enable_rumble": true "enable_rumble": true
}, },
"left_joycon": { "left_joycon": {
"button_minus": "Minus", "button_minus": "Back",
"button_l": "LeftShoulder", "button_l": "LeftShoulder",
"button_zl": "LeftTrigger", "button_zl": "LeftTrigger",
"button_sl": "Unbound", "button_sl": "Unbound",
@ -270,19 +270,19 @@
"dpad_right": "DpadRight" "dpad_right": "DpadRight"
}, },
"right_joycon": { "right_joycon": {
"button_plus": "Plus", "button_plus": "Start",
"button_r": "RightShoulder", "button_r": "RightShoulder",
"button_zr": "RightTrigger", "button_zr": "RightTrigger",
"button_sl": "Unbound", "button_sl": "Unbound",
"button_sr": "Unbound", "button_sr": "Unbound",
"button_x": "X", "button_x": "Y",
"button_b": "B", "button_b": "A",
"button_y": "Y", "button_y": "X",
"button_a": "A" "button_a": "B"
}, },
"version": 1, "version": 1,
"backend": "GamepadSDL2", "backend": "GamepadSDL2",
"id": "2-00000003-28de-0000-ff11-000001000000", "id": "2-36b80003-28de-0000-ff11-000001000000",
"controller_type": "ProController", "controller_type": "ProController",
"player_index": "Player3" "player_index": "Player3"
}, },
@ -301,11 +301,11 @@
"rotate90_cw": false, "rotate90_cw": false,
"stick_button": "RightStick" "stick_button": "RightStick"
}, },
"deadzone_left": 0, "deadzone_left": 0.1,
"deadzone_right": 0, "deadzone_right": 0.1,
"range_left": 1.2, "range_left": 1,
"range_right": 1, "range_right": 1,
"trigger_threshold": 0, "trigger_threshold": 0.5,
"motion": { "motion": {
"motion_backend": "GamepadDriver", "motion_backend": "GamepadDriver",
"sensitivity": 100, "sensitivity": 100,
@ -318,7 +318,7 @@
"enable_rumble": true "enable_rumble": true
}, },
"left_joycon": { "left_joycon": {
"button_minus": "Minus", "button_minus": "Back",
"button_l": "LeftShoulder", "button_l": "LeftShoulder",
"button_zl": "LeftTrigger", "button_zl": "LeftTrigger",
"button_sl": "Unbound", "button_sl": "Unbound",
@ -329,19 +329,19 @@
"dpad_right": "DpadRight" "dpad_right": "DpadRight"
}, },
"right_joycon": { "right_joycon": {
"button_plus": "Plus", "button_plus": "Start",
"button_r": "RightShoulder", "button_r": "RightShoulder",
"button_zr": "RightTrigger", "button_zr": "RightTrigger",
"button_sl": "Unbound", "button_sl": "Unbound",
"button_sr": "Unbound", "button_sr": "Unbound",
"button_x": "X", "button_x": "Y",
"button_b": "B", "button_b": "A",
"button_y": "Y", "button_y": "X",
"button_a": "A" "button_a": "B"
}, },
"version": 1, "version": 1,
"backend": "GamepadSDL2", "backend": "GamepadSDL2",
"id": "3-00000003-28de-0000-ff11-000001000000", "id": "3-36b80003-28de-0000-ff11-000001000000",
"controller_type": "ProController", "controller_type": "ProController",
"player_index": "Player4" "player_index": "Player4"
} }

View file

@ -0,0 +1,64 @@
{
"left_joycon_stick": {
"joystick": "Left",
"invert_stick_x": false,
"invert_stick_y": false,
"rotate90_cw": false,
"stick_button": "LeftStick"
},
"right_joycon_stick": {
"joystick": "Right",
"invert_stick_x": false,
"invert_stick_y": false,
"rotate90_cw": false,
"stick_button": "RightStick"
},
"deadzone_left": 0.1,
"deadzone_right": 0.1,
"range_left": 1,
"range_right": 1,
"trigger_threshold": 0.5,
"motion": {
"slot": 0,
"alt_slot": 0,
"mirror_input": false,
"dsu_server_host": "127.0.0.1",
"dsu_server_port": 26760,
"motion_backend": "CemuHook",
"sensitivity": 100,
"gyro_deadzone": 1,
"enable_motion": false
},
"rumble": {
"strong_rumble": 1,
"weak_rumble": 1,
"enable_rumble": true
},
"left_joycon": {
"button_minus": "Back",
"button_l": "LeftShoulder",
"button_zl": "LeftTrigger",
"button_sl": "Unbound",
"button_sr": "Unbound",
"dpad_up": "DpadUp",
"dpad_down": "DpadDown",
"dpad_left": "DpadLeft",
"dpad_right": "DpadRight"
},
"right_joycon": {
"button_plus": "Start",
"button_r": "RightShoulder",
"button_zr": "RightTrigger",
"button_sl": "Unbound",
"button_sr": "Unbound",
"button_x": "Y",
"button_b": "A",
"button_y": "X",
"button_a": "B"
},
"version": 1,
"backend": "GamepadSDL2",
"id": "0-f7390003-28de-0000-ff11-000001000000",
"controller_type": "ProController",
"player_index": "Player1"
}

View file

@ -0,0 +1,59 @@
{
"left_joycon_stick": {
"joystick": "Left",
"invert_stick_x": false,
"invert_stick_y": false,
"rotate90_cw": false,
"stick_button": "LeftStick"
},
"right_joycon_stick": {
"joystick": "Right",
"invert_stick_x": false,
"invert_stick_y": false,
"rotate90_cw": false,
"stick_button": "RightStick"
},
"deadzone_left": 0.1,
"deadzone_right": 0.1,
"range_left": 1,
"range_right": 1,
"trigger_threshold": 0.5,
"motion": {
"motion_backend": "GamepadDriver",
"sensitivity": 100,
"gyro_deadzone": 1,
"enable_motion": false
},
"rumble": {
"strong_rumble": 1,
"weak_rumble": 1,
"enable_rumble": true
},
"left_joycon": {
"button_minus": "Back",
"button_l": "LeftShoulder",
"button_zl": "LeftTrigger",
"button_sl": "Unbound",
"button_sr": "Unbound",
"dpad_up": "DpadUp",
"dpad_down": "DpadDown",
"dpad_left": "DpadLeft",
"dpad_right": "DpadRight"
},
"right_joycon": {
"button_plus": "Start",
"button_r": "RightShoulder",
"button_zr": "RightTrigger",
"button_sl": "Unbound",
"button_sr": "Unbound",
"button_x": "Y",
"button_b": "A",
"button_y": "X",
"button_a": "B"
},
"version": 1,
"backend": "GamepadSDL2",
"id": "1-f7390003-28de-0000-ff11-000001000000",
"controller_type": "ProController",
"player_index": "Player2"
}

View file

@ -0,0 +1,59 @@
{
"left_joycon_stick": {
"joystick": "Left",
"invert_stick_x": false,
"invert_stick_y": false,
"rotate90_cw": false,
"stick_button": "LeftStick"
},
"right_joycon_stick": {
"joystick": "Right",
"invert_stick_x": false,
"invert_stick_y": false,
"rotate90_cw": false,
"stick_button": "RightStick"
},
"deadzone_left": 0.1,
"deadzone_right": 0.1,
"range_left": 1,
"range_right": 1,
"trigger_threshold": 0.5,
"motion": {
"motion_backend": "GamepadDriver",
"sensitivity": 100,
"gyro_deadzone": 1,
"enable_motion": false
},
"rumble": {
"strong_rumble": 1,
"weak_rumble": 1,
"enable_rumble": true
},
"left_joycon": {
"button_minus": "Back",
"button_l": "LeftShoulder",
"button_zl": "LeftTrigger",
"button_sl": "Unbound",
"button_sr": "Unbound",
"dpad_up": "DpadUp",
"dpad_down": "DpadDown",
"dpad_left": "DpadLeft",
"dpad_right": "DpadRight"
},
"right_joycon": {
"button_plus": "Start",
"button_r": "RightShoulder",
"button_zr": "RightTrigger",
"button_sl": "Unbound",
"button_sr": "Unbound",
"button_x": "Y",
"button_b": "A",
"button_y": "X",
"button_a": "B"
},
"version": 1,
"backend": "GamepadSDL2",
"id": "2-f7390003-28de-0000-ff11-000001000000",
"controller_type": "ProController",
"player_index": "Player3"
}

View file

@ -0,0 +1,59 @@
{
"left_joycon_stick": {
"joystick": "Left",
"invert_stick_x": false,
"invert_stick_y": false,
"rotate90_cw": false,
"stick_button": "LeftStick"
},
"right_joycon_stick": {
"joystick": "Right",
"invert_stick_x": false,
"invert_stick_y": false,
"rotate90_cw": false,
"stick_button": "RightStick"
},
"deadzone_left": 0.1,
"deadzone_right": 0.1,
"range_left": 1,
"range_right": 1,
"trigger_threshold": 0.5,
"motion": {
"motion_backend": "GamepadDriver",
"sensitivity": 100,
"gyro_deadzone": 1,
"enable_motion": false
},
"rumble": {
"strong_rumble": 1,
"weak_rumble": 1,
"enable_rumble": true
},
"left_joycon": {
"button_minus": "Back",
"button_l": "LeftShoulder",
"button_zl": "LeftTrigger",
"button_sl": "Unbound",
"button_sr": "Unbound",
"dpad_up": "DpadUp",
"dpad_down": "DpadDown",
"dpad_left": "DpadLeft",
"dpad_right": "DpadRight"
},
"right_joycon": {
"button_plus": "Start",
"button_r": "RightShoulder",
"button_zr": "RightTrigger",
"button_sl": "Unbound",
"button_sr": "Unbound",
"button_x": "Y",
"button_b": "A",
"button_y": "X",
"button_a": "B"
},
"version": 1,
"backend": "GamepadSDL2",
"id": "3-f7390003-28de-0000-ff11-000001000000",
"controller_type": "ProController",
"player_index": "Player4"
}

View file

@ -0,0 +1,64 @@
{
"left_joycon_stick": {
"joystick": "Left",
"invert_stick_x": false,
"invert_stick_y": false,
"rotate90_cw": false,
"stick_button": "LeftStick"
},
"right_joycon_stick": {
"joystick": "Right",
"invert_stick_x": false,
"invert_stick_y": false,
"rotate90_cw": false,
"stick_button": "RightStick"
},
"deadzone_left": 0.1,
"deadzone_right": 0.1,
"range_left": 1,
"range_right": 1,
"trigger_threshold": 0.5,
"motion": {
"slot": 0,
"alt_slot": 0,
"mirror_input": false,
"dsu_server_host": "127.0.0.1",
"dsu_server_port": 26760,
"motion_backend": "CemuHook",
"sensitivity": 100,
"gyro_deadzone": 1,
"enable_motion": true
},
"rumble": {
"strong_rumble": 1,
"weak_rumble": 1,
"enable_rumble": true
},
"left_joycon": {
"button_minus": "Back",
"button_l": "LeftShoulder",
"button_zl": "LeftTrigger",
"button_sl": "Unbound",
"button_sr": "Unbound",
"dpad_up": "DpadUp",
"dpad_down": "DpadDown",
"dpad_left": "DpadLeft",
"dpad_right": "DpadRight"
},
"right_joycon": {
"button_plus": "Start",
"button_r": "RightShoulder",
"button_zr": "RightTrigger",
"button_sl": "Unbound",
"button_sr": "Unbound",
"button_x": "Y",
"button_b": "A",
"button_y": "X",
"button_a": "B"
},
"version": 1,
"backend": "GamepadSDL2",
"id": "0-f6790003-28de-0000-ff11-000001000000",
"controller_type": "ProController",
"player_index": "Player1"
}

View file

@ -594,6 +594,7 @@ prepare_component() {
rm -rf /var/config/Ryujinx rm -rf /var/config/Ryujinx
create_dir /var/config/Ryujinx/system create_dir /var/config/Ryujinx/system
cp -fv $emuconfigs/ryujinx/Config.json $ryujinxconf cp -fv $emuconfigs/ryujinx/Config.json $ryujinxconf
cp -fvr $emuconfigs/ryujinx/profiles /var/config/Ryujinx/
log d "Replacing placeholders in \"$ryujinxconf\"" log d "Replacing placeholders in \"$ryujinxconf\""
sed -i 's#RETRODECKHOMEDIR#'$rdhome'#g' "$ryujinxconf" sed -i 's#RETRODECKHOMEDIR#'$rdhome'#g' "$ryujinxconf"
log i "Linking switch nand/saves folder" log i "Linking switch nand/saves folder"