diff --git a/.github/workflows/canary.yml b/.github/workflows/canary.yml index a24d8b83f..954bc98b9 100644 --- a/.github/workflows/canary.yml +++ b/.github/workflows/canary.yml @@ -102,51 +102,49 @@ jobs: chmod +x Ryujinx.sh Ryujinx tar -czvf ../release_output/ryujinx-canary-${{ steps.version_info.outputs.build_version }}-${{ matrix.platform.zip_os_name }}.tar.gz ../publish popd - + gli --access-token=${{ secrets.GITLAB_TOKEN }} --project=ryubing/canary --command=UploadGenericPackage "Ryubing-Canary|${{ steps.version_info.outputs.build_version }}|release_output/ryujinx-canary-${{ steps.version_info.outputs.build_version }}-${{ matrix.platform.zip_os_name }}.tar.gz" shell: bash - - # If anyone wants to look into why appimagetool randomly errors with exit code 8, that would be cool - -# - name: Build AppImage (Linux) -# if: matrix.platform.os == 'ubuntu-latest' -# run: | -# BUILD_VERSION="${{ steps.version_info.outputs.build_version }}" -# PLATFORM_NAME="${{ matrix.platform.name }}" -# -# sudo apt install -y zsync desktop-file-utils appstream -# -# mkdir -p tools -# export PATH="$PATH:$(readlink -f tools)" -# -# # Setup appimagetool -# wget -q -O tools/appimagetool "https://github.com/AppImage/appimagetool/releases/download/continuous/appimagetool-x86_64.AppImage" -# chmod +x tools/appimagetool -# chmod +x distribution/linux/appimage/build-appimage.sh -# -# # Explicitly set $ARCH for appimagetool ($ARCH_NAME is for the file name) -# if [ "$PLATFORM_NAME" = "linux-x64" ]; then -# ARCH_NAME=x64 -# export ARCH=x86_64 -# elif [ "$PLATFORM_NAME" = "linux-arm64" ]; then -# ARCH_NAME=arm64 -# export ARCH=aarch64 -# else -# echo "Unexpected PLATFORM_NAME "$PLATFORM_NAME"" -# exit 1 -# fi -# -# export UFLAG="gh-releases-zsync|${{ secrets.RC_OWNER }}${{ secrets.RC_CANARY_NAME }}|latest|*-$ARCH_NAME.AppImage.zsync" -# BUILDDIR=publish OUTDIR=publish_appimage distribution/linux/appimage/build-appimage.sh -# -# pushd publish_appimage -# mv Ryujinx.AppImage ../release_output/ryujinx-canary-$BUILD_VERSION-$ARCH_NAME.AppImage -# mv Ryujinx.AppImage.zsync ../release_output/ryujinx-canary-$BUILD_VERSION-$ARCH_NAME.AppImage.zsync -# popd -# -# gli --access-token=${{ secrets.GITLAB_TOKEN }} --project=ryubing/canary --command=UploadGenericPackage "Ryubing-Canary|${{ steps.version_info.outputs.build_version }}|release_output/ryujinx-canary-$BUILD_VERSION-$ARCH_NAME.AppImage" -# gli --access-token=${{ secrets.GITLAB_TOKEN }} --project=ryubing/canary --command=UploadGenericPackage "Ryubing-Canary|${{ steps.version_info.outputs.build_version }}|release_output/ryujinx-canary-$BUILD_VERSION-$ARCH_NAME.AppImage.zsync" -# shell: bash + + - name: Build AppImage (Linux) + if: matrix.platform.os == 'ubuntu-latest' + run: | + BUILD_VERSION="${{ steps.version_info.outputs.build_version }}" + PLATFORM_NAME="${{ matrix.platform.name }}" + + sudo apt install -y zsync desktop-file-utils appstream + + mkdir -p tools + export PATH="$PATH:$(readlink -f tools)" + + # Setup appimagetool + wget -q -O tools/appimagetool "https://github.com/AppImage/appimagetool/releases/download/continuous/appimagetool-x86_64.AppImage" + chmod +x tools/appimagetool + chmod +x distribution/linux/appimage/build-appimage.sh + + # Explicitly set $ARCH for appimagetool ($ARCH_NAME is for the file name) + if [ "$PLATFORM_NAME" = "linux-x64" ]; then + ARCH_NAME=x64 + export ARCH=x86_64 + elif [ "$PLATFORM_NAME" = "linux-arm64" ]; then + ARCH_NAME=arm64 + export ARCH=aarch64 + else + echo "Unexpected PLATFORM_NAME "$PLATFORM_NAME"" + exit 1 + fi + + export UFLAG="gh-releases-zsync|${{ secrets.RC_OWNER }}${{ secrets.RC_CANARY_NAME }}|latest|*-$ARCH_NAME.AppImage.zsync" + BUILDDIR=publish OUTDIR=publish_appimage distribution/linux/appimage/build-appimage.sh + + pushd publish_appimage + mv Ryujinx.AppImage ../release_output/ryujinx-canary-$BUILD_VERSION-$ARCH_NAME.AppImage + mv Ryujinx.AppImage.zsync ../release_output/ryujinx-canary-$BUILD_VERSION-$ARCH_NAME.AppImage.zsync + popd + + gli --access-token=${{ secrets.GITLAB_TOKEN }} --project=ryubing/canary --command=UploadGenericPackage "Ryubing-Canary|${{ steps.version_info.outputs.build_version }}|release_output/ryujinx-canary-$BUILD_VERSION-$ARCH_NAME.AppImage" + gli --access-token=${{ secrets.GITLAB_TOKEN }} --project=ryubing/canary --command=UploadGenericPackage "Ryubing-Canary|${{ steps.version_info.outputs.build_version }}|release_output/ryujinx-canary-$BUILD_VERSION-$ARCH_NAME.AppImage.zsync" + shell: bash macos_release: name: Release MacOS universal diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index e1d85f63e..3895b160e 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -96,48 +96,46 @@ jobs: shell: bash env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + + - name: Build AppImage (Linux) + if: matrix.platform.os == 'ubuntu-latest' + run: | + BUILD_VERSION="${{ steps.version_info.outputs.build_version }}" + PLATFORM_NAME="${{ matrix.platform.name }}" + + sudo apt install -y zsync desktop-file-utils appstream + + mkdir -p tools + export PATH="$PATH:$(readlink -f tools)" + + # Setup appimagetool + wget -q -O tools/appimagetool "https://github.com/AppImage/appimagetool/releases/download/continuous/appimagetool-x86_64.AppImage" + chmod +x tools/appimagetool + chmod +x distribution/linux/appimage/build-appimage.sh + + # Explicitly set $ARCH for appimagetool ($ARCH_NAME is for the file name) + if [ "$PLATFORM_NAME" = "linux-x64" ]; then + ARCH_NAME=x64 + export ARCH=x86_64 + elif [ "$PLATFORM_NAME" = "linux-arm64" ]; then + ARCH_NAME=arm64 + export ARCH=aarch64 + else + echo "Unexpected PLATFORM_NAME "$PLATFORM_NAME"" + exit 1 + fi + + export UFLAG="gh-releases-zsync|${{ github.repository_owner }}|${{ github.event.repository.name }}|latest|*-$ARCH_NAME.AppImage.zsync" + BUILDDIR=publish OUTDIR=publish_appimage distribution/linux/appimage/build-appimage.sh + + pushd publish_appimage + mv Ryujinx.AppImage ../release_output/ryujinx-$BUILD_VERSION-$ARCH_NAME.AppImage + mv Ryujinx.AppImage.zsync ../release_output/ryujinx-$BUILD_VERSION-$ARCH_NAME.AppImage.zsync + popd - # If anyone wants to look into why appimagetool randomly errors with exit code 8, that would be cool - -# - name: Build AppImage (Linux) -# if: matrix.platform.os == 'ubuntu-latest' -# run: | -# BUILD_VERSION="${{ steps.version_info.outputs.build_version }}" -# PLATFORM_NAME="${{ matrix.platform.name }}" -# -# sudo apt install -y zsync desktop-file-utils appstream -# -# mkdir -p tools -# export PATH="$PATH:$(readlink -f tools)" -# -# # Setup appimagetool -# wget -q -O tools/appimagetool "https://github.com/AppImage/appimagetool/releases/download/continuous/appimagetool-x86_64.AppImage" -# chmod +x tools/appimagetool -# chmod +x distribution/linux/appimage/build-appimage.sh -# -# # Explicitly set $ARCH for appimagetool ($ARCH_NAME is for the file name) -# if [ "$PLATFORM_NAME" = "linux-x64" ]; then -# ARCH_NAME=x64 -# export ARCH=x86_64 -# elif [ "$PLATFORM_NAME" = "linux-arm64" ]; then -# ARCH_NAME=arm64 -# export ARCH=aarch64 -# else -# echo "Unexpected PLATFORM_NAME "$PLATFORM_NAME"" -# exit 1 -# fi -# -# export UFLAG="gh-releases-zsync|${{ github.repository_owner }}|${{ github.event.repository.name }}|latest|*-$ARCH_NAME.AppImage.zsync" -# BUILDDIR=publish OUTDIR=publish_appimage distribution/linux/appimage/build-appimage.sh -# -# pushd publish_appimage -# mv Ryujinx.AppImage ../release_output/ryujinx-$BUILD_VERSION-$ARCH_NAME.AppImage -# mv Ryujinx.AppImage.zsync ../release_output/ryujinx-$BUILD_VERSION-$ARCH_NAME.AppImage.zsync -# popd -# -# gli --access-token=${{ secrets.GITLAB_TOKEN }} --project=ryubing/ryujinx --command=UploadGenericPackage "Ryubing|${{ steps.version_info.outputs.build_version }}|release_output/ryujinx-$BUILD_VERSION-$ARCH_NAME.AppImage" -# gli --access-token=${{ secrets.GITLAB_TOKEN }} --project=ryubing/ryujinx --command=UploadGenericPackage "Ryubing|${{ steps.version_info.outputs.build_version }}|release_output/ryujinx-$BUILD_VERSION-$ARCH_NAME.AppImage.zsync" -# shell: bash + gli --access-token=${{ secrets.GITLAB_TOKEN }} --project=ryubing/ryujinx --command=UploadGenericPackage "Ryubing|${{ steps.version_info.outputs.build_version }}|release_output/ryujinx-$BUILD_VERSION-$ARCH_NAME.AppImage" + gli --access-token=${{ secrets.GITLAB_TOKEN }} --project=ryubing/ryujinx --command=UploadGenericPackage "Ryubing|${{ steps.version_info.outputs.build_version }}|release_output/ryujinx-$BUILD_VERSION-$ARCH_NAME.AppImage.zsync" + shell: bash macos_release: name: Release MacOS universal diff --git a/assets/locales.json b/assets/locales.json index 22848de4e..303c9ed02 100644 --- a/assets/locales.json +++ b/assets/locales.json @@ -15545,26 +15545,26 @@ { "ID": "AmiiboOptionsShowAllLabel", "Translations": { - "ar_SA": "إظهار كل أميبو", - "de_DE": "Zeige alle Amiibos", - "el_GR": "Εμφάνιση όλων των Amiibo", - "en_US": "Show All Amiibo", - "es_ES": "Mostrar todos los Amiibo", - "fr_FR": "Afficher Tous les Amiibo", - "he_IL": "הצג את כל האמיבואים", - "it_IT": "Mostra tutti gli amiibo", - "ja_JP": "すべての Amiibo を表示", - "ko_KR": "모든 Amiibo 표시", - "no_NO": "Vis alle Amiibo", - "pl_PL": "Pokaż Wszystkie Amiibo", - "pt_BR": "Exibir Todos os Amiibos", - "ru_RU": "Показать все Amiibo", - "sv_SE": "Visa alla Amiibo", - "th_TH": "แสดง Amiibo ทั้งหมด", - "tr_TR": "Tüm Amiibo'ları Göster", - "uk_UA": "Показати всі Amiibo", - "zh_CN": "显示所有 Amiibo", - "zh_TW": "顯示所有 Amiibo" + "ar_SA": "", + "de_DE": "", + "el_GR": "", + "en_US": "Show incompatible Amiibo for this game", + "es_ES": "Mostrar Amiibo incompatibles con este juego", + "fr_FR": "", + "he_IL": "", + "it_IT": "", + "ja_JP": "", + "ko_KR": "", + "no_NO": "", + "pl_PL": "", + "pt_BR": "", + "ru_RU": "", + "sv_SE": "", + "th_TH": "", + "tr_TR": "", + "uk_UA": "", + "zh_CN": "", + "zh_TW": "" } }, { diff --git a/distribution/linux/appimage/build-appimage.sh b/distribution/linux/appimage/build-appimage.sh index a9de4866b..8446a8d2f 100755 --- a/distribution/linux/appimage/build-appimage.sh +++ b/distribution/linux/appimage/build-appimage.sh @@ -23,7 +23,7 @@ chmod +x AppDir/AppRun AppDir/usr/bin/Ryujinx* mkdir -p "$OUTDIR" -appimagetool --comp zstd --mksquashfs-opt -Xcompression-level --mksquashfs-opt 21 \ +appimagetool -n --comp zstd --mksquashfs-opt -Xcompression-level --mksquashfs-opt 21 \ -u "$UFLAG" \ AppDir "$OUTDIR"/Ryujinx.AppImage diff --git a/src/Ryujinx/UI/ViewModels/AmiiboWindowViewModel.cs b/src/Ryujinx/UI/ViewModels/AmiiboWindowViewModel.cs index 48c0837b4..39e4865a2 100644 --- a/src/Ryujinx/UI/ViewModels/AmiiboWindowViewModel.cs +++ b/src/Ryujinx/UI/ViewModels/AmiiboWindowViewModel.cs @@ -342,14 +342,24 @@ namespace Ryujinx.Ava.UI.ViewModels { _amiibos.Clear(); + List amiiboSortedList; + + // If no series selected, just display all available amiibos if (_seriesSelectedIndex < 0) { - return; + amiiboSortedList = _amiiboList + .OrderBy(amiibo => amiibo.AmiiboSeries) + .ThenBy(x => x.Name) + .ToList(); + } + else + { + amiiboSortedList = _amiiboList + .Where(amiibo => amiibo.AmiiboSeries == _amiiboSeries[SeriesSelectedIndex]) + .OrderBy(amiibo => amiibo.Name).ToList(); } - List amiiboSortedList = _amiiboList - .Where(amiibo => amiibo.AmiiboSeries == _amiiboSeries[SeriesSelectedIndex]) - .OrderBy(amiibo => amiibo.Name).ToList(); + for (int i = 0; i < amiiboSortedList.Count; i++) { @@ -386,7 +396,7 @@ namespace Ryujinx.Ava.UI.ViewModels Usage = string.Empty; - if (_amiiboSelectedIndex < 0) + if (_amiiboSelectedIndex < 0 || _amiibos.Count < 1) { return; } diff --git a/src/Ryujinx/UI/Windows/AmiiboWindow.axaml b/src/Ryujinx/UI/Windows/AmiiboWindow.axaml index ad77a9b6b..ac8d7f271 100644 --- a/src/Ryujinx/UI/Windows/AmiiboWindow.axaml +++ b/src/Ryujinx/UI/Windows/AmiiboWindow.axaml @@ -31,15 +31,11 @@ VerticalAlignment="Top" Margin="8, 8, 7, 0" ToolTip.Tip="{ext:WindowTitle Amiibo}" /> - + - - - - @@ -47,19 +43,31 @@ - - - - - - - - - - + + + + + + + + + + + + + + + +