Merge branch ryujinx:master into master

2025-09-12 22:52:17 -06:00 · 2025-08-25 12:43:20 +02:00
parent 6bf57c5ffb d499449f57
commit 0684d60c8c
6 changed files with 141 additions and 127 deletions
--- a/.github/workflows/canary.yml
+++ b/.github/workflows/canary.yml
@ -106,47 +106,45 @@ jobs:
          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 }}"

-#      - 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
+          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
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@ -97,47 +97,45 @@ jobs:
        env:
          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

-      # 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 }}"

-#      - 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
+          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

  macos_release:
    name: Release MacOS universal
--- 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": ""
      }
    },
    {
--- 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

--- 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<AmiiboApi> 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<AmiiboApi> 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;
            }
--- 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}" />
-            <StackPanel Grid.Column="1" Orientation="Horizontal" Margin="0, 0, 0, 100">
+            <StackPanel Grid.Column="1" Orientation="Horizontal" Margin="0, 0, 0, 20">
                <StackPanel Spacing="10" Orientation="Horizontal" HorizontalAlignment="Left">
                    <TextBlock VerticalAlignment="Center" Text="{ext:Locale AmiiboSeriesLabel}" />
                    <ComboBox Margin="0, 8, 0, 0" SelectedIndex="{Binding SeriesSelectedIndex}" ItemsSource="{Binding AmiiboSeries}" MinWidth="100" />
                </StackPanel>
-                <StackPanel Margin="15, 0, 0, 0" Spacing="10" Orientation="Horizontal" >
-                    <TextBlock VerticalAlignment="Center" Text="{ext:Locale AmiiboCharacterLabel}" />
-                    <ComboBox Margin="0, 8, 0, 0" SelectedIndex="{Binding AmiiboSelectedIndex}" MinWidth="100" ItemsSource="{Binding AmiiboList}" />
-                </StackPanel>
            </StackPanel>
        </Grid>
        <Grid Name="NormalControls" ColumnDefinitions="*,*" Grid.Row="1" HorizontalAlignment="Stretch" >
@ -47,19 +43,31 @@
                <TextBlock VerticalAlignment="Center" Text="{ext:Locale AmiiboSeriesLabel}" />
                <ComboBox SelectedIndex="{Binding SeriesSelectedIndex}" ItemsSource="{Binding AmiiboSeries}" MinWidth="100" />
            </StackPanel>
-            <StackPanel Spacing="10" Grid.Column="1" Orientation="Horizontal" HorizontalAlignment="Right">
-                <TextBlock VerticalAlignment="Center" Text="{ext:Locale AmiiboCharacterLabel}" />
-                <ComboBox SelectedIndex="{Binding AmiiboSelectedIndex}" MinWidth="100" ItemsSource="{Binding AmiiboList}" />
-            </StackPanel>
        </Grid>
-        <StackPanel Margin="20" Grid.Row="2">
-            <Image Source="{Binding AmiiboImage}" Height="350" Width="350" HorizontalAlignment="Center" />
-            <ScrollViewer MaxHeight="120" HorizontalScrollBarVisibility="Disabled" VerticalScrollBarVisibility="Auto"
-                          Margin="20" VerticalAlignment="Top" HorizontalAlignment="Stretch">
-                <TextBlock TextWrapping="Wrap" Text="{Binding Usage}" HorizontalAlignment="Center"
-                           TextAlignment="Center" />
-            </ScrollViewer>
-        </StackPanel>
+        <DockPanel Grid.Row="2">
+            <ListBox
+                DockPanel.Dock="Left"
+                Width="300"
+                Margin="20"
+                SelectionMode="Single"
+                ItemsSource="{Binding AmiiboList}"
+                SelectedIndex="{Binding AmiiboSelectedIndex}">
+                
+                <ListBox.ItemTemplate>
+                    <DataTemplate>
+                        <TextBlock Margin="10, 0, 0 ,0" Text="{Binding Name}" />
+                    </DataTemplate>
+                </ListBox.ItemTemplate>
+            </ListBox>
+            <StackPanel Margin="20">
+                <Image Source="{Binding AmiiboImage}" Height="350" Width="150" HorizontalAlignment="Center" />
+                <ScrollViewer MaxHeight="120" HorizontalScrollBarVisibility="Disabled" VerticalScrollBarVisibility="Auto"
+                            Margin="20" VerticalAlignment="Top" HorizontalAlignment="Stretch">
+                    <TextBlock TextWrapping="Wrap" Text="{Binding Usage}" HorizontalAlignment="Center"
+                            TextAlignment="Center" />
+                </ScrollViewer>
+            </StackPanel>
+        </DockPanel>
        <Grid Grid.Row="3" ColumnDefinitions="Auto,Auto,*,Auto,Auto">
            <CheckBox Margin="10" Grid.Column="0" VerticalContentAlignment="Center" 
                      IsChecked="{Binding ShowAllAmiibo}"