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

.github/workflows/cooker-selfhosted.yml

@@ -30,12 +30,21 @@ jobs:
         run: sudo umount -f /home/ubuntu/actions-runner/_work/RetroDECK/RetroDECK/.flatpak-builder/rofiles/*
         continue-on-error: true
     
-      - name: Generate build ID
-        id: generating_buildid
-        run: echo "##[set-output name=build-id;]$(echo "$( git rev-parse --short HEAD )")"
-      
       - uses: actions/checkout@v3
 
+      - name: Generate build ID
+        run: |
+          word1=$(curl -s https://random-word-api.herokuapp.com/word?length=5 | tr -d '[]"')
+          capitalized_word1="$(tr '[:lower:]' '[:upper:]' <<< ${word1:0:1})${word1:1}"
+          word2=$(curl -s https://random-word-api.herokuapp.com/word?length=5 | tr -d '[]"')
+          capitalized_word2="$(tr '[:lower:]' '[:upper:]' <<< ${word2:0:1})${word2:1}"
+          result=$capitalized_word1$capitalized_word2
+          echo $result >> ${GITHUB_WORKSPACE}/buildid
+          ls -lah ${GITHUB_WORKSPACE}         # DEBUG
+          cat ${GITHUB_WORKSPACE}/buildid     # DEBUG
+          echo "buildid=$result" >> $GITHUB_ENV
+          echo "VersionID is $result"
+
       - name: Initialize environment
         run: |
           git pull
@@ -78,7 +87,7 @@ jobs:
       - name: Publish the flatpak in a new cooker release
         uses: ncipollo/release-action@v1
         with:
-          tag: "${{ env.GITHUB_REF_SLUG }}-${{ steps.generating_buildid.outputs.build-id }}"
+          tag: "${{ env.GITHUB_REF_SLUG }}-${{ env.buildid }}"
           body: |
             # Release Notes (Cooker)
             This is a cooker snapshot based on the commit: ${{ github.event.repository.full_name }}@${{github.sha}}.

emu-configs/PCSX2/PCSX2.ini

@@ -334,6 +334,7 @@ ToggleVideoCapture = Keyboard/Control & Keyboard/V
 IncreaseUpscaleMultiplier = Keyboard/Control & Keyboard/U
 DecreaseUpscaleMultiplier = Keyboard/Control & Keyboard/Y
 CycleAspectRatio = Keyboard/Control & Keyboard/W
+ShutdownVM = Keyboard/Control & Keyboard/Escape
 ResetVM = Keyboard/Control & Keyboard/R
 
 

emu-configs/defaults/retrodeck/RetroDECK_controller_config.vdf

@@ -1,18 +1,18 @@
 "controller_mappings"
 {
 	"version"		"3"
-	"revision"		"1423"
+	"revision"		"1482"
-	"title"		"RetroDECK - Official Layout v.0.7"
+	"title"		"RetroDECK official layout v.0.7"
 	"description"		"The Official RetroDECK Layout"
 	"creator"		"76561197985498748"
 	"progenitor"		""
 	"url"		"autosave:///home/deck/.local/share/Steam/steamapps/common/Steam Controller Configs/25233020/config/retrodeck/controller_neptune.vdf"
-	"export_type"		"personal_cloud"
+	"export_type"		"template"
 	"controller_type"		"controller_neptune"
 	"controller_caps"		"23117823"
 	"major_revision"		"0"
 	"minor_revision"		"0"
-	"Timestamp"		"-593495904"
+	"Timestamp"		"-608407264"
 	"actions"
 	{
 		"Default"
@@ -5595,8 +5595,8 @@
 					{
 						"bindings"
 						{
-							"binding"		"key_press LEFT_ALT, Freelook, RD-preferences-system-search.png, "
+							"binding"		"key_press LEFT_ALT, Freelook Mode - Toggle, RD-preferences-system-search.png, "
-							"binding"		"key_press Y, Freelook, RD-preferences-system-search.png, "
+							"binding"		"key_press F, Freelook Mode - Toggle, RD-preferences-system-search.png, "
 						}
 					}
 				}
@@ -5655,6 +5655,23 @@
 				{
 				}
 			}
+			"touch_menu_button_6"
+			{
+				"activators"
+				{
+					"Full_Press"
+					{
+						"bindings"
+						{
+							"binding"		"key_press LEFT_ALT, Reset Freelook Camera, RD-preferences-system-search.png, #232323 #AD0000"
+							"binding"		"key_press R, Reset Freelook Camera, RD-preferences-system-search.png, #232323 #AD0000"
+						}
+					}
+				}
+				"disabled_activators"
+				{
+				}
+			}
 		}
 		"settings"
 		{
@@ -7127,23 +7144,6 @@
 				{
 				}
 			}
-			"touch_menu_button_3"
-			{
-				"activators"
-				{
-					"Full_Press"
-					{
-						"bindings"
-						{
-							"binding"		"key_press LEFT_ALT, Swap Dual-Screenlayout, RD-preferences-system-windows-actions.png, #232323 #FFFFFF"
-							"binding"		"key_press 0, Swap Dual-Screenlayout, RD-preferences-system-windows-actions.png, #232323 #FFFFFF"
-						}
-					}
-				}
-				"disabled_activators"
-				{
-				}
-			}
 		}
 		"settings"
 		{
@@ -7873,12 +7873,8 @@
 					{
 						"bindings"
 						{
-							"binding"		"xinput_button RSTICK_RIGHT, , "
+							"binding"		"key_press LEFT_SHIFT, , "
-						}
+							"binding"		"key_press D, , "
-						"settings"
-						{
-							"repeat_rate"		"1000"
-							"interruptable"		"0"
 						}
 					}
 				}
@@ -7894,12 +7890,8 @@
 					{
 						"bindings"
 						{
-							"binding"		"xinput_button RSTICK_LEFT, , "
+							"binding"		"key_press LEFT_SHIFT, , "
-						}
+							"binding"		"key_press A, , "
-						"settings"
-						{
-							"repeat_rate"		"1000"
-							"interruptable"		"0"
 						}
 					}
 				}
@@ -7971,40 +7963,6 @@
 				{
 				}
 			}
-			"dpad_east"
-			{
-				"activators"
-				{
-					"Full_Press"
-					{
-						"bindings"
-						{
-							"binding"		"key_press LEFT_SHIFT, , "
-							"binding"		"key_press D, , "
-						}
-					}
-				}
-				"disabled_activators"
-				{
-				}
-			}
-			"dpad_west"
-			{
-				"activators"
-				{
-					"Full_Press"
-					{
-						"bindings"
-						{
-							"binding"		"key_press LEFT_SHIFT, , "
-							"binding"		"key_press A, , "
-						}
-					}
-				}
-				"disabled_activators"
-				{
-				}
-			}
 			"click"
 			{
 				"activators"
@@ -8029,6 +7987,16 @@
 		}
 	}
 	"group"
+	{
+		"id"		"221"
+		"mode"		"reference"
+		"description"		""
+		"settings"
+		{
+			"referenced_mode"		"33"
+		}
+	}
+	"group"
 	{
 		"id"		"34"
 		"mode"		"switches"
@@ -10556,7 +10524,8 @@
 			"0"		"button_diamond active"
 			"1"		"left_trackpad inactive"
 			"11"		"left_trackpad inactive"
-			"33"		"left_trackpad active"
+			"33"		"left_trackpad inactive"
+			"221"		"left_trackpad active"
 			"2"		"right_trackpad inactive"
 			"6"		"right_trackpad inactive"
 			"10"		"right_trackpad inactive"

emu-configs/ppssppsdl/controls.ini

@@ -16,18 +16,19 @@ An.Down = 1-39,10-4002
 An.Left = 1-38,10-4001
 An.Right = 1-40,10-4000
 Analog limiter = 1-60
-RapidFire = 1-59
+RapidFire = 1-113:1-48
-Fast-forward = 1-157
+Fast-forward = 1-113:1-157
 SpeedToggle = 1-68
-Pause = 1-41,10-109,10-104,1-111
+Pause = 1-113:1-41
-Rewind = 1-156
+Rewind = 1-113:1-156
-Save State = 1-47
+Save State = 1-113:1-47
-Audio/Video Recording = 1-50
+Load State = 1-113:1-29
-Load State = 1-29
+Screenshot = 1-113:1-52
-Screenshot = 1-52
+Home = 1-111
-Home = 10-107
+Audio/Video Recording = 1-113:1-50
+Next Slot = 1-113:1-39
+Toggle Fullscreen = 1-113:1-66
 RightAn.Up = 10-4007
 RightAn.Down = 10-4006
 RightAn.Left = 10-4005
 RightAn.Right = 10-4004
-Screen = 1-61

emu-configs/ppssppsdl/ppsspp.ini

@@ -72,6 +72,11 @@ UITint = 0.000000
 UISaturation = 1.000000
 ShowMenuBar = True
 IgnoreCompatSettings = 
+RewindSnapshotInterval = 0
+WindowX = 0
+WindowY = 0
+WindowWidth = 1324
+WindowHeight = 754
 [CPU]
 CPUCore = 1
 SeparateSASThread = True
@@ -158,6 +163,8 @@ DisplayStretch = False
 ReplaceTexturesAllowLate = True
 SkipGPUReadbacks = False
 GpuLogProfiler = False
+iShowStatusFlags = 0
+DisplayIntegerScale = False
 [Sound]
 Enable = True
 AudioBackend = 0
@@ -502,3 +509,10 @@ VRCanvasDistance = 12.000000
 VRFieldOfView = 100.000000
 VRHeadUpDisplayScale = 0.300000
 VRMotionLength = 0.500000
+VRForce72Hz = True
+VRManualForceVR = False
+VRRescaleHUD = True
+VRCameraPitch = 0
+VRHeadRotationScale = 5.000000
+VRHeadRotationEnabled = False
+VRHeadRotationSmoothing = False

emu-configs/retroarch/retroarch-core-options.cfg

@@ -159,6 +159,7 @@ dolphin_wait_for_shaders = "disabled"
 dolphin_widescreen = "enabled"
 dolphin_widescreen_hack = "disabled"
 dolphin_wiimote_continuous_scanning = "disabled"
+dosbox_pure_savestate = "off"
 duckstation_BIOS.PatchFastBoot = "true"
 duckstation_BIOS.PathNTSCJ = "scph5500.bin"
 duckstation_BIOS.PathNTSCU = "scph5501.bin"
@@ -401,7 +402,7 @@ melonds_screen_gap = "0"
 melonds_screen_layout = "Top/Bottom"
 melonds_swapscreen_mode = "Toggle"
 melonds_threaded_renderer = "disabled"
-melonds_touch_mode = "enabled"
+melonds_touch_mode = "Touch"
 mgba_allow_opposing_directions = "no"
 mgba_audio_low_pass_filter = "disabled"
 mgba_audio_low_pass_range = "60"

net.retrodeck.retrodeck.yml

@@ -78,10 +78,11 @@ modules:
         mkdir -p ${FLATPAK_DEST}/retrodeck/
         if [[ $VERSION == *"cooker"* ]];
         then
-          VERSION="$VERSION-[$(git rev-parse --short HEAD)]"
+          VERSION="$VERSION[$(cat ./buildid)]"
         fi
         echo $VERSION >> ${FLATPAK_DEST}/retrodeck/version
         cat ${FLATPAK_DEST}/retrodeck/version
+        echo "Version is $VERSION"
     sources:
       - type: git
         url: https://github.com/XargonWan/RetroDECK.git
@@ -566,8 +567,8 @@ modules:
       - ln -s "${FLATPAK_DEST}/pcsx2-qt/usr/bin/pcsx2-qt" "${FLATPAK_DEST}/bin/pcsx2-qt"
     sources:
       - type: file
-        url: https://github.com/PCSX2/pcsx2/releases/download/v1.7.4303/pcsx2-v1.7.4303-linux-AppImage-64bit-Qt.AppImage
+        url: https://github.com/PCSX2/pcsx2/releases/download/v1.7.4466/pcsx2-v1.7.4466-linux-AppImage-64bit-Qt.AppImage
-        sha256: 5680bcc510f0898e6078c60ef2ef1d987b8414e1296c5ff88bd87933e4a314b3
+        sha256: 5747fc3760d2064bbd8b4b1d463984381bf206e30631502b765d71b7fce94459
 
   # PCSX2 - END
 

rd-submodules/retroarch

@@ -1 +1 @@
-Subproject commit 0b1cfb79e591e10488a3262d6b38db843c39a409
+Subproject commit 717b78093797270877ec416e58082f1c71d435d8