diff --git a/emu-configs/rpcs3/input_configs/active_profiles.yml b/emu-configs/rpcs3/input_configs/active_profiles.yml new file mode 100644 index 00000000..4f8b6181 --- /dev/null +++ b/emu-configs/rpcs3/input_configs/active_profiles.yml @@ -0,0 +1,2 @@ +Active Profiles: + global: Default \ No newline at end of file diff --git a/emu-configs/rpcs3/input_configs/global/Default.yml b/emu-configs/rpcs3/input_configs/global/Default.yml new file mode 100644 index 00000000..58f42cdf --- /dev/null +++ b/emu-configs/rpcs3/input_configs/global/Default.yml @@ -0,0 +1,546 @@ +Player 1 Input: + Handler: Evdev + Device: Microsoft X-Box 360 pad 0 + Config: + Left Stick Left: LX- + Left Stick Down: LY+ + Left Stick Right: LX+ + Left Stick Up: LY- + Right Stick Left: RX- + Right Stick Down: RY+ + Right Stick Right: RX+ + Right Stick Up: RY- + Start: Start + Select: Select + PS Button: Mode + Square: X + Cross: A + Circle: B + Triangle: Y + Left: Hat0 X- + Down: Hat0 Y+ + Right: Hat0 X+ + Up: Hat0 Y- + R1: TR + R2: RZ+ + R3: Thumb R + L1: TL + L2: LZ+ + L3: Thumb L + Motion Sensor X: + Axis: X + Mirrored: false + Shift: 0 + Motion Sensor Y: + Axis: Y + Mirrored: false + Shift: 0 + Motion Sensor Z: + Axis: Z + Mirrored: false + Shift: 0 + Motion Sensor G: + Axis: RY + Mirrored: false + Shift: 0 + Pressure Intensity Button: "" + Pressure Intensity Percent: 50 + Left Stick Multiplier: 100 + Right Stick Multiplier: 100 + Left Stick Deadzone: 30 + Right Stick Deadzone: 30 + Left Trigger Threshold: 0 + Right Trigger Threshold: 0 + Left Pad Squircling Factor: 5000 + Right Pad Squircling Factor: 5000 + Color Value R: 0 + Color Value G: 0 + Color Value B: 0 + Blink LED when battery is below 20%: true + Use LED as a battery indicator: false + LED battery indicator brightness: 50 + Player LED enabled: true + Enable Large Vibration Motor: true + Enable Small Vibration Motor: true + Switch Vibration Motors: false + Mouse Movement Mode: Relative + Mouse Deadzone X Axis: 60 + Mouse Deadzone Y Axis: 60 + Mouse Acceleration X Axis: 200 + Mouse Acceleration Y Axis: 250 + Left Stick Lerp Factor: 100 + Right Stick Lerp Factor: 100 + Analog Button Lerp Factor: 100 + Trigger Lerp Factor: 100 + Device Class Type: 0 + Vendor ID: 1356 + Product ID: 616 + Buddy Device: "" +Player 2 Input: + Handler: "Null" + Device: "Null" + Config: + Left Stick Left: "" + Left Stick Down: "" + Left Stick Right: "" + Left Stick Up: "" + Right Stick Left: "" + Right Stick Down: "" + Right Stick Right: "" + Right Stick Up: "" + Start: "" + Select: "" + PS Button: "" + Square: "" + Cross: "" + Circle: "" + Triangle: "" + Left: "" + Down: "" + Right: "" + Up: "" + R1: "" + R2: "" + R3: "" + L1: "" + L2: "" + L3: "" + Motion Sensor X: + Axis: "" + Mirrored: false + Shift: 0 + Motion Sensor Y: + Axis: "" + Mirrored: false + Shift: 0 + Motion Sensor Z: + Axis: "" + Mirrored: false + Shift: 0 + Motion Sensor G: + Axis: "" + Mirrored: false + Shift: 0 + Pressure Intensity Button: "" + Pressure Intensity Percent: 50 + Left Stick Multiplier: 100 + Right Stick Multiplier: 100 + Left Stick Deadzone: 0 + Right Stick Deadzone: 0 + Left Trigger Threshold: 0 + Right Trigger Threshold: 0 + Left Pad Squircling Factor: 0 + Right Pad Squircling Factor: 0 + Color Value R: 0 + Color Value G: 0 + Color Value B: 0 + Blink LED when battery is below 20%: true + Use LED as a battery indicator: false + LED battery indicator brightness: 50 + Player LED enabled: true + Enable Large Vibration Motor: true + Enable Small Vibration Motor: true + Switch Vibration Motors: false + Mouse Movement Mode: Relative + Mouse Deadzone X Axis: 60 + Mouse Deadzone Y Axis: 60 + Mouse Acceleration X Axis: 200 + Mouse Acceleration Y Axis: 250 + Left Stick Lerp Factor: 100 + Right Stick Lerp Factor: 100 + Analog Button Lerp Factor: 100 + Trigger Lerp Factor: 100 + Device Class Type: 0 + Vendor ID: 0 + Product ID: 0 + Buddy Device: "Null" +Player 3 Input: + Handler: "Null" + Device: "Null" + Config: + Left Stick Left: "" + Left Stick Down: "" + Left Stick Right: "" + Left Stick Up: "" + Right Stick Left: "" + Right Stick Down: "" + Right Stick Right: "" + Right Stick Up: "" + Start: "" + Select: "" + PS Button: "" + Square: "" + Cross: "" + Circle: "" + Triangle: "" + Left: "" + Down: "" + Right: "" + Up: "" + R1: "" + R2: "" + R3: "" + L1: "" + L2: "" + L3: "" + Motion Sensor X: + Axis: "" + Mirrored: false + Shift: 0 + Motion Sensor Y: + Axis: "" + Mirrored: false + Shift: 0 + Motion Sensor Z: + Axis: "" + Mirrored: false + Shift: 0 + Motion Sensor G: + Axis: "" + Mirrored: false + Shift: 0 + Pressure Intensity Button: "" + Pressure Intensity Percent: 50 + Left Stick Multiplier: 100 + Right Stick Multiplier: 100 + Left Stick Deadzone: 0 + Right Stick Deadzone: 0 + Left Trigger Threshold: 0 + Right Trigger Threshold: 0 + Left Pad Squircling Factor: 0 + Right Pad Squircling Factor: 0 + Color Value R: 0 + Color Value G: 0 + Color Value B: 0 + Blink LED when battery is below 20%: true + Use LED as a battery indicator: false + LED battery indicator brightness: 50 + Player LED enabled: true + Enable Large Vibration Motor: true + Enable Small Vibration Motor: true + Switch Vibration Motors: false + Mouse Movement Mode: Relative + Mouse Deadzone X Axis: 60 + Mouse Deadzone Y Axis: 60 + Mouse Acceleration X Axis: 200 + Mouse Acceleration Y Axis: 250 + Left Stick Lerp Factor: 100 + Right Stick Lerp Factor: 100 + Analog Button Lerp Factor: 100 + Trigger Lerp Factor: 100 + Device Class Type: 0 + Vendor ID: 0 + Product ID: 0 + Buddy Device: "Null" +Player 4 Input: + Handler: "Null" + Device: "Null" + Config: + Left Stick Left: "" + Left Stick Down: "" + Left Stick Right: "" + Left Stick Up: "" + Right Stick Left: "" + Right Stick Down: "" + Right Stick Right: "" + Right Stick Up: "" + Start: "" + Select: "" + PS Button: "" + Square: "" + Cross: "" + Circle: "" + Triangle: "" + Left: "" + Down: "" + Right: "" + Up: "" + R1: "" + R2: "" + R3: "" + L1: "" + L2: "" + L3: "" + Motion Sensor X: + Axis: "" + Mirrored: false + Shift: 0 + Motion Sensor Y: + Axis: "" + Mirrored: false + Shift: 0 + Motion Sensor Z: + Axis: "" + Mirrored: false + Shift: 0 + Motion Sensor G: + Axis: "" + Mirrored: false + Shift: 0 + Pressure Intensity Button: "" + Pressure Intensity Percent: 50 + Left Stick Multiplier: 100 + Right Stick Multiplier: 100 + Left Stick Deadzone: 0 + Right Stick Deadzone: 0 + Left Trigger Threshold: 0 + Right Trigger Threshold: 0 + Left Pad Squircling Factor: 0 + Right Pad Squircling Factor: 0 + Color Value R: 0 + Color Value G: 0 + Color Value B: 0 + Blink LED when battery is below 20%: true + Use LED as a battery indicator: false + LED battery indicator brightness: 50 + Player LED enabled: true + Enable Large Vibration Motor: true + Enable Small Vibration Motor: true + Switch Vibration Motors: false + Mouse Movement Mode: Relative + Mouse Deadzone X Axis: 60 + Mouse Deadzone Y Axis: 60 + Mouse Acceleration X Axis: 200 + Mouse Acceleration Y Axis: 250 + Left Stick Lerp Factor: 100 + Right Stick Lerp Factor: 100 + Analog Button Lerp Factor: 100 + Trigger Lerp Factor: 100 + Device Class Type: 0 + Vendor ID: 0 + Product ID: 0 + Buddy Device: "Null" +Player 5 Input: + Handler: "Null" + Device: "Null" + Config: + Left Stick Left: "" + Left Stick Down: "" + Left Stick Right: "" + Left Stick Up: "" + Right Stick Left: "" + Right Stick Down: "" + Right Stick Right: "" + Right Stick Up: "" + Start: "" + Select: "" + PS Button: "" + Square: "" + Cross: "" + Circle: "" + Triangle: "" + Left: "" + Down: "" + Right: "" + Up: "" + R1: "" + R2: "" + R3: "" + L1: "" + L2: "" + L3: "" + Motion Sensor X: + Axis: "" + Mirrored: false + Shift: 0 + Motion Sensor Y: + Axis: "" + Mirrored: false + Shift: 0 + Motion Sensor Z: + Axis: "" + Mirrored: false + Shift: 0 + Motion Sensor G: + Axis: "" + Mirrored: false + Shift: 0 + Pressure Intensity Button: "" + Pressure Intensity Percent: 50 + Left Stick Multiplier: 100 + Right Stick Multiplier: 100 + Left Stick Deadzone: 0 + Right Stick Deadzone: 0 + Left Trigger Threshold: 0 + Right Trigger Threshold: 0 + Left Pad Squircling Factor: 0 + Right Pad Squircling Factor: 0 + Color Value R: 0 + Color Value G: 0 + Color Value B: 0 + Blink LED when battery is below 20%: true + Use LED as a battery indicator: false + LED battery indicator brightness: 50 + Player LED enabled: true + Enable Large Vibration Motor: true + Enable Small Vibration Motor: true + Switch Vibration Motors: false + Mouse Movement Mode: Relative + Mouse Deadzone X Axis: 60 + Mouse Deadzone Y Axis: 60 + Mouse Acceleration X Axis: 200 + Mouse Acceleration Y Axis: 250 + Left Stick Lerp Factor: 100 + Right Stick Lerp Factor: 100 + Analog Button Lerp Factor: 100 + Trigger Lerp Factor: 100 + Device Class Type: 0 + Vendor ID: 0 + Product ID: 0 + Buddy Device: "Null" +Player 6 Input: + Handler: "Null" + Device: "Null" + Config: + Left Stick Left: "" + Left Stick Down: "" + Left Stick Right: "" + Left Stick Up: "" + Right Stick Left: "" + Right Stick Down: "" + Right Stick Right: "" + Right Stick Up: "" + Start: "" + Select: "" + PS Button: "" + Square: "" + Cross: "" + Circle: "" + Triangle: "" + Left: "" + Down: "" + Right: "" + Up: "" + R1: "" + R2: "" + R3: "" + L1: "" + L2: "" + L3: "" + Motion Sensor X: + Axis: "" + Mirrored: false + Shift: 0 + Motion Sensor Y: + Axis: "" + Mirrored: false + Shift: 0 + Motion Sensor Z: + Axis: "" + Mirrored: false + Shift: 0 + Motion Sensor G: + Axis: "" + Mirrored: false + Shift: 0 + Pressure Intensity Button: "" + Pressure Intensity Percent: 50 + Left Stick Multiplier: 100 + Right Stick Multiplier: 100 + Left Stick Deadzone: 0 + Right Stick Deadzone: 0 + Left Trigger Threshold: 0 + Right Trigger Threshold: 0 + Left Pad Squircling Factor: 0 + Right Pad Squircling Factor: 0 + Color Value R: 0 + Color Value G: 0 + Color Value B: 0 + Blink LED when battery is below 20%: true + Use LED as a battery indicator: false + LED battery indicator brightness: 50 + Player LED enabled: true + Enable Large Vibration Motor: true + Enable Small Vibration Motor: true + Switch Vibration Motors: false + Mouse Movement Mode: Relative + Mouse Deadzone X Axis: 60 + Mouse Deadzone Y Axis: 60 + Mouse Acceleration X Axis: 200 + Mouse Acceleration Y Axis: 250 + Left Stick Lerp Factor: 100 + Right Stick Lerp Factor: 100 + Analog Button Lerp Factor: 100 + Trigger Lerp Factor: 100 + Device Class Type: 0 + Vendor ID: 0 + Product ID: 0 + Buddy Device: "Null" +Player 7 Input: + Handler: "Null" + Device: "Null" + Config: + Left Stick Left: "" + Left Stick Down: "" + Left Stick Right: "" + Left Stick Up: "" + Right Stick Left: "" + Right Stick Down: "" + Right Stick Right: "" + Right Stick Up: "" + Start: "" + Select: "" + PS Button: "" + Square: "" + Cross: "" + Circle: "" + Triangle: "" + Left: "" + Down: "" + Right: "" + Up: "" + R1: "" + R2: "" + R3: "" + L1: "" + L2: "" + L3: "" + Motion Sensor X: + Axis: "" + Mirrored: false + Shift: 0 + Motion Sensor Y: + Axis: "" + Mirrored: false + Shift: 0 + Motion Sensor Z: + Axis: "" + Mirrored: false + Shift: 0 + Motion Sensor G: + Axis: "" + Mirrored: false + Shift: 0 + Pressure Intensity Button: "" + Pressure Intensity Percent: 50 + Left Stick Multiplier: 100 + Right Stick Multiplier: 100 + Left Stick Deadzone: 0 + Right Stick Deadzone: 0 + Left Trigger Threshold: 0 + Right Trigger Threshold: 0 + Left Pad Squircling Factor: 0 + Right Pad Squircling Factor: 0 + Color Value R: 0 + Color Value G: 0 + Color Value B: 0 + Blink LED when battery is below 20%: true + Use LED as a battery indicator: false + LED battery indicator brightness: 50 + Player LED enabled: true + Enable Large Vibration Motor: true + Enable Small Vibration Motor: true + Switch Vibration Motors: false + Mouse Movement Mode: Relative + Mouse Deadzone X Axis: 60 + Mouse Deadzone Y Axis: 60 + Mouse Acceleration X Axis: 200 + Mouse Acceleration Y Axis: 250 + Left Stick Lerp Factor: 100 + Right Stick Lerp Factor: 100 + Analog Button Lerp Factor: 100 + Trigger Lerp Factor: 100 + Device Class Type: 0 + Vendor ID: 0 + Product ID: 0 + Buddy Device: "Null" \ No newline at end of file diff --git a/functions.sh b/functions.sh index 8c4372bb..cbedf1a3 100644 --- a/functions.sh +++ b/functions.sh @@ -746,7 +746,7 @@ check_for_version_update() { choice=$(zenity --icon-name=net.retrodeck.retrodeck --info --no-wrap --ok-label="Yes" --extra-button="No" --extra-button="Ignore this version" \ --window-icon="/app/share/icons/hicolor/scalable/apps/net.retrodeck.retrodeck.svg" \ --title "RetroDECK Update Available" \ - --text="There is a more recent build of the RetroDECK cooker branch. Would you like to update to it? If you would like to skip reminders about this version, click \"Ignore this version\". You will be reminded again at the next version update.\n\nIf you would like to disable these update notifications entirely, disable Online Update Checks in the Configurator.") + --text="There is a more recent build of the RetroDECK cooker branch. Would you like to update to it?\nIf you would like to skip reminders about this version, click \"Ignore this version\".\nYou will be reminded again at the next version update.\n\nIf you would like to disable these update notifications entirely, disable Online Update Checks in the Configurator.") rc=$? # Capture return code, as "Yes" button has no text value if [[ $rc == "1" ]]; then # If any button other than "Yes" was clicked if [[ $choice == "Ignore this version" ]]; then diff --git a/rd-submodules/es-de/es-de-retrodeck-mods.patch b/rd-submodules/es-de/es-de-retrodeck-mods.patch index 3902e1b6..f5f49bbd 100644 --- a/rd-submodules/es-de/es-de-retrodeck-mods.patch +++ b/rd-submodules/es-de/es-de-retrodeck-mods.patch @@ -1,10 +1,3 @@ -diff -au1r emulationstation-de/CMake/Packages/FindFFmpeg.cmake emulationstation-de/CMake/Packages/FindFFmpeg.cmake ---- emulationstation-de/CMake/Packages/FindFFmpeg.cmake 2023-04-12 09:08:12.384935336 -0400 -+++ emulationstation-de/CMake/Packages/FindFFmpeg.cmake 2023-04-19 08:33:48.816378155 -0400 -@@ -29,2 +29,3 @@ - /usr/freeware/include -+ /app/lib/ffmpeg - NO_DEFAULT_PATH diff -au1r emulationstation-de/es-app/src/guis/GuiMenu.cpp emulationstation-de/es-app/src/guis/GuiMenu.cpp --- emulationstation-de/es-app/src/guis/GuiMenu.cpp 2023-04-12 09:08:12.394935336 -0400 +++ emulationstation-de/es-app/src/guis/GuiMenu.cpp 2023-04-12 16:25:04.618753274 -0400