Update French Translation (ryubing/ryujinx!67 )

See merge request ryubing/ryujinx!67
UI: Properly space total play time separator when loading bar is shown.
2025-06-28 04:36:23 +02:00 · 2025-06-23 14:50:47 -05:00 · 2025-06-20 23:06:16 -05:00 · 2025-06-20 23:02:39 -05:00 · 2025-06-19 20:51:11 -05:00 · 2025-06-19 16:33:10 -05:00
39 changed files with 833 additions and 915 deletions
--- a/.github/workflows/canary.yml
+++ b/.github/workflows/canary.yml
@ -243,3 +243,7 @@ jobs:
      - name: Send notification webhook
        run: |
          gli --access-token=${{ secrets.GITLAB_TOKEN }} --project=ryubing/canary --command=SendUpdateMessage "${{ steps.version_info.outputs.build_version }}|FF4500|${{ secrets.CANARY_DISCORD_WEBHOOK }}|https://avatars.githubusercontent.com/u/192939710?s=200&v=4|false"
+
+      - name: Notify update server of new builds
+        run: |
+          curl 'https://update.ryujinx.app/api/v1/admin/refresh_cache?rc=canary' -X PATCH -H 'accept: */*' -H 'Authorization: ${{ secrets.UPDATE_SERVER_ADMIN_TOKEN }}'
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@ -14,38 +14,6 @@ env:
  RELEASE: 1

 jobs:
