Skip to content

[pull] master from hrydgard:master #571

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
pull merged 12 commits into from
May 1, 2026
Merged

[pull] master from hrydgard:master #571

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
15a8987
Bump jurplel/install-qt-action from 4.3.0 to 4.3.1
dependabot[bot] May 1, 2026
61074d2
Bump actions/cache from 5.0.4 to 5.0.5
dependabot[bot] May 1, 2026
2d32a3d
Bump softprops/action-gh-release from 2.6.1 to 3.0.0
dependabot[bot] May 1, 2026
861b0e9
Bump hendrikmuhs/ccache-action from 1.2.20 to 1.2.23
dependabot[bot] May 1, 2026
e76adc4
Merge remote-tracking branch 'origin/dependabot/github_actions/action…
hrydgard May 1, 2026
329cfa4
Merge remote-tracking branch 'origin/dependabot/github_actions/hendri…
hrydgard May 1, 2026
76f97f6
Merge remote-tracking branch 'origin/dependabot/github_actions/jurple…
hrydgard May 1, 2026
c9abf79
Merge remote-tracking branch 'origin/dependabot/github_actions/softpr…
hrydgard May 1, 2026
09d5858
Bump rcheevos to latest
hrydgard May 1, 2026
468a01c
Minor tweaks to images.svg
hrydgard May 1, 2026
149cee5
Remove psp.gameplayer.club from the official list (rule violation)
hrydgard May 1, 2026
ede551f
Merge pull request #21622 from hrydgard/dependabot-rollup
hrydgard May 1, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/appimage.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ jobs:
git fetch --deepen=15000 --no-recurse-submodules --tags --force upstream || exit 0

- name: Set up ccache for ${{ matrix.id }}
uses: actions/cache@v5.0.4
uses: actions/cache@v5.0.5
with:
path: ${{ env.CCACHE_DIR }}
key: ${{ runner.os }}-ccache-${{ matrix.id }}-${{ github.sha }}
Expand Down Expand Up @@ -272,7 +272,7 @@ jobs:
path: artifacts/

- name: Upload release
uses: softprops/action-gh-release@153bb8e04406b158c6c84fc1615b65b24149a1fe # v2.6.1
uses: softprops/action-gh-release@b4309332981a82ec1c5618f44dd2e27cc8bfbfda # v3.0.0
if: github.ref_type == 'tag'
with:
token: ${{ secrets.GITHUB_TOKEN }}
Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@ jobs:
Compress-Archive -Path "ppsspp/*" -Update -DestinationPath "releases/PPSSPP-${{ github.ref_name }}-Windows-${{ matrix.platform }}.zip"

- name: Upload release
uses: softprops/action-gh-release@153bb8e04406b158c6c84fc1615b65b24149a1fe # v2.6.1
uses: softprops/action-gh-release@b4309332981a82ec1c5618f44dd2e27cc8bfbfda # v3.0.0
if: github.ref_type == 'tag'
with:
files: releases/*.zip
Expand Down Expand Up @@ -264,7 +264,7 @@ jobs:
git fetch --deepen=15000 --no-recurse-submodules --tags || exit 0

- name: Install Qt
uses: jurplel/install-qt-action@d325aaf2a8baeeda41ad0b5d39f84a6af9bcf005 # v4.3.0
uses: jurplel/install-qt-action@48d3ad6db93f3627c8ee7a0454bc6f3744f7e730 # v4.3.1
if: matrix.extra == 'qt'
with:
cache: true
Expand Down Expand Up @@ -309,7 +309,7 @@ jobs:
echo "#define PPSSPP_GIT_VERSION_NO_UPDATE 1" >> git-version.cpp

- name: Setup ccache
uses: hendrikmuhs/ccache-action@5ebbd400eff9e74630f759d94ddd7b6c26299639 # v1.2.20
uses: hendrikmuhs/ccache-action@d62db5f07c26379fc4b4e0916f098a92573c3b03 # v1.2.23
# Disable ccache on macos for now, it's become buggy for some reason.
if: matrix.id != 'macos'
with:
Expand Down Expand Up @@ -391,7 +391,7 @@ jobs:
run: mv PPSSPPSDL.zip PPSSPPSDL-macOS-${GITHUB_REF_NAME}.zip

- name: Upload macOS & iOS release
uses: softprops/action-gh-release@153bb8e04406b158c6c84fc1615b65b24149a1fe # v2.6.1
uses: softprops/action-gh-release@b4309332981a82ec1c5618f44dd2e27cc8bfbfda # v3.0.0
if: github.ref_type == 'tag' && (matrix.id == 'macos' || matrix.id == 'ios')
with:
files: |
Expand Down Expand Up @@ -478,7 +478,7 @@ jobs:
chown -R $(id -u):$(id -g) $PWD

- name: Setup ccache
uses: hendrikmuhs/ccache-action@5ebbd400eff9e74630f759d94ddd7b6c26299639 # v1.2.20
uses: hendrikmuhs/ccache-action@d62db5f07c26379fc4b4e0916f098a92573c3b03 # v1.2.23

- name: Compile ffmpeg
run: |
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/manual_generate_ipa.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ jobs:
echo ${GIT_VERSION#v} > build-ios/PPSSPP.app/Version.txt
- name: Setup ccache
uses: hendrikmuhs/ccache-action@5ebbd400eff9e74630f759d94ddd7b6c26299639 # v1.2.20
uses: hendrikmuhs/ccache-action@d62db5f07c26379fc4b4e0916f098a92573c3b03 # v1.2.23
with:
key: ios
create-symlink: true
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/tarball.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ jobs:
echo "tarball=$TARBALL" >> $GITHUB_OUTPUT
- name: Upload tarball
uses: softprops/action-gh-release@153bb8e04406b158c6c84fc1615b65b24149a1fe # v2.6.1
uses: softprops/action-gh-release@b4309332981a82ec1c5618f44dd2e27cc8bfbfda # v3.0.0
with:
files: ${{ steps.archive.outputs.tarball }}
token: ${{ secrets.GITHUB_TOKEN }}
9 changes: 0 additions & 9 deletions assets/adhoc-servers.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,15 +111,6 @@
"status_data_json": "https://adhoc.gamesnexus.ovh/data.json",
"status_web": "https://adhoc.gamesnexus.ovh"
},
{
"name": "Sony PSP & PSVita Fans",
"host": "psp.gameplayer.club",
"discord": "",
"web": "https://psp.gameplayer.club/",
"location": "Unknown",
"description": "For players looking to play any games",
"data_mode": "P2P"
},
{
"name": "CVN-Play",
"host": "cvn-play.top",
Expand Down
58 changes: 25 additions & 33 deletions assets/ui_images/images.svg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion ext/rcheevos
Open in desktop
Submodule rcheevos updated 9 files
+2 −1 include/rc_error.h
+1 −1 src/rapi/rc_api_common.c
+12 −4 src/rc_client.c
+1 −0 src/rc_util.c
+3 −2 src/rcheevos/richpresence.c
+7 −1 src/rcheevos/value.c
+1 −1 test/rcheevos/test_lboard.c
+16 −2 test/rcheevos/test_richpresence.c
+107 −0 test/test_rc_client.c
Loading