-  tag:
-    name: Create tag
-    runs-on: ubuntu-24.04
-    steps:
-      - name: Get version info
-        id: version_info
-        run: |
-          echo "build_version=${{ env.RYUJINX_BASE_VERSION }}.${{ github.run_number }}" >> $GITHUB_OUTPUT
-          echo "prev_build_version=${{ env.RYUJINX_BASE_VERSION }}.$((${{ github.run_number }} - 1))" >> $GITHUB_OUTPUT
-        shell: bash
-
-      - name: Create release
-        uses: ncipollo/release-action@v1
-        with:
-          name: ${{ steps.version_info.outputs.build_version }}
-          tag: ${{ steps.version_info.outputs.build_version }}
-          body: |
-            # Stable builds:
-            | Platform | Artifact |
-            |--|--|
-            | Windows 64-bit | [Stable Windows Artifact](https://github.com/${{ secrets.RC_OWNER }}/${{ secrets.RC_STABLE_NAME }}/releases/download/${{ steps.version_info.outputs.build_version }}/ryujinx-${{ steps.version_info.outputs.build_version }}-win_x64.zip) |
-            | Windows ARM 64-bit | [Stable Windows ARM Artifact](https://github.com/${{ secrets.RC_OWNER }}/${{ secrets.RC_STABLE_NAME }}/releases/download/${{ steps.version_info.outputs.build_version }}/ryujinx-${{ steps.version_info.outputs.build_version }}-win_arm64.zip) |
-            | Linux 64-bit | [Stable Linux Artifact](https://github.com/${{ secrets.RC_OWNER }}/${{ secrets.RC_STABLE_NAME }}/releases/download/${{ steps.version_info.outputs.build_version }}/ryujinx-${{ steps.version_info.outputs.build_version }}-linux_x64.tar.gz) |
-            | Linux ARM 64-bit | [Stable Linux ARM Artifact](https://github.com/${{ secrets.RC_OWNER }}/${{ secrets.RC_STABLE_NAME }}/releases/download/${{ steps.version_info.outputs.build_version }}/ryujinx-${{ steps.version_info.outputs.build_version }}-linux_arm64.tar.gz) |
-            | macOS | [Stable macOS Artifact](https://github.com/${{ secrets.RC_OWNER }}/${{ secrets.RC_STABLE_NAME }}/releases/download/${{ steps.version_info.outputs.build_version }}/ryujinx-${{ steps.version_info.outputs.build_version }}-macos_universal.app.tar.gz) |
-            
-            **[Full Changelog](https://git.ryujinx.app/ryubing/ryujinx/-/compare/${{ steps.version_info.outputs.prev_build_version }}...${{ steps.version_info.outputs.build_version }})**
-          omitBodyDuringUpdate: true
-          owner: ${{ secrets.RC_OWNER }}
-          repo: ${{ secrets.RC_STABLE_NAME }}
-          token: ${{ secrets.ALT_RELEASE_TOKEN }}
-
  release:
    name: Release for ${{ matrix.platform.name }}
    runs-on: ${{ matrix.platform.os }}
@ -169,30 +137,6 @@ jobs:
          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

-      - name: Pushing new release
-        uses: ncipollo/release-action@v1
-        with:
-          name: ${{ steps.version_info.outputs.build_version }}
-          artifacts: "release_output/*.tar.gz,release_output/*.zip,release_output/*AppImage*"
-          tag: ${{ steps.version_info.outputs.build_version }}
-          body: |
-            # Stable builds:
-            | Platform | Artifact |
-            |--|--|
-            | Windows 64-bit | [Stable Windows Artifact](https://github.com/${{ secrets.RC_OWNER }}/${{ secrets.RC_STABLE_NAME }}/releases/download/${{ steps.version_info.outputs.build_version }}/ryujinx-${{ steps.version_info.outputs.build_version }}-win_x64.zip) |
-            | Windows ARM 64-bit | [Stable Windows ARM Artifact](https://github.com/${{ secrets.RC_OWNER }}/${{ secrets.RC_STABLE_NAME }}/releases/download/${{ steps.version_info.outputs.build_version }}/ryujinx-${{ steps.version_info.outputs.build_version }}-win_arm64.zip) |
-            | Linux 64-bit | [Stable Linux Artifact](https://github.com/${{ secrets.RC_OWNER }}/${{ secrets.RC_STABLE_NAME }}/releases/download/${{ steps.version_info.outputs.build_version }}/ryujinx-${{ steps.version_info.outputs.build_version }}-linux_x64.tar.gz) |
-            | Linux ARM 64-bit | [Stable Linux ARM Artifact](https://github.com/${{ secrets.RC_OWNER }}/${{ secrets.RC_STABLE_NAME }}/releases/download/${{ steps.version_info.outputs.build_version }}/ryujinx-${{ steps.version_info.outputs.build_version }}-linux_arm64.tar.gz) |
-            | macOS | [Stable macOS Artifact](https://github.com/${{ secrets.RC_OWNER }}/${{ secrets.RC_STABLE_NAME }}/releases/download/${{ steps.version_info.outputs.build_version }}/ryujinx-${{ steps.version_info.outputs.build_version }}-macos_universal.app.tar.gz) |
-            
-            **[Full Changelog](https://git.ryujinx.app/ryubing/ryujinx/-/compare/${{ steps.version_info.outputs.prev_build_version }}...${{ steps.version_info.outputs.build_version }})**
-          omitBodyDuringUpdate: true
-          allowUpdates: true
-          replacesArtifacts: true
-          owner: ${{ secrets.RC_OWNER }}
-          repo: ${{ secrets.RC_STABLE_NAME }}
-          token: ${{ secrets.ALT_RELEASE_TOKEN }}
-
  macos_release:
    name: Release MacOS universal
    runs-on: ubuntu-24.04
@ -250,25 +194,10 @@ jobs:
          ./distribution/macos/create_macos_build_ava.sh . publish_tmp_ava publish ./distribution/macos/entitlements.xml "${{ steps.version_info.outputs.build_version }}" "${{ steps.version_info.outputs.git_short_hash }}" Release 0
          gli --access-token=${{ secrets.GITLAB_TOKEN }} --project=ryubing/ryujinx --command=UploadGenericPackage "Ryubing|${{ steps.version_info.outputs.build_version }}|publish/ryujinx-${{ steps.version_info.outputs.build_version }}-macos_universal.app.tar.gz"
          
-      - name: Pushing new release
-        uses: ncipollo/release-action@v1
-        with:
-          name: ${{ steps.version_info.outputs.build_version }}
-          artifacts: "publish/*.tar.gz"
-          tag: ${{ steps.version_info.outputs.build_version }}
-          body: ""
-          omitBodyDuringUpdate: true
-          allowUpdates: true
-          replacesArtifacts: true
-          owner: ${{ secrets.RC_OWNER }}
-          repo: ${{ secrets.RC_STABLE_NAME }}
-          token: ${{ secrets.ALT_RELEASE_TOKEN }}
-
  create_gitlab_release:
    name: Create GitLab Release
    runs-on: ubuntu-24.04
    needs:
-      - tag
      - macos_release
      - release
    steps:
@ -299,3 +228,7 @@ jobs:
      - name: Send notification webhook
        run: |
          gli --access-token=${{ secrets.GITLAB_TOKEN }} --project=ryubing/ryujinx --command=SendUpdateMessage "${{ steps.version_info.outputs.build_version }}|32cd32|${{ secrets.STABLE_DISCORD_WEBHOOK }}|https://avatars.githubusercontent.com/u/192939710?s=200&v=4|false"
+          
+      - name: Notify update server of new builds
+        run: |
+          curl 'https://update.ryujinx.app/api/v1/admin/refresh_cache?rc=stable' -X PATCH -H 'accept: */*' -H 'Authorization: ${{ secrets.UPDATE_SERVER_ADMIN_TOKEN }}'
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@ -2,20 +2,17 @@

 All updates to this Ryujinx branch will be documented in this file.

+## [1.3.2](<https://git.ryujinx.app/ryubing/ryujinx/-/releases/1.3.2>) - 2025-06-09
+
 ## [1.3.1](<https://git.ryujinx.app/ryubing/ryujinx/-/releases/1.3.1>) - 2025-04-23
-A list of notable changes can be found on the release linked in the version number above.

 ## [1.2.86](<https://github.com/Ryubing/Stable-Releases/releases/tag/1.2.86>) - 2025-03-13
-A list of notable changes can be found on the release linked in the version number above.

 ## [1.2.82](<https://web.archive.org/web/20250312010534/https://github.com/Ryubing/Ryujinx/releases/tag/1.2.82>) - 2025-02-16
-A list of notable changes can be found on the release linked in the version number above.

 ## [1.2.80-81](<https://web.archive.org/web/20250302064257/https://github.com/Ryubing/Ryujinx/releases/tag/1.2.81>) - 2025-01-22
-A list of notable changes can be found on the release linked in the version number above.

 ## [1.2.78](<https://web.archive.org/web/20250301174537/https://github.com/Ryubing/Ryujinx/releases/tag/1.2.78>) - 2024-12-19
-A list of notable changes can be found on the release linked in the version number above.

 ## [1.2.73-1.2.76](<https://web.archive.org/web/20250209202612/https://github.com/Ryubing/Ryujinx/releases/tag/1.2.76>) - 2024-11-19
 A list of notable changes can be found on the release linked in the version number above.
--- a/Directory.Packages.props
+++ b/Directory.Packages.props
@ -42,6 +42,8 @@
    <PackageVersion Include="Ryujinx.Graphics.Vulkan.Dependencies.MoltenVK" Version="1.2.0" />
    <PackageVersion Include="Ryujinx.LibHac" Version="0.20.0" />
    <PackageVersion Include="Ryujinx.SDL2-CS" Version="2.30.0-build32" />
+    <PackageVersion Include="Ryujinx.UpdateClient" Version="1.0.29" />
+    <PackageVersion Include="Ryujinx.Systems.Update.Common" Version="1.0.29" />
    <PackageVersion Include="Gommon" Version="2.7.1.1" />
    <PackageVersion Include="securifybv.ShellLink" Version="0.1.0" />
    <PackageVersion Include="Sep" Version="0.6.0" />
--- a/Ryujinx.sln
+++ b/Ryujinx.sln
@ -77,6 +77,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Ryujinx.Horizon.Kernel.Gene
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Ryujinx.HLE.Generators", "src\Ryujinx.HLE.Generators\Ryujinx.HLE.Generators.csproj", "{B575BCDE-2FD8-4A5D-8756-31CDD7FE81F0}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Ryujinx.BuildValidationTasks", "src\Ryujinx.BuildValidationTasks\Ryujinx.BuildValidationTasks.csproj", "{4A89A234-4F19-497D-A576-DDE8CDFC5B22}"
+EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{36F870C1-3E5F-485F-B426-F0645AF78751}"
 	ProjectSection(SolutionItems) = preProject
 		.editorconfig = .editorconfig
@ -84,10 +86,9 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
 		.github\workflows\canary.yml = .github\workflows\canary.yml
 		Directory.Packages.props = Directory.Packages.props
 		.github\workflows\release.yml = .github\workflows\release.yml
+		nuget.config = nuget.config
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Ryujinx.BuildValidationTasks", "src\Ryujinx.BuildValidationTasks\Ryujinx.BuildValidationTasks.csproj", "{4A89A234-4F19-497D-A576-DDE8CDFC5B22}"
-EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
--- a/assets/locales.json
+++ b/assets/locales.json
--- a/docs/compatibility.csv
+++ b/docs/compatibility.csv
@ -2746,6 +2746,7 @@
 01005D701264A000,"SpyHack",,playable,2021-04-15 10:53:51
 010077B00E046000,"Spyro™ Reignited Trilogy",nvdec;UE4,playable,2022-09-11 18:38:33
 0100085012A0E000,"Squeakers",,playable,2020-12-13 12:13:05
+0100E1D01EB2E000,"Squeakross: Home Squeak Home",,playable,2025-06-16 02:02:00
 010009300D31C000,"Squidgies Takeover",,playable,2020-07-20 22:28:08
 0100FCD0102EC000,"Squidlit",,playable,2020-08-06 12:38:32
 0100EBF00E702000,"STAR OCEAN First Departure R",nvdec,playable,2021-07-05 19:29:16
@ -3016,6 +3017,7 @@
 01009B101044C000,"The Legend of Heroes: Trails of Cold Steel III Demo",demo;nvdec,playable,2021-04-23 01:07:32
 0100D3C010DE8000,"The Legend of Heroes: Trails of Cold Steel IV",nvdec,playable,2021-04-23 14:01:05
 01005E5013862000,"THE LEGEND OF HEROES: ZERO NO KISEKI KAI [英雄傳說 零之軌跡：改]",crash,nothing,2021-09-30 14:41:07
+01009C901ACEE000,"The Legend of Nayuta: Boundless Trails",,ingame,2025-06-12 15:47
 01008CF01BAAC000,"The Legend of Zelda Echoes of Wisdom",nvdec;ASTC;intel-vendor-bug,playable,2024-10-01 14:11:01
 0100509005AF2000,"The Legend of Zelda: Breath of the Wild Demo",demo,ingame,2022-12-24 05:02:58
 01007EF00011E000,"The Legend of Zelda™: Breath of the Wild",gpu;amd-vendor-bug;mac-bug,ingame,2024-09-23 19:35:46
--- a/nuget.config
+++ b/nuget.config
@ -6,5 +6,20 @@
        <add key="nuget.org" value="https://api.nuget.org/v3/index.json" />
        <!-- Only needed when using pre-release versions of Ryujinx.LibHac. -->
        <!--<add key="LibHacAlpha" value="https://git.ryujinx.app/api/v4/projects/17/packages/nuget/index.json" />-->
+        <add key="Ryujinx.UpdateClient" value="https://git.ryujinx.app/api/v4/projects/71/packages/nuget/index.json" />
    </packageSources>
+    <packageSourceMapping>
+        <!-- key value for <packageSource> should match key values from <packageSources> element -->
+        <!-- These are defined and .NET still yells about multiple package sources with no mappings. Not sure what to do, this is in the docs lol -->
+        <packageSource key="nuget.org">
+            <package pattern="*" />
+        </packageSource>
+        <packageSource key="Ryujinx.UpdateClient">
+            <package pattern="Ryujinx.UpdateClient" />
+            <package pattern="Ryujinx.Systems.Update.Common" />
+        </packageSource>
+        <!--<packageSource key="LibHacAlpha">
+            <package pattern="Ryujinx.LibHac" />
+        </packageSource>-->
+    </packageSourceMapping>
 </configuration>
--- a/src/Ryujinx.Common/TitleIDs.cs
+++ b/src/Ryujinx.Common/TitleIDs.cs
@ -195,6 +195,7 @@ namespace Ryujinx.Common
            "01008d100d43e000", // Saints Row IV
            "0100de600beee000", // Saints Row: The Third - The Full Package
            "01001180021fa000", // Shovel Knight: Specter of Torment
+            "0100e1D01eb2e000", // Squeakross: Home Squeak Home
            "0100e65002bb8000", // Stardew Valley
            "0100d7a01b7a2000", // Star Wars: Bounty Hunter
            "0100800015926000", // Suika Game
--- a/src/Ryujinx.HLE/HOS/Applets/SoftwareKeyboard/SoftwareKeyboardRendererBase.cs
+++ b/src/Ryujinx.HLE/HOS/Applets/SoftwareKeyboard/SoftwareKeyboardRendererBase.cs
@ -377,7 +377,7 @@ namespace Ryujinx.HLE.HOS.Applets.SoftwareKeyboard

            bool cursorVisible = false;

-            if (state.CursorBegin != state.CursorEnd)
+            if (state.CursorBegin != state.CursorEnd && state.CursorEnd <= state.InputText.Length)
            {
                Debug.Assert(state.InputText.Length > 0);

--- a/src/Ryujinx.HLE/HOS/Services/Am/AppletAE/AllSystemAppletProxiesService/SystemAppletProxy/ILibraryAppletCreator.cs
+++ b/src/Ryujinx.HLE/HOS/Services/Am/AppletAE/AllSystemAppletProxiesService/SystemAppletProxy/ILibraryAppletCreator.cs
@ -21,6 +21,21 @@ namespace Ryujinx.HLE.HOS.Services.Am.AppletAE.AllSystemAppletProxiesService.Sys
            return ResultCode.Success;
        }

+        [CommandCmif(3)] // 20.0.0+
+        // CreateLibraryAppletEx(u32, u32, u64) -> object<nn::am::service::ILibraryAppletAccessor>
+        public ResultCode CreateLibraryAppletEx(ServiceCtx context)
+        {
+            AppletId appletId = (AppletId)context.RequestData.ReadInt32();
+
+            _ = context.RequestData.ReadInt32(); // libraryAppletMode
+
+            _ = context.RequestData.ReadUInt64(); // threadId
+
+            MakeObject(context, new ILibraryAppletAccessor(appletId, context.Device.System));
+
+            return ResultCode.Success;
+        }
+
        [CommandCmif(10)]
        // CreateStorage(u64) -> object<nn::am::service::IStorage>
        public ResultCode CreateStorage(ServiceCtx context)
--- a/src/Ryujinx.HLE/HOS/Services/Sockets/Bsd/IClient.cs
+++ b/src/Ryujinx.HLE/HOS/Services/Sockets/Bsd/IClient.cs
@ -885,7 +885,7 @@ namespace Ryujinx.HLE.HOS.Services.Sockets.Bsd
                // F_SETFL
                else if (cmd == 0x4)
                {
-                    socket.Blocking = (arg & 0x800) != 0;
+                    socket.Blocking = (arg & 0x800) == 0;
                    result = 0;
                }
                else
--- a/src/Ryujinx/Common/Models/Github/GithubReleaseAssetJsonResponse.cs
+++ b/src/Ryujinx/Common/Models/Github/GithubReleaseAssetJsonResponse.cs
@ -1,9 +0,0 @@
-namespace Ryujinx.Ava.Common.Models.Github
-{
-    public class GithubReleaseAssetJsonResponse
-    {
-        public string Name { get; set; }
-        public string State { get; set; }
-        public string BrowserDownloadUrl { get; set; }
-    }
-}
--- a/src/Ryujinx/Common/Models/Github/GithubReleasesJsonResponse.cs
+++ b/src/Ryujinx/Common/Models/Github/GithubReleasesJsonResponse.cs
@ -1,12 +0,0 @@
-using System.Collections.Generic;
-
-namespace Ryujinx.Ava.Common.Models.Github
-{
-    public class GithubReleasesJsonResponse
-    {
-        public string Name { get; set; }
-
-        public string TagName { get; set; }
-        public List<GithubReleaseAssetJsonResponse> Assets { get; set; }
-    }
-}
--- a/src/Ryujinx/Common/Models/Github/GithubReleasesJsonSerializerContext.cs
+++ b/src/Ryujinx/Common/Models/Github/GithubReleasesJsonSerializerContext.cs
@ -1,7 +0,0 @@
-using System.Text.Json.Serialization;
-
-namespace Ryujinx.Ava.Common.Models.Github
-{
-    [JsonSerializable(typeof(GithubReleasesJsonResponse), GenerationMode = JsonSourceGenerationMode.Metadata)]
-    public partial class GithubReleasesJsonSerializerContext : JsonSerializerContext;
-}
--- a/src/Ryujinx/Program.cs
+++ b/src/Ryujinx/Program.cs
@ -35,6 +35,7 @@ namespace Ryujinx.Ava
        public static string Version { get; private set; }
        public static string ConfigurationPath { get; private set; }
        public static string GlobalConfigurationPath { get; private set; }
+        public static bool UseExtraConfig { get; set; }
        public static bool PreviewerDetached { get; private set; }
        public static bool UseHardwareAcceleration { get; private set; }
        public static string BackendThreadingArg { get; private set; }
@ -159,7 +160,8 @@ namespace Ryujinx.Ava
            }
        }

-        public static string GetDirGameUserConfig(string gameId, bool rememberGlobalDir = false, bool changeFolderForGame = false)
+
+        public static string GetDirGameUserConfig(string gameId, bool changeFolderForGame = false)
        {
            if (string.IsNullOrEmpty(gameId))
            {
@ -168,15 +170,10 @@ namespace Ryujinx.Ava

            string gameDir = Path.Combine(AppDataManager.GamesDirPath, gameId, ReleaseInformation.ConfigName);

-            // Should load with the game if there is a custom setting for the game
-            if (rememberGlobalDir)
-            {
-                GlobalConfigurationPath = ConfigurationPath;
-            }
-
            if (changeFolderForGame)
            {
                ConfigurationPath = gameDir;
+                UseExtraConfig = true;
            }

            return gameDir;
@ -184,8 +181,6 @@ namespace Ryujinx.Ava

        public static void ReloadConfig()
        {
-            //It is necessary that when a user setting appears, the global setting remains available
-            GlobalConfigurationPath = null;

            string localConfigurationPath = Path.Combine(AppDomain.CurrentDomain.BaseDirectory, ReleaseInformation.ConfigName);
            string appDataConfigurationPath = Path.Combine(AppDataManager.BaseDirPath, ReleaseInformation.ConfigName);
@ -225,6 +220,12 @@ namespace Ryujinx.Ava
                }
            }

+            // When you first load the program, copy to remember the path for the global configuration
+            if (GlobalConfigurationPath == null)
+            {
+                GlobalConfigurationPath = ConfigurationPath;
+            }
+
            UseHardwareAcceleration = ConfigurationState.Instance.EnableHardwareAcceleration;

            // Check if graphics backend was overridden
--- a/src/Ryujinx/Ryujinx.csproj
+++ b/src/Ryujinx/Ryujinx.csproj
@ -65,6 +65,8 @@
    <PackageReference Include="Ryujinx.Audio.OpenAL.Dependencies" Condition="'$(RuntimeIdentifier)' != 'linux-x64' AND '$(RuntimeIdentifier)' != 'linux-arm64' AND '$(RuntimeIdentifier)' != 'osx-x64' AND '$(RuntimeIdentifier)' != 'osx-arm64'" />
    <PackageReference Include="Ryujinx.Graphics.Nvdec.Dependencies.AllArch" />
    <PackageReference Include="Ryujinx.Graphics.Vulkan.Dependencies.MoltenVK" Condition="'$(RuntimeIdentifier)' != 'linux-x64' AND '$(RuntimeIdentifier)' != 'linux-arm64' AND '$(RuntimeIdentifier)' != 'win-x64' AND '$(RuntimeIdentifier)' != 'win-arm64'" />
+    <PackageReference Include="Ryujinx.UpdateClient" />
+    <PackageReference Include="Ryujinx.Systems.Update.Common" />
    <PackageReference Include="securifybv.ShellLink" />
    <PackageReference Include="Sep" />
    <PackageReference Include="Silk.NET.Vulkan" />
--- a/src/Ryujinx/Systems/AppHost.cs
+++ b/src/Ryujinx/Systems/AppHost.cs
@ -75,6 +75,7 @@ namespace Ryujinx.Ava.Systems

        private readonly long _ticksPerFrame;
        private readonly Stopwatch _chrono;
+        private readonly Stopwatch _playTimer;
        private long _ticks;

        private readonly AccountManager _accountManager;
@ -175,6 +176,7 @@ namespace Ryujinx.Ava.Systems

            _chrono = new Stopwatch();
            _ticksPerFrame = Stopwatch.Frequency / TargetFps;
+            _playTimer = new Stopwatch();

            if (ApplicationPath.StartsWith("@SystemContent"))
            {
@ -461,7 +463,15 @@ namespace Ryujinx.Ava.Systems

            DisplaySleep.Prevent();

+            if (ConfigurationState.Instance.System.UseInputGlobalConfig.Value && Program.UseExtraConfig)
+            {
+                NpadManager.Initialize(Device, ConfigurationState.InstanceExtra.Hid.InputConfig, ConfigurationState.Instance.Hid.EnableKeyboard, ConfigurationState.Instance.Hid.EnableMouse);
+            }
+            else
+            {
                NpadManager.Initialize(Device, ConfigurationState.Instance.Hid.InputConfig, ConfigurationState.Instance.Hid.EnableKeyboard, ConfigurationState.Instance.Hid.EnableMouse);
+            }
+
            TouchScreenManager.Initialize(Device);

            _viewModel.IsGameRunning = true;
@ -557,6 +567,7 @@ namespace Ryujinx.Ava.Systems
        public void Stop()
        {
            _isActive = false;
+            _playTimer.Stop();
        }

        private void Exit()
@ -608,7 +619,7 @@ namespace Ryujinx.Ava.Systems
        private void Dispose()
        {
            if (Device.Processes != null)
-                MainWindowViewModel.UpdateGameMetadata(Device.Processes.ActiveApplication.ProgramIdText);
+                MainWindowViewModel.UpdateGameMetadata(Device.Processes.ActiveApplication.ProgramIdText, _playTimer.Elapsed);

            ConfigurationState.Instance.System.IgnoreMissingServices.Event -= UpdateIgnoreMissingServicesState;
            ConfigurationState.Instance.Graphics.AspectRatio.Event -= UpdateAspectRatioState;
@ -627,6 +638,7 @@ namespace Ryujinx.Ava.Systems
            _gpuCancellationTokenSource.Dispose();

            _chrono.Stop();
+            _playTimer.Stop();
        }

        public void DisposeGpu()
@ -860,6 +872,7 @@ namespace Ryujinx.Ava.Systems
            ApplicationLibrary.LoadAndSaveMetaData(Device.Processes.ActiveApplication.ProgramIdText,
                appMetadata => appMetadata.UpdatePreGame()
            );
+            _playTimer.Start();

            return true;
        }
@ -869,6 +882,7 @@ namespace Ryujinx.Ava.Systems
            Device?.System.TogglePauseEmulation(false);

            _viewModel.IsPaused = false;
+            _playTimer.Start();
            _viewModel.Title = TitleHelper.ActiveApplicationTitle(Device?.Processes.ActiveApplication, Program.Version, !ConfigurationState.Instance.ShowOldUI);
            Logger.Info?.Print(LogClass.Emulation, "Emulation was resumed");
        }
@ -878,6 +892,7 @@ namespace Ryujinx.Ava.Systems
            Device?.System.TogglePauseEmulation(true);

            _viewModel.IsPaused = true;
+            _playTimer.Stop();
            _viewModel.Title = TitleHelper.ActiveApplicationTitle(Device?.Processes.ActiveApplication, Program.Version, !ConfigurationState.Instance.ShowOldUI, LocaleManager.Instance[LocaleKeys.Paused]);
            Logger.Info?.Print(LogClass.Emulation, "Emulation was paused");
        }
@ -1144,6 +1159,24 @@ namespace Ryujinx.Ava.Systems

                _dialogShown = true;

+                // The hard-coded hotkey mapped to exit is Escape, but it's also the same key
+                // that causes the dialog we launch to close (without doing anything). In release
+                // mode, a race is observed that between ShowExitPrompt() appearing on KeyDown
+                // and the ContentDialog we create seeing the key state before KeyUp. Merely waiting
+                // for the key to no longer be pressed appears to be insufficient.
+                // NB: Using _keyboardInterface.IsPressed(Key.Escape) does not currently work.
+                if (OperatingSystem.IsWindows())
+                {
+                    while (GetAsyncKeyState(0x1B) != 0)
+                    {
+                        await Task.Delay(100);
+                    }
+                }
+                else
+                {
+                    await Task.Delay(250);
+                }
+
                shouldExit = await ContentDialogHelper.CreateStopEmulationDialog();

                _dialogShown = false;
--- a/src/Ryujinx/Systems/AppLibrary/ApplicationLibrary.cs
+++ b/src/Ryujinx/Systems/AppLibrary/ApplicationLibrary.cs
@ -556,7 +556,7 @@ namespace Ryujinx.Ava.Systems.AppLibrary
                    data.Favorite = appMetadata.Favorite;
                    data.TimePlayed = appMetadata.TimePlayed;
                    data.LastPlayed = appMetadata.LastPlayed;
-                    data.HasIndependentConfiguration = File.Exists(Program.GetDirGameUserConfig(data.IdBaseString, false, false)); // Just check user config
+                    data.HasIndependentConfiguration = File.Exists(Program.GetDirGameUserConfig(data.IdBaseString)); // Just check user config
                }

                data.FileExtension = Path.GetExtension(applicationPath).TrimStart('.').ToUpper();
--- a/src/Ryujinx/Systems/AppLibrary/ApplicationMetadata.cs
+++ b/src/Ryujinx/Systems/AppLibrary/ApplicationMetadata.cs
@ -33,19 +33,11 @@ namespace Ryujinx.Ava.Systems.AppLibrary
        /// <summary>
        /// Updates <see cref="LastPlayed"/> and <see cref="TimePlayed"/>. Call this after a game ends.
        /// </summary>
-        public void UpdatePostGame()
+        /// <param name="playTime">The active gameplay time this past session.</param>
+        public void UpdatePostGame(TimeSpan playTime)
        {
-            DateTime? prevLastPlayed = LastPlayed;
            UpdatePreGame();
-
-            if (!prevLastPlayed.HasValue)
-            {
-                return;
-            }
-
-            TimeSpan diff = DateTime.UtcNow - prevLastPlayed.Value;
-            double newTotalSeconds = TimePlayed.Add(diff).TotalSeconds;
-            TimePlayed = TimeSpan.FromSeconds(Math.Round(newTotalSeconds, MidpointRounding.AwayFromZero));
+            TimePlayed += playTime;
        }
    }
 }
--- a/src/Ryujinx/Systems/Configuration/ConfigurationFileFormat.cs
+++ b/src/Ryujinx/Systems/Configuration/ConfigurationFileFormat.cs
@ -15,7 +15,7 @@ namespace Ryujinx.Ava.Systems.Configuration
        /// <summary>
        /// The current version of the file format
        /// </summary>
-        public const int CurrentVersion = 69;
+        public const int CurrentVersion = 70;

        /// <summary>
        /// Version of the configuration file format
@ -152,6 +152,11 @@ namespace Ryujinx.Ava.Systems.Configuration
        /// </summary>
        public bool MatchSystemTime { get; set; }

+        /// <summary>
+        /// Enable or disable use global input config  (Independent from controllers binding)
+        /// </summary>
+        public bool UseInputGlobalConfig { get; set; }
+
        /// <summary>
        /// Enables or disables Docked Mode
        /// </summary>
--- a/src/Ryujinx/Systems/Configuration/ConfigurationState.Migration.cs
+++ b/src/Ryujinx/Systems/Configuration/ConfigurationState.Migration.cs
@ -90,6 +90,7 @@ namespace Ryujinx.Ava.Systems.Configuration
            System.TimeZone.Value = cff.SystemTimeZone;
            System.SystemTimeOffset.Value = shouldLoadFromFile ? cff.SystemTimeOffset : System.SystemTimeOffset.Value; // Get from global config only
            System.MatchSystemTime.Value = shouldLoadFromFile ? cff.MatchSystemTime : System.MatchSystemTime.Value; // Get from global config only
+            System.UseInputGlobalConfig.Value = cff.UseInputGlobalConfig;
            System.EnableDockedMode.Value = cff.DockedMode;
            System.EnablePtc.Value = cff.EnablePtc;
            System.EnableLowPowerPtc.Value = cff.EnableLowPowerPtc;
--- a/src/Ryujinx/Systems/Configuration/ConfigurationState.Model.cs
+++ b/src/Ryujinx/Systems/Configuration/ConfigurationState.Model.cs
@ -326,6 +326,12 @@ namespace Ryujinx.Ava.Systems.Configuration
            /// </summary>
            public ReactiveObject<bool> MatchSystemTime { get; private set; }

+
+            /// <summary>
+            /// Enable or disable use global input config  (Independent from controllers binding)
+            /// </summary>
+            public ReactiveObject<bool> UseInputGlobalConfig { get; private set; }
+
            /// <summary>
            /// Enables or disables Docked Mode
            /// </summary>
@ -417,6 +423,8 @@ namespace Ryujinx.Ava.Systems.Configuration
                SystemTimeOffset.LogChangesToValue(nameof(SystemTimeOffset));
                MatchSystemTime = new ReactiveObject<bool>();
                MatchSystemTime.LogChangesToValue(nameof(MatchSystemTime));
+                UseInputGlobalConfig = new ReactiveObject<bool>();
+                UseInputGlobalConfig.LogChangesToValue(nameof(UseInputGlobalConfig));
                EnableDockedMode = new ReactiveObject<bool>();
                EnableDockedMode.LogChangesToValue(nameof(EnableDockedMode));
                EnablePtc = new ReactiveObject<bool>();
@ -761,6 +769,8 @@ namespace Ryujinx.Ava.Systems.Configuration
        /// </summary>
        public static ConfigurationState Instance { get; private set; }

+        public static ConfigurationState InstanceExtra{ get; private set; }
+
        /// <summary>
        /// The UI section
        /// </summary>
--- a/src/Ryujinx/Systems/Configuration/ConfigurationState.cs
+++ b/src/Ryujinx/Systems/Configuration/ConfigurationState.cs
@ -15,12 +15,13 @@ namespace Ryujinx.Ava.Systems.Configuration
    {
        public static void Initialize()
        {
-            if (Instance != null)
+            if (Instance != null || InstanceExtra!= null)
            {
                throw new InvalidOperationException("Configuration is already initialized");
            }

            Instance = new ConfigurationState();
+            InstanceExtra= new ConfigurationState();
        }

        public ConfigurationFileFormat ToFileFormat()
@ -54,6 +55,7 @@ namespace Ryujinx.Ava.Systems.Configuration
                SystemTimeZone = System.TimeZone,
                SystemTimeOffset = System.SystemTimeOffset,
                MatchSystemTime = System.MatchSystemTime,
+                UseInputGlobalConfig = System.UseInputGlobalConfig,
                DockedMode = System.EnableDockedMode,
                EnableDiscordIntegration = EnableDiscordIntegration,
                UpdateCheckerType = UpdateCheckerType,
@ -178,6 +180,7 @@ namespace Ryujinx.Ava.Systems.Configuration
            System.Region.Value = Region.USA;
            System.TimeZone.Value = "UTC";
            System.SystemTimeOffset.Value = 0;
+            System.UseInputGlobalConfig.Value = false;
            System.EnableDockedMode.Value = true;
            EnableDiscordIntegration.Value = true;
            UpdateCheckerType.Value = UpdaterType.PromptAtStartup;
--- a/src/Ryujinx/Systems/Updater/Updater.GitHub.cs
+++ b/src/Ryujinx/Systems/Updater/Updater.GitHub.cs
@ -1,190 +0,0 @@
-using Gommon;
-using Ryujinx.Ava.Common.Locale;
-using Ryujinx.Ava.Common.Models.Github;
-using Ryujinx.Ava.UI.Helpers;
-using Ryujinx.Common;
-using Ryujinx.Common.Helper;
-using Ryujinx.Common.Logging;
-using Ryujinx.Common.Utilities;
-using System;
-using System.Net.Http;
-using System.Net.Http.Json;
-using System.Text.Json.Serialization;
-using System.Threading.Tasks;
-
-namespace Ryujinx.Ava.Systems
-{
-    internal static partial class Updater
-    {
-        private static GitHubReleaseChannels.Channel? _currentGitHubReleaseChannel;
-        
-        private static async Task<Optional<(Version Current, Version Incoming)>> CheckGitHubVersionAsync(bool showVersionUpToDate = false)
-        {
-            if (!Version.TryParse(Program.Version, out Version currentVersion))
-            {
-                Logger.Error?.Print(LogClass.Application, $"Failed to convert the current {RyujinxApp.FullAppName} version!");
-
-                await ContentDialogHelper.CreateWarningDialog(
-                    LocaleManager.Instance[LocaleKeys.DialogUpdaterConvertFailedMessage],
-                    LocaleManager.Instance[LocaleKeys.DialogUpdaterCancelUpdateMessage]);
-
-                _running = false;
-
-                return default;
-            }
-
-            Logger.Info?.Print(LogClass.Application, "Checking for updates from GitHub.");
-
-            // Get latest version number from GitHub API
-            try
-            {
-                using HttpClient jsonClient = ConstructHttpClient();
-
-                if (_currentGitHubReleaseChannel == null)
-                {
-                    GitHubReleaseChannels releaseChannels = await GitHubReleaseChannels.GetAsync(jsonClient);
-
-                    _currentGitHubReleaseChannel = ReleaseInformation.IsCanaryBuild
-                        ? releaseChannels.Canary
-                        : releaseChannels.Stable;
-                    
-                    Logger.Info?.Print(LogClass.Application, $"Loaded GitHub release channel for '{(ReleaseInformation.IsCanaryBuild ? "canary" : "stable")}'");
-
-                    _changelogUrlFormat = _currentGitHubReleaseChannel.Value.UrlFormat;
-                }
-
-                string fetchedJson = await jsonClient.GetStringAsync(_currentGitHubReleaseChannel.Value.GetLatestReleaseApiUrl());
-                GithubReleasesJsonResponse fetched = JsonHelper.Deserialize(fetchedJson, _ghSerializerContext.GithubReleasesJsonResponse);
-                _buildVer = fetched.TagName;
-
-                foreach (GithubReleaseAssetJsonResponse asset in fetched.Assets)
-                {
-                    if (asset.Name.StartsWith("ryujinx") && asset.Name.EndsWith(_platformExt))
-                    {
-                        _buildUrl = asset.BrowserDownloadUrl;
-
-                        if (asset.State != "uploaded")
-                        {
-                            if (showVersionUpToDate)
-                            {
-                                UserResult userResult = await ContentDialogHelper.CreateUpdaterUpToDateInfoDialog(
-                                    LocaleManager.Instance[LocaleKeys.DialogUpdaterAlreadyOnLatestVersionMessage],
-                                    string.Empty);
-
-                                if (userResult is UserResult.Ok)
-                                {
-                                    OpenHelper.OpenUrl(_changelogUrlFormat.Format(currentVersion));
-                                }
-                            }
-
-                            Logger.Info?.Print(LogClass.Application, "Up to date.");
-
-                            _running = false;
-
-                            return default;
-                        }
-
-                        break;
-                    }
-                }
-
-                // If build not done, assume no new update is available.
-                if (_buildUrl is null)
-                {
-                    if (showVersionUpToDate)
-                    {
-                        UserResult userResult = await ContentDialogHelper.CreateUpdaterUpToDateInfoDialog(
-                            LocaleManager.Instance[LocaleKeys.DialogUpdaterAlreadyOnLatestVersionMessage],
-                            string.Empty);
-
-                        if (userResult is UserResult.Ok)
-                        {
-                            OpenHelper.OpenUrl(_changelogUrlFormat.Format(currentVersion));
-                        }
-                    }
-
-                    Logger.Info?.Print(LogClass.Application, "Up to date.");
-
-                    _running = false;
-
-                    return default;
-                }
-            }
-            catch (Exception exception)
-            {
-                Logger.Error?.Print(LogClass.Application, exception.Message);
-
-                await ContentDialogHelper.CreateErrorDialog(
-                    LocaleManager.Instance[LocaleKeys.DialogUpdaterFailedToGetVersionMessage]);
-
-                _running = false;
-
-                return default;
-            }
-
-            if (!Version.TryParse(_buildVer, out Version newVersion))
-            {
-                Logger.Error?.Print(LogClass.Application, $"Failed to convert the received {RyujinxApp.FullAppName} version from GitHub!");
-
-                await ContentDialogHelper.CreateWarningDialog(
-                    LocaleManager.Instance[LocaleKeys.DialogUpdaterConvertFailedGithubMessage],
-                    LocaleManager.Instance[LocaleKeys.DialogUpdaterCancelUpdateMessage]);
-
-                _running = false;
-
-                return default;
-            }
-
-            return (currentVersion, newVersion);
-        }
-    }
-    
-    public readonly struct GitHubReleaseChannels
-    {
-        public static async Task<GitHubReleaseChannels> GetAsync(HttpClient httpClient)
-        {
-            ReleaseChannelPair releaseChannelPair = await httpClient.GetFromJsonAsync("https://ryujinx.app/api/release-channels", ReleaseChannelPairContext.Default.ReleaseChannelPair);
-            return new GitHubReleaseChannels(releaseChannelPair);
-        }
-        
-        internal GitHubReleaseChannels(ReleaseChannelPair channelPair)
-        {
-            Stable = new Channel(channelPair.Stable);
-            Canary = new Channel(channelPair.Canary);
-        }
-
-        public readonly Channel Stable;
-        public readonly Channel Canary;
-
-        public readonly struct Channel
-        {
-            public Channel(string raw)
-            {
-                string[] parts = raw.Split('/');
-                Owner = parts[0];
-                Repo = parts[1];
-            }
-
-            public readonly string Owner;
-            public readonly string Repo;
-
-            public string UrlFormat => $"https://github.com/{ToString()}/releases/{{0}}";
-
-            public override string ToString() => $"{Owner}/{Repo}";
-
-            public string GetLatestReleaseApiUrl() =>
-                $"https://api.github.com/repos/{ToString()}/releases/latest";
-        }
-    }
-
-    [JsonSerializable(typeof(ReleaseChannelPair))]
-    partial class ReleaseChannelPairContext : JsonSerializerContext;
-
-    class ReleaseChannelPair
-    {
-        [JsonPropertyName("stable")]
-        public string Stable { get; set; }
-        [JsonPropertyName("canary")]
-        public string Canary { get; set; }
-    }
-}
--- a/src/Ryujinx/Systems/Updater/Updater.GitLab.cs
+++ b/src/Ryujinx/Systems/Updater/Updater.GitLab.cs
@ -4,44 +4,28 @@ using Ryujinx.Ava.UI.Helpers;
 using Ryujinx.Common;
 using Ryujinx.Common.Helper;
 using Ryujinx.Common.Logging;
+using Ryujinx.Systems.Update.Client;
+using Ryujinx.Systems.Update.Common;
 using System;
-using System.Net.Http;
-using System.Net.Http.Json;
-using System.Runtime.InteropServices;
-using System.Text.Json.Serialization;
 using System.Threading.Tasks;

 namespace Ryujinx.Ava.Systems
 {
    internal static partial class Updater
    {
-        private static string CreateUpdateQueryUrl()
-        {
-#pragma warning disable CS8524
-            var os = RunningPlatform.CurrentOS switch
-#pragma warning restore CS8524
-            {
-                OperatingSystemType.MacOS => "mac",
-                OperatingSystemType.Linux => "linux",
-                OperatingSystemType.Windows => "win"
-            };
+        private static VersionResponse _versionResponse;

-            var arch = RunningPlatform.Architecture switch
-            {
-                Architecture.Arm64 => "arm",
-                Architecture.X64 => "amd64",
-                _ => null
-            };
+        private static UpdateClient CreateUpdateClient()
+            => UpdateClient.Builder()
+                .WithServerEndpoint("https://update.ryujinx.app") // This is the default, and doesn't need to be provided; it's here for transparency.
+                .WithLogger((format, args, caller) => 
+                    Logger.Info?.Print(
+                        LogClass.Application, 
+                        args.Length is 0 ? format : format.Format(args), 
+                        caller: caller)
+                    );

-            if (arch is null)
-                return null;
-
-            var rc = ReleaseInformation.IsCanaryBuild ? "canary" : "stable";
-
-            return $"https://update.ryujinx.app/latest/query?os={os}&arch={arch}&rc={rc}";
-        }
-
-        private static async Task<Optional<(Version Current, Version Incoming)>> CheckGitLabVersionAsync(bool showVersionUpToDate = false)
+        public static async Task<Optional<(Version Current, Version Incoming)>> CheckVersionAsync(bool showVersionUpToDate = false)
        {
            if (!Version.TryParse(Program.Version, out Version currentVersion))
            {
@ -57,41 +41,31 @@ namespace Ryujinx.Ava.Systems
                return default;
            }

-            if (CreateUpdateQueryUrl() is not {} updateUrl)
-            {
-                Logger.Error?.Print(LogClass.Application, "Could not determine URL for updates.");
-                
-                _running = false;
-
-                return default;
-            }
-
-            Logger.Info?.Print(LogClass.Application, $"Checking for updates from {updateUrl}.");
-
-            // Get latest version number from GitLab API
-            using HttpClient jsonClient = ConstructHttpClient();
-
-            // GitLab instance is located in Ukraine. Connection times will vary across the world.
-            jsonClient.Timeout = TimeSpan.FromSeconds(10);
+            using UpdateClient updateClient = CreateUpdateClient();

            try
            {
-                UpdaterResponse response =
-                    await jsonClient.GetFromJsonAsync(updateUrl, UpdaterResponseJsonContext.Default.UpdaterResponse);
-
-                _buildVer = response.Tag;
-                _buildUrl = response.DownloadUrl;
-                _changelogUrlFormat = response.ReleaseUrlFormat;
+                _versionResponse = await updateClient.QueryLatestAsync(ReleaseInformation.IsCanaryBuild
+                    ? ReleaseChannel.Canary
+                    : ReleaseChannel.Stable);
            }
            catch (Exception e)
            {
-                throw new AggregateException(
-                    $"An error occurred when parsing JSON response from API ({e.GetType().AsFullNamePrettyString()}): {e.Message}",
-                    e);
+                Logger.Error?.Print(LogClass.Application, $"An error occurred when requesting for updates ({e.GetType().AsFullNamePrettyString()}): {e.Message}");
+
+                _running = false;
+                return default;
+            }
+            
+            if (_versionResponse == null)
+            {
+                // logging is done via the UpdateClient library
+                _running = false;
+                return default;
            }

            // If build URL not found, assume no new update is available.
-            if (_buildUrl is null or "")
+            if (_versionResponse.ArtifactUrl is null or "")
            {
                if (showVersionUpToDate)
                {
@ -101,7 +75,7 @@ namespace Ryujinx.Ava.Systems

                    if (userResult is UserResult.Ok)
                    {
-                        OpenHelper.OpenUrl(_changelogUrlFormat.Format(currentVersion));
+                        OpenHelper.OpenUrl(_versionResponse.ReleaseUrlFormat.Format(currentVersion));
                    }
                }

@ -113,13 +87,13 @@ namespace Ryujinx.Ava.Systems
            }


-            if (!Version.TryParse(_buildVer, out Version newVersion))
+            if (!Version.TryParse(_versionResponse.Version, out Version newVersion))
            {
                Logger.Error?.Print(LogClass.Application,
-                    $"Failed to convert the received {RyujinxApp.FullAppName} version from GitLab!");
+                    $"Failed to convert the received {RyujinxApp.FullAppName} version from the update server!");

                await ContentDialogHelper.CreateWarningDialog(
-                    LocaleManager.Instance[LocaleKeys.DialogUpdaterConvertFailedGithubMessage],
+                    LocaleManager.Instance[LocaleKeys.DialogUpdaterConvertFailedServerMessage],
                    LocaleManager.Instance[LocaleKeys.DialogUpdaterCancelUpdateMessage]);

                _running = false;
@ -129,17 +103,5 @@ namespace Ryujinx.Ava.Systems

            return (currentVersion, newVersion);
        }
-        
-        [JsonSerializable(typeof(UpdaterResponse))]
-        partial class UpdaterResponseJsonContext : JsonSerializerContext;
-
-        public class UpdaterResponse
-        {
-            [JsonPropertyName("tag")] public string Tag { get; set; }
-            [JsonPropertyName("download_url")] public string DownloadUrl { get; set; }
-            [JsonPropertyName("web_url")] public string ReleaseUrl { get; set; }
-
-            [JsonIgnore] public string ReleaseUrlFormat => ReleaseUrl.Replace(Tag, "{0}");
-        }
    }
 }
--- a/src/Ryujinx/Systems/Updater/Updater.cs
+++ b/src/Ryujinx/Systems/Updater/Updater.cs
@ -5,13 +5,11 @@ using ICSharpCode.SharpZipLib.GZip;
 using ICSharpCode.SharpZipLib.Tar;
 using ICSharpCode.SharpZipLib.Zip;
 using Ryujinx.Ava.Common.Locale;
-using Ryujinx.Ava.Common.Models.Github;
 using Ryujinx.Ava.UI.Helpers;
 using Ryujinx.Ava.Utilities;
 using Ryujinx.Common;
 using Ryujinx.Common.Helper;
 using Ryujinx.Common.Logging;
-using Ryujinx.Common.Utilities;
 using System;
 using System.Collections.Generic;
 using System.Diagnostics;
@ -31,43 +29,17 @@ namespace Ryujinx.Ava.Systems
 {
    internal static partial class Updater
    {
-        private static readonly GithubReleasesJsonSerializerContext _ghSerializerContext = new(JsonHelper.GetDefaultSerializerOptions());
-
-        private static readonly string _platformExt = BuildPlatformExtension();
        private static readonly string _homeDir = AppDomain.CurrentDomain.BaseDirectory;
        private static readonly string _updateDir = Path.Combine(Path.GetTempPath(), "Ryujinx", "update");
        private static readonly string _updatePublishDir = Path.Combine(_updateDir, "publish");
        private const int ConnectionCount = 4;
        
-        private static string _buildVer;
-        private static string _buildUrl;
        private static long _buildSize;
        private static bool _updateSuccessful;
        private static bool _running;

        private static readonly string[] _windowsDependencyDirs = [];
        
-        private static string _changelogUrlFormat = null;
-
-        public static async Task<Optional<(Version, Version)>> CheckVersionAsync(bool showVersionUpToDate = false)
-        {
-            Optional<(Version, Version)> versionTuple;
-
-            try
-            {
-                versionTuple = await CheckGitLabVersionAsync(showVersionUpToDate);
-            }
-            catch (Exception e)
-            {
-                Logger.Error?.PrintMsg(LogClass.Application, "Update checking from GitLab failed; falling back to GitHub.");
-                Logger.Error?.PrintMsg(LogClass.Application, e.Message);
-                versionTuple = await CheckGitHubVersionAsync(showVersionUpToDate);
-            }
-
-            return versionTuple;
-        }
-        
-        
        public static async Task BeginUpdateAsync(bool showVersionUpToDate = false)
        {
            if (_running)
@ -94,7 +66,7 @@ namespace Ryujinx.Ava.Systems

                    if (userResult is UserResult.Ok)
                    {
-                        OpenHelper.OpenUrl(_changelogUrlFormat.Format(currentVersion));
+                        OpenHelper.OpenUrl(_versionResponse.ReleaseUrlFormat.Format(currentVersion));
                    }
                }

@ -114,7 +86,7 @@ namespace Ryujinx.Ava.Systems
                // GitLab instance is located in Ukraine. Connection times will vary across the world.
                buildSizeClient.Timeout = TimeSpan.FromSeconds(10);

-                HttpResponseMessage message = await buildSizeClient.GetAsync(new Uri(_buildUrl), HttpCompletionOption.ResponseHeadersRead);
+                HttpResponseMessage message = await buildSizeClient.GetAsync(new Uri(_versionResponse.ArtifactUrl), HttpCompletionOption.ResponseHeadersRead);

                _buildSize = message.Content.Headers.ContentRange.Length.Value;
            }
@ -144,7 +116,7 @@ namespace Ryujinx.Ava.Systems
                switch (shouldUpdate)
                {
                    case UserResult.Yes:
-                        await UpdateRyujinx(_buildUrl);
+                        await UpdateRyujinx(_versionResponse.ArtifactUrl);
                        break;
                    // Secondary button maps to no, which in this case is the show changelog button.
                    case UserResult.No:
--- a/src/Ryujinx/UI/Applet/AvaloniaHostUITheme.cs
+++ b/src/Ryujinx/UI/Applet/AvaloniaHostUITheme.cs
@ -2,29 +2,104 @@ using Avalonia.Media;
 using Ryujinx.Ava.UI.Windows;
 using Ryujinx.HLE.UI;
 using System;
+using System.Globalization;

 namespace Ryujinx.Ava.UI.Applet
 {
-    class AvaloniaHostUITheme(MainWindow parent) : IHostUITheme
+    class AvaloniaHostUITheme : IHostUITheme
    {
-        public string FontFamily { get; } = OperatingSystem.IsWindows() && OperatingSystem.IsWindowsVersionAtLeast(10, 0, 22000) ? "Segoe UI Variable" : parent.FontFamily.Name;
+        private readonly MainWindow _parent;

-        public ThemeColor DefaultBackgroundColor { get; } = BrushToThemeColor(parent.Background);
-        public ThemeColor DefaultForegroundColor { get; } = BrushToThemeColor(parent.Foreground);
-        public ThemeColor DefaultBorderColor { get; } = BrushToThemeColor(parent.BorderBrush);
-        public ThemeColor SelectionBackgroundColor { get; } = BrushToThemeColor(parent.ViewControls.SearchBox.SelectionBrush);
-        public ThemeColor SelectionForegroundColor { get; } = BrushToThemeColor(parent.ViewControls.SearchBox.SelectionForegroundBrush);
+        public string FontFamily { get; }
+        public ThemeColor DefaultBackgroundColor { get; }
+        public ThemeColor DefaultForegroundColor { get; }
+        public ThemeColor DefaultBorderColor { get; }
+        public ThemeColor SelectionBackgroundColor { get; }
+        public ThemeColor SelectionForegroundColor { get; }
+
+        public AvaloniaHostUITheme(MainWindow parent)
+        {
+            _parent = parent;
+
+            // Initialize font property
+            FontFamily = GetSystemFontFamily();
+
+            // Initialize all properties that depend on parent
+            DefaultBackgroundColor = BrushToThemeColor(parent.Background);
+            DefaultForegroundColor = BrushToThemeColor(parent.Foreground);
+            DefaultBorderColor = BrushToThemeColor(parent.BorderBrush);
+            SelectionBackgroundColor = BrushToThemeColor(parent.ViewControls.SearchBox.SelectionBrush);
+            SelectionForegroundColor = BrushToThemeColor(parent.ViewControls.SearchBox.SelectionForegroundBrush);
+        }
+
+        private string GetSystemFontFamily()
+        {
+            if (OperatingSystem.IsWindows())
+            {
+                return GetWindowsFontByLanguage();
+            }
+            else if (OperatingSystem.IsMacOS())
+            {
+                return GetMacOSFontByLanguage();
+            }
+            else // Linux and other platforms
+            {
+                return GetLinuxFontByLanguage();
+            }
+        }
+
+        private string GetWindowsFontByLanguage()
+        {
+            var culture = CultureInfo.CurrentUICulture;
+            string langCode = culture.Name;
+
+            return culture.TwoLetterISOLanguageName switch
+            {
+                "zh" => langCode == "zh-CN" || langCode == "zh-Hans" || langCode == "zh-SG"
+                    ? "Microsoft YaHei UI"  // Simplified Chinese
+                    : "Microsoft JhengHei UI", // Traditional Chinese
+
+                "ja" => "Yu Gothic UI",     // Japanese
+                "ko" => "Malgun Gothic",     // Korean
+                _ => OperatingSystem.IsWindowsVersionAtLeast(10, 0, 22000)
+                    ? "Segoe UI Variable"   // Other languages - Windows 11+
+                    : _parent.FontFamily.Name // Fallback to parent window font
+            };
+        }
+
+        private string GetMacOSFontByLanguage()
+        {
+            return CultureInfo.CurrentUICulture.TwoLetterISOLanguageName switch
+            {
+                "zh" => "PingFang SC",      // Chinese (both simplified and traditional)
+                "ja" => "Hiragino Sans",    // Japanese
+                "ko" => "Apple SD Gothic Neo", // Korean
+                _ => _parent.FontFamily.Name // Fallback to parent window font
+            };
+        }
+
+        private string GetLinuxFontByLanguage()
+        {
+            return CultureInfo.CurrentUICulture.TwoLetterISOLanguageName switch
+            {
+                "zh" => "Noto Sans CJK SC", // Chinese
+                "ja" => "Noto Sans CJK JP", // Japanese
+                "ko" => "Noto Sans CJK KR", // Korean
+                _ => _parent.FontFamily.Name // Fallback to parent window font
+            };
+        }

        private static ThemeColor BrushToThemeColor(IBrush brush)
        {
            if (brush is SolidColorBrush solidColor)
            {
-                return new ThemeColor((float)solidColor.Color.A / 255,
+                return new ThemeColor(
+                    (float)solidColor.Color.A / 255,
                    (float)solidColor.Color.R / 255,
                    (float)solidColor.Color.G / 255,
-                    (float)solidColor.Color.B / 255);
+                    (float)solidColor.Color.B / 255
+                );
            }
-
            return new ThemeColor();
        }
    }
--- a/src/Ryujinx/UI/Helpers/Win32NativeInterop.cs
+++ b/src/Ryujinx/UI/Helpers/Win32NativeInterop.cs
@ -110,5 +110,8 @@ namespace Ryujinx.Ava.UI.Helpers

        [LibraryImport("user32.dll", SetLastError = true)]
        public static partial nint SetWindowLongPtrW(nint hWnd, int nIndex, nint value);
+
+        [LibraryImport("user32.dll", SetLastError = true)]
+        public static partial ushort GetAsyncKeyState(int nVirtKey);
    }
 }
--- a/src/Ryujinx/UI/ViewModels/Input/InputViewModel.cs
+++ b/src/Ryujinx/UI/ViewModels/Input/InputViewModel.cs
@ -50,6 +50,9 @@ namespace Ryujinx.Ava.UI.ViewModels.Input
        private string _controllerImage;
        private int _device;
        private object _configViewModel;
+        private bool _isChangeTrackingActive;
+        private string _chosenProfile;
+        [ObservableProperty] private bool _isModified;
        [ObservableProperty] private string _profileName;
        [ObservableProperty] private bool _notificationIsVisible; // Automatically call the NotificationView property with OnPropertyChanged()
        [ObservableProperty] private string _notificationText; // Automatically call the NotificationText property with OnPropertyChanged()
@ -84,6 +87,8 @@ namespace Ryujinx.Ava.UI.ViewModels.Input
        public AvaloniaList<string> ProfilesList { get; set; }
        public AvaloniaList<string> DeviceList { get; set; }

+        public bool UseGlobalConfig;
+
        // XAML Flags
        public bool ShowSettings => _device > 0;
        public bool IsController => _device > 1;
@ -94,31 +99,16 @@ namespace Ryujinx.Ava.UI.ViewModels.Input
        public bool HasLed => SelectedGamepad.Features.HasFlag(GamepadFeaturesFlag.Led);
        public bool CanClearLed => SelectedGamepad.Name.ContainsIgnoreCase("DualSense");

-        public bool _isChangeTrackingActive;
-
-        public bool _isModified;
-
-        public bool IsModified
-        {
-            get => _isModified;
-            set
-            {
-                _isModified = value;
-                OnPropertyChanged();
-            }
-        }
-
        public event Action NotifyChangesEvent;
        
-        public string _profileChoose;
-        public string ProfileChoose
+        public string ChosenProfile
        {
-            get => _profileChoose;
+            get => _chosenProfile;
            set
            {
                // When you select a profile, the settings from the profile will be applied.
                // To save the settings, you still need to click the apply button
-                _profileChoose = value;
+                _chosenProfile = value;
                LoadProfile();
                OnPropertyChanged();
            }
@ -290,7 +280,7 @@ namespace Ryujinx.Ava.UI.ViewModels.Input

        public InputConfig Config { get; set; }

-        public InputViewModel(UserControl owner) : this()
+        public InputViewModel(UserControl owner, bool useGlobal = false) : this()
        {
            if (Program.PreviewerDetached)
            {
@ -303,6 +293,8 @@ namespace Ryujinx.Ava.UI.ViewModels.Input

                _mainWindow.ViewModel.AppHost?.NpadManager.BlockInputUpdates();

+                UseGlobalConfig = useGlobal;
+
                _isLoaded = false;

                LoadDevices();
@ -335,9 +327,18 @@ namespace Ryujinx.Ava.UI.ViewModels.Input
            PlayerIndexes.Add(new(PlayerIndex.Handheld, LocaleManager.Instance[LocaleKeys.ControllerSettingsHandheld]));
        }

+
+
        private void LoadConfiguration(InputConfig inputConfig = null)
+        {
+            if (UseGlobalConfig && Program.UseExtraConfig)
+            {
+                Config = inputConfig ?? ConfigurationState.InstanceExtra.Hid.InputConfig.Value.FirstOrDefault(inputConfig => inputConfig.PlayerIndex == _playerId);            
+            }
+            else
            {
                Config = inputConfig ?? ConfigurationState.Instance.Hid.InputConfig.Value.FirstOrDefault(inputConfig => inputConfig.PlayerIndex == _playerId);
+            }

            if (Config is StandardKeyboardInputConfig keyboardInputConfig)
            {
@ -902,7 +903,7 @@ namespace Ryujinx.Ava.UI.ViewModels.Input

                    LoadProfiles();

-                    ProfileChoose = ProfileName; // Show new profile
+                    ChosenProfile = ProfileName; // Show new profile
                }
                else
                {
@ -936,7 +937,7 @@ namespace Ryujinx.Ava.UI.ViewModels.Input

                LoadProfiles();

-                ProfileChoose = ProfilesList[0].ToString(); // Show default profile
+                ChosenProfile = ProfilesList[0].ToString(); // Show default profile
            }
        }

@ -966,7 +967,14 @@ namespace Ryujinx.Ava.UI.ViewModels.Input

            List<InputConfig> newConfig = [];

+            if (UseGlobalConfig && Program.UseExtraConfig)
+            {
+                newConfig.AddRange(ConfigurationState.InstanceExtra.Hid.InputConfig.Value);
+            }
+            else
+            {
                newConfig.AddRange(ConfigurationState.Instance.Hid.InputConfig.Value);
+            }

            newConfig.Remove(newConfig.FirstOrDefault(x => x == null));

@ -1007,18 +1015,21 @@ namespace Ryujinx.Ava.UI.ViewModels.Input
                }
            }

-            _mainWindow.ViewModel.AppHost?.NpadManager.ReloadConfiguration(newConfig, ConfigurationState.Instance.Hid.EnableKeyboard, ConfigurationState.Instance.Hid.EnableMouse);
-
            // Atomically replace and signal input change.
            // NOTE: Do not modify InputConfig.Value directly as other code depends on the on-change event.
-            ConfigurationState.Instance.Hid.InputConfig.Value = newConfig;
+            _mainWindow.ViewModel.AppHost?.NpadManager.ReloadConfiguration(newConfig, ConfigurationState.Instance.Hid.EnableKeyboard, ConfigurationState.Instance.Hid.EnableMouse);

+            if (UseGlobalConfig && Program.UseExtraConfig)
+            {
+                // In User Settings when "Use Global Input" is enabled, it saves global input to global setting
+                ConfigurationState.InstanceExtra.Hid.InputConfig.Value = newConfig;
+                ConfigurationState.InstanceExtra.ToFileFormat().SaveConfig(Program.GlobalConfigurationPath);
+            }
+            else
+            {
+                ConfigurationState.Instance.Hid.InputConfig.Value = newConfig;
                ConfigurationState.Instance.ToFileFormat().SaveConfig(Program.ConfigurationPath);
            }
-
-        public void NotifyChange(string property)
-        {
-            OnPropertyChanged(property);
        }

        public void NotifyChanges()
--- a/src/Ryujinx/UI/ViewModels/MainWindowViewModel.cs
+++ b/src/Ryujinx/UI/ViewModels/MainWindowViewModel.cs
@ -310,10 +310,15 @@ namespace Ryujinx.Ava.UI.ViewModels

        private void TotalTimePlayed_Recalculated(Optional<TimeSpan> ts)
        {
-            ShowTotalTimePlayed = ts.HasValue;
-
            if (ts.HasValue)
-                LocaleManager.Instance.SetDynamicValues(LocaleKeys.GameListLabelTotalTimePlayed, ValueFormatUtils.FormatTimeSpan(ts.Value));
+            {
+                var formattedPlayTime = ValueFormatUtils.FormatTimeSpan(ts.Value);
+                LocaleManager.Instance.SetDynamicValues(LocaleKeys.GameListLabelTotalTimePlayed, formattedPlayTime);
+                ShowTotalTimePlayed = formattedPlayTime != string.Empty;
+                return;
+            }
+            
+            ShowTotalTimePlayed = ts.HasValue;
        }

        public bool ShowTotalTimePlayed
@ -334,7 +339,6 @@ namespace Ryujinx.Ava.UI.ViewModels
                _listSelectedApplication = value;

                if (_listSelectedApplication != null && ListAppContextMenu == null)
-
                    ListAppContextMenu = new ApplicationContextMenu();
                else if (_listSelectedApplication == null && ListAppContextMenu != null)
                    ListAppContextMenu = null!;
@ -1575,28 +1579,31 @@ namespace Ryujinx.Ava.UI.ViewModels
        public bool InitializeUserConfig(ApplicationData application)
        {
            // Code where conditions will be met before loading the user configuration (Global Config)
-            string BackendThreadingInit = Program.BackendThreadingArg;
-
-            BackendThreadingInit ??= ConfigurationState.Instance.Graphics.BackendThreading.Value.ToString();
+            string backendThreadingInit = Program.BackendThreadingArg ?? ConfigurationState.Instance.Graphics.BackendThreading.Value.ToString();

            // If a configuration is found in the "/games/xxxxxxxxxxxxxx" folder, the program will load the user setting. 
            string idGame = application.IdBaseString;
            if (ConfigurationFileFormat.TryLoad(Program.GetDirGameUserConfig(idGame), out ConfigurationFileFormat configurationFileFormat))
            {
                // Loads the user configuration, having previously changed the global configuration to the user configuration              
-                ConfigurationState.Instance.Load(configurationFileFormat, Program.GetDirGameUserConfig(idGame, true, true), idGame);
+                ConfigurationState.Instance.Load(configurationFileFormat, Program.GetDirGameUserConfig(idGame, true), idGame);
+
+                if (ConfigurationFileFormat.TryLoad(Program.GlobalConfigurationPath, out ConfigurationFileFormat configurationFileFormatExtra))
+                {
+                    //This is where the global configuration will be stored.
+                    //This allows you to change the global configuration settings during the game (for example, the global input setting)
+                    ConfigurationState.InstanceExtra.Load(configurationFileFormatExtra, Program.GlobalConfigurationPath);
+                }
            }

            // Code where conditions will be executed after loading user configuration
-            if (ConfigurationState.Instance.Graphics.BackendThreading.Value.ToString() != BackendThreadingInit)
+            if (ConfigurationState.Instance.Graphics.BackendThreading.Value.ToString() != backendThreadingInit)
            {
-
-                List<string> Arguments = new()
-                {
-                    "--bt", ConfigurationState.Instance.Graphics.BackendThreading.Value.ToString() // BackendThreading
-                };
-
-                Rebooter.RebootAppWithGame(application.Path, Arguments);
+                Rebooter.RebootAppWithGame(application.Path, 
+                [
+                    "--bt", 
+                    ConfigurationState.Instance.Graphics.BackendThreading.Value.ToString()
+                ]);

                return true;
            }
@ -1685,8 +1692,8 @@ namespace Ryujinx.Ava.UI.ViewModels
                RendererHostControl.Focus();
            });

-        public static void UpdateGameMetadata(string titleId)
-            => ApplicationLibrary.LoadAndSaveMetaData(titleId, appMetadata => appMetadata.UpdatePostGame());
+        public static void UpdateGameMetadata(string titleId, TimeSpan playTime)
+            => ApplicationLibrary.LoadAndSaveMetaData(titleId, appMetadata => appMetadata.UpdatePostGame(playTime));

        public void RefreshFirmwareStatus()
        {
@ -1991,7 +1998,7 @@ namespace Ryujinx.Ava.UI.ViewModels

                    // just checking for file presence
                    viewModel.SelectedApplication.HasIndependentConfiguration = File.Exists(
-                        Program.GetDirGameUserConfig(viewModel.SelectedApplication.IdString, false, false));
+                        Program.GetDirGameUserConfig(viewModel.SelectedApplication.IdString));

                    viewModel.RefreshView();
                });
--- a/src/Ryujinx/UI/ViewModels/SettingsViewModel.cs
+++ b/src/Ryujinx/UI/ViewModels/SettingsViewModel.cs
@ -53,6 +53,7 @@ namespace Ryujinx.Ava.UI.ViewModels
        [ObservableProperty] private bool _isVulkanAvailable = true;
        [ObservableProperty] private bool _gameListNeedsRefresh;
        private readonly List<string> _gpuIds = [];
+        public bool _useInputGlobalConfig;
        private int _graphicsBackendIndex;
        private int _scalingFilter;
        private int _scalingFilterLevel;
@ -64,6 +65,7 @@ namespace Ryujinx.Ava.UI.ViewModels

        public event Action CloseWindow;
        public event Action SaveSettingsEvent;
+        public event Action<bool> LocalGlobalInputSwitchEvent;
        private int _networkInterfaceIndex;
        private int _multiplayerModeIndex;
        private string _ldnPassphrase;
@ -84,6 +86,7 @@ namespace Ryujinx.Ava.UI.ViewModels
        public bool IsGameTitleNotNull => !string.IsNullOrEmpty(GameTitle);
        public double PanelOpacity => IsGameTitleNotNull ? 0.5 : 1;

+
        public int ResolutionScale
        {
            get => _resolutionScale;
@ -142,9 +145,22 @@ namespace Ryujinx.Ava.UI.ViewModels
        public bool EnableKeyboard { get; set; }
        public bool EnableMouse { get; set; }
        public bool DisableInputWhenOutOfFocus { get; set; }        
-
        public int FocusLostActionType { get; set; }

+        public bool UseGlobalInputConfig
+        { 
+            get => _useInputGlobalConfig;
+            set
+            {
+                _useInputGlobalConfig = value;
+                LocalGlobalInputSwitchEvent?.Invoke(_useInputGlobalConfig);
+                OnPropertyChanged(nameof(InputPanelOpacity));
+                OnPropertyChanged();
+            }
+        }
+
+        public double InputPanelOpacity => UseGlobalInputConfig ? 0.5 : 1;
+
        public VSyncMode VSyncMode
        {
            get => _vSyncMode;  
@ -371,7 +387,7 @@ namespace Ryujinx.Ava.UI.ViewModels

        public bool IsInvalidLdnPassphraseVisible { get; set; }

-        public SettingsViewModel(VirtualFileSystem virtualFileSystem, ContentManager contentManager) : this(false)
+        public SettingsViewModel(VirtualFileSystem virtualFileSystem, ContentManager contentManager) : this()
        {
            _virtualFileSystem = virtualFileSystem;
            _contentManager = contentManager;
@ -392,7 +408,7 @@ namespace Ryujinx.Ava.UI.ViewModels
            string gameName,
            string gameId,
            byte[] gameIconData,
-            bool enableToLoadCustomConfig) : this(enableToLoadCustomConfig)
+            bool customConfig) : this()
        {
            _virtualFileSystem = virtualFileSystem;
            _contentManager = contentManager;
@ -408,9 +424,18 @@ namespace Ryujinx.Ava.UI.ViewModels
            _gameTitle = gameName;
            _gameId = gameId;

-            if (enableToLoadCustomConfig) // During the game. If there is no user config, then load the global config window
+            if (customConfig) // During the game. If there is no user config, then load the global config window
            {
-                string gameDir = Program.GetDirGameUserConfig(gameId, false, true);
+                string gameDir = Program.GetDirGameUserConfig(gameId, true);
+
+                Program.UseExtraConfig = true;
+
+                if (ConfigurationFileFormat.TryLoad(Program.GlobalConfigurationPath, out ConfigurationFileFormat configurationFileFormatExtra))
+                {
+                    // Extra load global configuration for input setting and save global input setting with other global config
+                    ConfigurationState.InstanceExtra.Load(configurationFileFormatExtra, Program.GlobalConfigurationPath);
+                }
+
                if (ConfigurationFileFormat.TryLoad(gameDir, out ConfigurationFileFormat configurationFileFormat))
                {
                    ConfigurationState.Instance.Load(configurationFileFormat, gameDir, gameId);
@ -426,7 +451,7 @@ namespace Ryujinx.Ava.UI.ViewModels
            }
        }

-        public SettingsViewModel(bool noLoadGlobalConfig = false)
+        public SettingsViewModel()
        {
            GameDirectories = [];
            AutoloadDirectories = [];
@ -550,9 +575,9 @@ namespace Ryujinx.Ava.UI.ViewModels
            }
        }

-        public void LoadCurrentConfiguration()
+        public void LoadCurrentConfiguration(bool global = false)
        {
-            ConfigurationState config = ConfigurationState.Instance;
+            ConfigurationState config = global ? ConfigurationState.InstanceExtra: ConfigurationState.Instance;

            // User Interface
            EnableDiscordIntegration = config.EnableDiscordIntegration;
@ -578,6 +603,7 @@ namespace Ryujinx.Ava.UI.ViewModels
            };

            // Input
+            UseGlobalInputConfig = config.System.UseInputGlobalConfig;
            EnableDockedMode = config.System.EnableDockedMode;
            EnableKeyboard = config.Hid.EnableKeyboard;
            EnableMouse = config.Hid.EnableMouse;
@ -660,9 +686,9 @@ namespace Ryujinx.Ava.UI.ViewModels
            LdnServer = config.Multiplayer.LdnServer;
        }

-        public void SaveSettings()
+        public void SaveSettings(bool global = false)
        {
-            ConfigurationState config = ConfigurationState.Instance;
+            ConfigurationState config = global ? ConfigurationState.InstanceExtra: ConfigurationState.Instance;

            // User Interface
            config.EnableDiscordIntegration.Value = EnableDiscordIntegration;
@ -684,6 +710,7 @@ namespace Ryujinx.Ava.UI.ViewModels
            };

            // Input
+            config.System.UseInputGlobalConfig.Value = UseGlobalInputConfig;
            config.System.EnableDockedMode.Value = EnableDockedMode;
            config.Hid.EnableKeyboard.Value = EnableKeyboard;
            config.Hid.EnableMouse.Value = EnableMouse;
@ -796,11 +823,14 @@ namespace Ryujinx.Ava.UI.ViewModels

        private static void RevertIfNotSaved()
        {
-            // maybe this is an unnecessary check(all options need to be tested)
+            /*
+            maybe this is an unnecessary check(all options need to be tested)
            if (string.IsNullOrEmpty(Program.GlobalConfigurationPath))
            {
                Program.ReloadConfig();
            }
+            */
+            Program.ReloadConfig();
        }

        public void ApplyButton()
@ -810,7 +840,7 @@ namespace Ryujinx.Ava.UI.ViewModels

        public void DeleteConfigGame()
        {
-            string gameDir = Program.GetDirGameUserConfig(GameId, false, false);
+            string gameDir = Program.GetDirGameUserConfig(GameId);

            if (File.Exists(gameDir))
            {
--- a/src/Ryujinx/UI/Views/Input/InputView.axaml
+++ b/src/Ryujinx/UI/Views/Input/InputView.axaml
@ -100,7 +100,7 @@
                        Name="ProfileBox"
                        HorizontalAlignment="Stretch"
                        VerticalAlignment="Center"
-                        SelectedItem="{Binding ProfileChoose, Mode=TwoWay}"
+                        SelectedItem="{Binding ChosenProfile, Mode=TwoWay}"
                        SelectionChanged="ComboBox_SelectionChanged"
                        ItemsSource="{Binding ProfilesList}"
                        Text="{Binding ProfileName, Mode=TwoWay}" />
@ -203,7 +203,6 @@
        </StackPanel>
        <ContentControl IsVisible="{Binding NotificationIsVisible}">
            <ContentControl.Content>
-
                <StackPanel>
                    <TextBlock 
                        Margin="5,20,0,0"
--- a/src/Ryujinx/UI/Views/Input/InputView.axaml.cs
+++ b/src/Ryujinx/UI/Views/Input/InputView.axaml.cs
@ -1,6 +1,7 @@
 using Avalonia.Controls;
 using FluentAvalonia.UI.Controls;
 using Ryujinx.Ava.Common.Locale;
+using Ryujinx.Ava.Systems.Configuration;
 using Ryujinx.Ava.UI.Controls;
 using Ryujinx.Ava.UI.Helpers;
 using Ryujinx.Ava.UI.Models;
@ -14,7 +15,7 @@ namespace Ryujinx.Ava.UI.Views.Input

        public InputView()
        {
-            ViewModel = new InputViewModel(this);
+            ViewModel = new InputViewModel(this, ConfigurationState.Instance.System.UseInputGlobalConfig);

            InitializeComponent();
        }
@ -24,6 +25,13 @@ namespace Ryujinx.Ava.UI.Views.Input
            ViewModel.Save();
        }

+        public void ToggleLocalGlobalInput(bool enableConfigGlobal)
+        {
+            Dispose();
+            ViewModel = new InputViewModel(this, enableConfigGlobal); // Create new Input Page with global input configs
+            InitializeComponent();
+        }
+
        private async void PlayerIndexBox_OnSelectionChanged(object sender, SelectionChangedEventArgs e)
        {
            if (PlayerIndexBox != null)
--- a/src/Ryujinx/UI/Views/Main/MainStatusBarView.axaml
+++ b/src/Ryujinx/UI/Views/Main/MainStatusBarView.axaml
@ -64,6 +64,7 @@
                    MinWidth="200"
                    Height="6"
                    VerticalAlignment="Center"
+                    Margin="0, 0, 5, 0"
                    Foreground="{DynamicResource SystemAccentColorLight2}"
                    IsVisible="{Binding StatusBarVisible}"
                    Maximum="{Binding StatusBarProgressMaximum}"
--- a/src/Ryujinx/UI/Views/Settings/SettingsInputView.axaml
+++ b/src/Ryujinx/UI/Views/Settings/SettingsInputView.axaml
@ -1,4 +1,4 @@
-<UserControl
+<UserControl
    x:Class="Ryujinx.Ava.UI.Views.Settings.SettingsInputView"
    xmlns="https://github.com/avaloniaui"
    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
@ -22,9 +22,16 @@
            <Panel
                Margin="10">
                <Grid RowDefinitions="Auto,*,Auto">
+                    <StackPanel>
+                        <!--
+                           Opacity="{Binding PanelOpacityInput}">
+                       
+                            IsEnabled="{Binding !EnableConfigGlobal}">
+                            -->
                        <views:InputView
                            Grid.Row="0"
                            Name="InputView" />
+                    </StackPanel>
                    <StackPanel
                        Orientation="Vertical"
                        Grid.Row="2">
@ -34,6 +41,13 @@
                        <StackPanel
                            Orientation="Horizontal"
                            Spacing="10">
+                            <CheckBox                          
+                                ToolTip.Tip="{ext:Locale UseGlobalInputTooltip}"
+                                MinWidth="0"
+                                IsChecked="{Binding UseGlobalInputConfig}">
+                                <TextBlock
+                                    Text="{ext:Locale SettingsTabInputUseGlobalInput}" />
+                            </CheckBox>
                            <CheckBox
                                ToolTip.Tip="{ext:Locale DockModeToggleTooltip}"
                                MinWidth="0"
--- a/src/Ryujinx/UI/Windows/GameSpecificSettingsWindow.axaml
+++ b/src/Ryujinx/UI/Windows/GameSpecificSettingsWindow.axaml
@ -120,15 +120,24 @@
                    IconSource="Code" />
            </ui:NavigationView.MenuItems>
        </ui:NavigationView>
-       
+        <Grid Grid.Row="3"
+           ColumnDefinitions="Auto,*,Auto">
+                <StackPanel Grid.Column="0" Orientation="Horizontal" Margin="10" Spacing="10">
+                    <Button
+                        IsVisible="{Binding !IsGameRunning}"
+                        Content="{ext:Locale UserProfilesDelete}"
+                        Command="{Binding DeleteConfigGame}"
+                        Classes="red"/>
+                </StackPanel>
            <ReversibleStackPanel
-            Grid.Row="2"
+                Grid.Column="2"
                Margin="10"
                Spacing="10"
                Orientation="Horizontal"
                HorizontalAlignment="Right"
                ReverseOrder="{x:Static helper:RunningPlatform.IsMacOS}">
                <Button
+                    Classes="accent"
                    Content="{ext:Locale SettingsButtonSave}"
                    Command="{Binding SaveUserConfig}" />
                <Button
@ -136,14 +145,9 @@
                    Content="{ext:Locale SettingsButtonClose}"
                    Command="{Binding CancelButton}" />
                <Button
-                IsVisible="{Binding IsGameRunning}"
                    Content="{ext:Locale SettingsButtonApply}"
                    Command="{Binding ApplyButton}" />
-            <Button
-                IsVisible="{Binding !IsGameRunning}"
-                Content="{ext:Locale UserProfilesDelete}"
-                Command="{Binding DeleteConfigGame}"
-                Classes="red"/>
            </ReversibleStackPanel>
        </Grid>
+    </Grid>
 </window:StyleableAppWindow>
--- a/src/Ryujinx/UI/Windows/GameSpecificSettingsWindow.axaml.cs
+++ b/src/Ryujinx/UI/Windows/GameSpecificSettingsWindow.axaml.cs
@ -28,6 +28,8 @@ namespace Ryujinx.Ava.UI.Windows
            ViewModel.CloseWindow += Close;
            ViewModel.SaveSettingsEvent += SaveSettings;

+            ViewModel.LocalGlobalInputSwitchEvent += ToggleLocalGlobalInput;
+
            InitializeComponent();
            Load();
        }
@ -37,6 +39,11 @@ namespace Ryujinx.Ava.UI.Windows
            InputPage.InputView?.SaveCurrentProfile();
        }

+        public void ToggleLocalGlobalInput(bool enableConfigGlobal)
+        {
+            InputPage.InputView?.ToggleLocalGlobalInput(enableConfigGlobal);
+        }
+
        private void Load()
        {
            Pages.Children.Clear();
@ -90,6 +97,7 @@ namespace Ryujinx.Ava.UI.Windows

        protected override void OnClosing(WindowClosingEventArgs e)
        {
+            Program.UseExtraConfig = false;
            InputPage.Dispose(); // You need to unload the gamepad settings, otherwise the controls will be blocked
            base.OnClosing(e);
        }
--- a/src/Ryujinx/UI/Windows/MainWindow.axaml.cs
+++ b/src/Ryujinx/UI/Windows/MainWindow.axaml.cs
@ -213,13 +213,13 @@ namespace Ryujinx.Ava.UI.Windows
            }
        }

-        public void Application_Opened(object sender, ApplicationOpenedEventArgs args)
+        public async void Application_Opened(object sender, ApplicationOpenedEventArgs args)
        {
            if (args.Application != null)
            {
                ViewModel.SelectedIcon = args.Application.Icon;

-                ViewModel.LoadApplication(args.Application).Wait();
+                await ViewModel.LoadApplication(args.Application);
            }

            args.Handled = true;
Author	SHA1	Message	Date
Neo	0cc94fdf37	Update French Translation (ryubing/ryujinx!67 ) See merge request ryubing/ryujinx!67	2025-06-23 14:50:47 -05:00
GreemDev	74a9b94227	UI: Properly space total play time separator when loading bar is shown.	2025-06-20 23:06:16 -05:00
GreemDev	d3208a4c44	UI: Don't show total play time if there is none.	2025-06-20 23:02:39 -05:00
Coxxs	5d136980a3	fix: UI deadlock when launching a game with "Trace Logs" enabled (ryubing/ryujinx!70 ) See merge request ryubing/ryujinx!70	2025-06-19 20:51:11 -05:00
mqudsi	572ad1eac5	Exclude time spent with emulator paused from play time (ryubing/ryujinx!55 ) See merge request ryubing/ryujinx!55	2025-06-19 16:33:10 -05:00
Coxxs	6bb2af0091	Implement CreateLibraryAppletEx in ILibraryAppletCreator (ryubing/ryujinx!69 ) See merge request ryubing/ryujinx!69	2025-06-19 15:48:06 -05:00
WilliamWsyHK	534a194ed9	Correct typo on part of the character for word "server" (ryubing/ryujinx!68 ) See merge request ryubing/ryujinx!68	2025-06-19 15:25:40 -05:00
GreemDev	331805791e	infra: [ci skip] fix inconsistent namespaces from update library	2025-06-19 04:26:22 -05:00
GreemDev	6773406bb6	infra: Use Ryujinx.UpdateClient NuGet package for checking for updates. Main benefit to this is sharing the C# model definitions from what the server returns and Ryujinx uses in-app without differences. Additionally removed the GitHub API JSON models.	2025-06-19 04:18:33 -05:00
GreemDev	6226eadf55	docs: compat: The Legend of Nayuta: Boundless Trails: ingame (ryubing/ryujinx!59 )	2025-06-18 14:31:08 -05:00
yeager	b1cde5fd97	Updated Swedish translation (ryubing/ryujinx!66 ) See merge request ryubing/ryujinx!66	2025-06-17 13:05:39 -05:00
Hack茶ん	39944b2063	Update Korean translation (ryubing/ryujinx!64 ) See merge request ryubing/ryujinx!64	2025-06-17 03:21:30 -05:00
GreemDev	973c6ba5df	UI: RPC: Squeakross: Home Squeak Home image docs: compat: Squeakross: Home Squeak Home: Playable	2025-06-16 02:06:45 -05:00
GreemDev	6803c91da8	infra: Add package source mappings for Ryujinx.UpdateClient to silence compile warnings	2025-06-16 02:05:11 -05:00
GreemDev	557c2a50b2	infra: Add NuGet config to solution items	2025-06-16 02:04:48 -05:00
GreemDev	77a797f154	Revert "Structural and Memory Safety Improvements, Analyzer Cleanup (ryubing/ryujinx!47 )" This reverts merge request !47	2025-06-15 20:45:26 -05:00
Emiyl	faf9e3cdd7	macOS: Fix MoltenVK config packing (ryubing/ryujinx!65 ) See merge request ryubing/ryujinx!65	2025-06-15 18:24:45 -05:00
Godzilaa4	7bc80ed4fe	Updated Brazilian Portuguese translation (ryubing/ryujinx!62 ) See merge request ryubing/ryujinx!62	2025-06-15 10:28:41 -05:00
WilliamWsyHK	a1d44ec496	Update translation for Traditional Chinese (ryubing/ryujinx!61 ) See merge request ryubing/ryujinx!61	2025-06-14 20:06:12 -05:00
GreemDev	bab3beb0ac	[ci skip] Forgot closing / lol	2025-06-13 15:51:23 -05:00
GreemDev	aa9e74339b	Add support for notifying the update server when a new update has been pushed instead of relying on periodic refreshes	2025-06-13 01:57:54 -05:00
GreemDev	908273d848	[ci skip] UpdateClient package source https://git.ryujinx.app/ryubing/update-server/-/packages	2025-06-13 01:57:54 -05:00
shinyoyo	b51ad11574	Updated Simplified Chinese translation (ryubing/ryujinx!58 ) See merge request ryubing/ryujinx!58	2025-06-11 19:43:50 -05:00
MrKev	ea027d65a7	Structural and Memory Safety Improvements, Analyzer Cleanup (ryubing/ryujinx!47 ) See merge request ryubing/ryujinx!47	2025-06-11 17:58:27 -05:00
Coxxs	d03ae9c164	fix: socket blocking flag is inverted when setting it (ryubing/ryujinx!57 ) See merge request ryubing/ryujinx!57	2025-06-11 16:44:07 -05:00
Hack茶ん	90e9492f6c	Update Korean translation (ryubing/ryujinx!56 ) See merge request ryubing/ryujinx!56	2025-06-11 15:37:48 -05:00
mqudsi	512120db04	Work around Escape hotkey race with exit confirmation dialog See merge request ryubing/ryujinx!54	2025-06-10 22:52:08 -05:00
rockingdice	90582e9e93	fix: crash caused by cursor overflow See merge request ryubing/ryujinx!53	2025-06-10 16:34:12 -05:00
rockingdice	b97fae08b5	fix: use the correct font family for CJK characters See merge request ryubing/ryujinx!52	2025-06-10 15:41:39 -05:00
GreemDev	eed6ef632d	infra: [ci skip] update CHANGELOG.md	2025-06-09 19:57:31 -05:00
GreemDev	0409c15903	Remove GitHub updater support.	2025-06-09 19:51:53 -05:00
GreemDev	c58272ac20	infra: CI: Remove GitHub release uploading from Stable workflow.	2025-06-09 18:56:28 -05:00
GreemDev	9d83dfd19c	misc: [ci skip] Missed the property part of _chosenProfile	2025-06-09 17:59:40 -05:00
GreemDev	ce31a47934	misc: Code styling changes & cleanups	2025-06-09 17:57:26 -05:00
Goodfeat	d31d1f91cf	Added the ability to switch between local and global input in the user configuration See merge request ryubing/ryujinx!8	2025-06-09 17:24:24 -05:00