Merge branch 'master' into feature/turbo-mode

update FFmpeg to 6.1.2 & Windows on ARM support (#702 )
As stated in the title, win-arm64 (Windows 11 ARM) has been added to the workflows, so these builds should automatically compile for this PR and all other releases going forward. Also updated the FFmpeg runtimes from 5.0.3 to 6.1.2. macOS (x64/arm64) is _currently_ excluded from the update until a proper cross-compiling environment can be set up for these architectures. Windows 11 ARM users, please test the win-arm64 build for any issues. --------- Co-authored-by: Evan Husted <greem@greemdev.net>
2025-03-13 21:35:03 -05:00 · 2025-03-13 18:36:57 -05:00 · 2025-03-13 13:56:47 -05:00 · 2025-03-12 14:17:14 -05:00 · 2025-03-12 13:38:41 -05:00 · 2025-03-12 00:12:37 -05:00
42 changed files with 697 additions and 677 deletions
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -19,6 +19,7 @@ jobs:
        configuration: [Debug, Release]
        platform:
          - { name: win-x64,     os: windows-latest, zip_os_name: win_x64     }
+          - { name: win-arm64,   os: windows-latest, zip_os_name: win_arm64   }
          - { name: linux-x64,   os: ubuntu-latest,  zip_os_name: linux_x64   }
          - { name: linux-arm64, os: ubuntu-latest,  zip_os_name: linux_arm64 }
          - { name: osx-x64,     os: macos-13,       zip_os_name: osx_x64     }
--- a/.github/workflows/canary.yml
+++ b/.github/workflows/canary.yml
@@ -62,6 +62,7 @@ jobs:
            | Platform | Artifact |
            |--|--|
            | Windows 64-bit | [Canary Windows Artifact](https://github.com/${{ env.RYUJINX_TARGET_RELEASE_CHANNEL_OWNER }}/${{ env.RYUJINX_TARGET_RELEASE_CHANNEL_REPO }}/releases/download/${{ steps.version_info.outputs.build_version }}/ryujinx-canary-${{ steps.version_info.outputs.build_version }}-win_x64.zip) |
+            | Windows ARM 64-bit | [Canary Windows Artifact](https://github.com/${{ env.RYUJINX_TARGET_RELEASE_CHANNEL_OWNER }}/${{ env.RYUJINX_TARGET_RELEASE_CHANNEL_REPO }}/releases/download/${{ steps.version_info.outputs.build_version }}/ryujinx-canary-${{ steps.version_info.outputs.build_version }}-win_arm64.zip) |
            | Linux 64-bit | [Canary Linux Artifact](https://github.com/${{ env.RYUJINX_TARGET_RELEASE_CHANNEL_OWNER }}/${{ env.RYUJINX_TARGET_RELEASE_CHANNEL_REPO }}/releases/download/${{ steps.version_info.outputs.build_version }}/ryujinx-canary-${{ steps.version_info.outputs.build_version }}-linux_x64.tar.gz) |
            | Linux ARM 64-bit | [Canary Linux ARM Artifact](https://github.com/${{ env.RYUJINX_TARGET_RELEASE_CHANNEL_OWNER }}/${{ env.RYUJINX_TARGET_RELEASE_CHANNEL_REPO }}/releases/download/${{ steps.version_info.outputs.build_version }}/ryujinx-canary-${{ steps.version_info.outputs.build_version }}-linux_arm64.tar.gz) |
            | macOS | [Canary macOS Artifact](https://github.com/${{ env.RYUJINX_TARGET_RELEASE_CHANNEL_OWNER }}/${{ env.RYUJINX_TARGET_RELEASE_CHANNEL_REPO }}/releases/download/${{ steps.version_info.outputs.build_version }}/ryujinx-canary-${{ steps.version_info.outputs.build_version }}-macos_universal.app.tar.gz) |
@@ -79,6 +80,7 @@ jobs:
      matrix:
        platform:
          - { name: win-x64,     os: windows-latest, zip_os_name: win_x64     }
+          - { name: win-arm64,   os: windows-latest, zip_os_name: win_arm64   }
          - { name: linux-x64,   os: ubuntu-latest,  zip_os_name: linux_x64   }
          - { name: linux-arm64, os: ubuntu-latest,  zip_os_name: linux_arm64 }
    steps:
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -66,6 +66,7 @@ jobs:
      matrix:
        platform:
          - { name: win-x64,     os: windows-latest, zip_os_name: win_x64     }
+          - { name: win-arm64,   os: windows-latest, zip_os_name: win_arm64   }
          - { name: linux-x64,   os: ubuntu-latest,  zip_os_name: linux_x64   }
          - { name: linux-arm64, os: ubuntu-latest,  zip_os_name: linux_arm64 }
    steps:
@@ -117,6 +118,7 @@ jobs:
        if: matrix.platform.os == 'ubuntu-latest'
        run: |
          pushd publish
+          rm libarmeilleure-jitsupport.dylib
          chmod +x Ryujinx.sh Ryujinx
          tar -czvf ../release_output/ryujinx-${{ steps.version_info.outputs.build_version }}-${{ matrix.platform.zip_os_name }}.tar.gz ../publish
          popd
--- a/Directory.Packages.props
+++ b/Directory.Packages.props
@@ -39,7 +39,7 @@
    <PackageVersion Include="OpenTK.Windowing.GraphicsLibraryFramework" Version="4.8.2" />
    <PackageVersion Include="Open.NAT.Core" Version="2.1.0.5" />
    <PackageVersion Include="Ryujinx.Audio.OpenAL.Dependencies" Version="1.21.0.1" />
-    <PackageVersion Include="Ryujinx.Graphics.Nvdec.Dependencies" Version="5.0.3-build14" />
+    <PackageVersion Include="Ryujinx.Graphics.Nvdec.Dependencies.AllArch" Version="6.1.2-build3" />
    <PackageVersion Include="Ryujinx.Graphics.Vulkan.Dependencies.MoltenVK" Version="1.2.0" />
    <PackageVersion Include="Ryujinx.SDL2-CS" Version="2.30.0-build32" />
    <PackageVersion Include="Gommon" Version="2.7.1.1" />
@@ -53,8 +53,8 @@
    <PackageVersion Include="SkiaSharp" Version="2.88.9" />
    <PackageVersion Include="SkiaSharp.NativeAssets.Linux" Version="2.88.9" />
    <PackageVersion Include="SPB" Version="0.0.4-build32" />
-    <PackageVersion Include="System.IO.Hashing" Version="9.0.0" />
-    <PackageVersion Include="System.Management" Version="9.0.0" />
+    <PackageVersion Include="System.IO.Hashing" Version="9.0.2" />
+    <PackageVersion Include="System.Management" Version="9.0.2" />
    <PackageVersion Include="UnicornEngine.Unicorn" Version="2.0.2-rc1-fb78016" />
  </ItemGroup>
 </Project>
--- a/README.md
+++ b/README.md
@@ -1,7 +1,7 @@
 <table align="center">
    <tr>
        <td align="center" width="25%">
-            <img src="https://raw.githubusercontent.com/Ryubing/ryuassets/refs/heads/main/RyujinxApp_1024.png" alt="Ryujinx" >
+            <img src="https://raw.githubusercontent.com/Ryubing/Assets/refs/heads/main/RyujinxApp_1024.png" alt="Ryujinx" >
        </td>
        <td align="center" width="75%">
          
--- a/src/Ryujinx.Audio.Backends.SoundIo/Ryujinx.Audio.Backends.SoundIo.csproj
+++ b/src/Ryujinx.Audio.Backends.SoundIo/Ryujinx.Audio.Backends.SoundIo.csproj
@@ -2,7 +2,7 @@

  <PropertyGroup>
    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <RuntimeIdentifiers>win-x64;osx-x64;linux-x64</RuntimeIdentifiers>
+    <RuntimeIdentifiers>win-x64;osx-x64;linux-x64;win-arm64;osx-arm64;linux-arm64</RuntimeIdentifiers>
    <DefaultItemExcludes>$(DefaultItemExcludes);._*</DefaultItemExcludes>
  </PropertyGroup>

@@ -11,15 +11,15 @@
  </ItemGroup>

  <ItemGroup>
-    <ContentWithTargetPath Include="Native\libsoundio\libs\libsoundio.dll" Condition="'$(RuntimeIdentifier)' != 'linux-x64' AND '$(RuntimeIdentifier)' != 'linux-arm64' AND '$(RuntimeIdentifier)' != 'osx-x64'">
+    <ContentWithTargetPath Include="Native\libsoundio\libs\libsoundio.dll" Condition="'$(RuntimeIdentifier)' != 'linux-x64' AND '$(RuntimeIdentifier)' != 'linux-arm64' AND '$(RuntimeIdentifier)' != 'osx-x64' AND '$(RuntimeIdentifier)' != 'osx-arm64'">
      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
      <TargetPath>libsoundio.dll</TargetPath>
    </ContentWithTargetPath>
-    <ContentWithTargetPath Include="Native\libsoundio\libs\libsoundio.dylib" Condition="'$(RuntimeIdentifier)' != 'linux-x64' AND '$(RuntimeIdentifier)' != 'linux-arm64' AND '$(RuntimeIdentifier)' != 'win-x64'">
+    <ContentWithTargetPath Include="Native\libsoundio\libs\libsoundio.dylib" Condition="'$(RuntimeIdentifier)' != 'linux-x64' AND '$(RuntimeIdentifier)' != 'linux-arm64' AND '$(RuntimeIdentifier)' != 'win-x64' AND '$(RuntimeIdentifier)' != 'win-arm64'">
      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
      <TargetPath>libsoundio.dylib</TargetPath>
    </ContentWithTargetPath>
-    <ContentWithTargetPath Include="Native\libsoundio\libs\libsoundio.so" Condition="'$(RuntimeIdentifier)' != 'win-x64' AND '$(RuntimeIdentifier)' != 'osx-x64' AND '$(RuntimeIdentifier)' != 'linux-arm64'">
+    <ContentWithTargetPath Include="Native\libsoundio\libs\libsoundio.so" Condition="'$(RuntimeIdentifier)' != 'win-x64' AND '$(RuntimeIdentifier)' != 'win-arm64' AND '$(RuntimeIdentifier)' != 'osx-x64' AND '$(RuntimeIdentifier)' != 'osx-arm64' AND '$(RuntimeIdentifier)' != 'linux-arm64'">
      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
      <TargetPath>libsoundio.so</TargetPath>
    </ContentWithTargetPath>
--- a/src/Ryujinx.Common/Configuration/Hid/InputConfig.cs
+++ b/src/Ryujinx.Common/Configuration/Hid/InputConfig.cs
@@ -21,11 +21,6 @@ namespace Ryujinx.Common.Configuration.Hid
        /// </summary>
        public string Id { get; set; }

-        /// <summary>
-        /// Controller name
-        /// </summary>
-        public string Name { get; set; }
-
        /// <summary>
        ///  Controller's Type
        /// </summary>
--- a/src/Ryujinx.Common/Configuration/Hid/KeyboardHotkeys.cs
+++ b/src/Ryujinx.Common/Configuration/Hid/KeyboardHotkeys.cs
@@ -13,5 +13,7 @@ namespace Ryujinx.Common.Configuration.Hid
        public Key VolumeDown { get; set; }
        public Key CustomVSyncIntervalIncrement { get; set; }
        public Key CustomVSyncIntervalDecrement { get; set; }
+        public Key TurboMode { get; set; }
+        public bool TurboModeWhileHeld { get; set; }
    }
 }
--- a/src/Ryujinx.Cpu/ITickSource.cs
+++ b/src/Ryujinx.Cpu/ITickSource.cs
@@ -8,10 +8,17 @@ namespace Ryujinx.Cpu
    /// </summary>
    public interface ITickSource : ICounter
    {
+        public const long RealityTickScalar = 100;
+        
        /// <summary>
        /// Time elapsed since the counter was created.
        /// </summary>
        TimeSpan ElapsedTime { get; }
+        
+        /// <summary>
+        /// Clock tick scalar, in percent points (100 = 1.0).
+        /// </summary>
+        long TickScalar { get; set; }

        /// <summary>
        /// Time elapsed since the counter was created, in seconds.
--- a/src/Ryujinx.Cpu/TickSource.cs
+++ b/src/Ryujinx.Cpu/TickSource.cs
@@ -14,12 +14,37 @@ namespace Ryujinx.Cpu

        /// <inheritdoc/>
        public ulong Counter => (ulong)(ElapsedSeconds * Frequency);
+        
+        
+        public long TickScalar { get; set; }
+
+
+        private static long _acumElapsedTicks;
+
+
+        private static long _lastElapsedTicks;
+
+
+        private long ElapsedTicks
+        {
+            get
+            {
+                long elapsedTicks = _tickCounter.ElapsedTicks;
+                
+                _acumElapsedTicks += (elapsedTicks - _lastElapsedTicks) * TickScalar / 100;
+
+                _lastElapsedTicks = elapsedTicks;
+                
+                return _acumElapsedTicks;
+            }
+        }

        /// <inheritdoc/>
-        public TimeSpan ElapsedTime => _tickCounter.Elapsed;
+        
+        public TimeSpan ElapsedTime => Stopwatch.GetElapsedTime(0, ElapsedTicks);

        /// <inheritdoc/>
-        public double ElapsedSeconds => _tickCounter.ElapsedTicks * _hostTickFreq;
+        public double ElapsedSeconds => ElapsedTicks * _hostTickFreq;

        public TickSource(ulong frequency)
        {
--- a/src/Ryujinx.Graphics.Gpu/Engine/Threed/StateUpdater.cs
+++ b/src/Ryujinx.Graphics.Gpu/Engine/Threed/StateUpdater.cs
@@ -1065,7 +1065,14 @@ namespace Ryujinx.Graphics.Gpu.Engine.Threed
        /// </summary>
        private void UpdateIndexBufferState()
        {
-            IndexBufferState indexBuffer = _state.State.IndexBufferState;
+            IndexBufferState? indexBufferNullable = _state?.State.IndexBufferState;
+
+            if (!indexBufferNullable.HasValue)
+            {
+                return;
+            }
+
+            IndexBufferState indexBuffer = indexBufferNullable.Value;

            if (_drawState.IndexCount == 0)
            {
--- a/src/Ryujinx.Graphics.Nvdec.FFmpeg/Native/FFmpegApi.cs
+++ b/src/Ryujinx.Graphics.Nvdec.FFmpeg/Native/FFmpegApi.cs
@@ -12,8 +12,8 @@ namespace Ryujinx.Graphics.Nvdec.FFmpeg.Native

        private static readonly Dictionary<string, (int, int)> _librariesWhitelist = new()
        {
-            { AvCodecLibraryName, (58, 59) },
-            { AvUtilLibraryName, (56, 57) },
+            { AvCodecLibraryName, (58, 61) },
+            { AvUtilLibraryName, (56, 59) },
        };

        private static string FormatLibraryNameForCurrentOs(string libraryName, int version)
--- a/src/Ryujinx.HLE/HOS/Services/IpcService.cs
+++ b/src/Ryujinx.HLE/HOS/Services/IpcService.cs
@@ -127,10 +127,7 @@ namespace Ryujinx.HLE.HOS.Services
                }
                else
                {
-                    string serviceName;
-
-
-                    serviceName = (service is not DummyService dummyService) ? service.GetType().FullName : dummyService.ServiceName;
+                    string serviceName = (service is not DummyService dummyService) ? service.GetType().FullName : dummyService.ServiceName;

                    Logger.Warning?.Print(LogClass.KernelIpc, $"Missing service {serviceName}: {commandId} ignored");
                }
--- a/src/Ryujinx.HLE/HOS/Services/SurfaceFlinger/SurfaceFlinger.cs
+++ b/src/Ryujinx.HLE/HOS/Services/SurfaceFlinger/SurfaceFlinger.cs
@@ -2,6 +2,7 @@ using Ryujinx.Common;
 using Ryujinx.Common.Configuration;
 using Ryujinx.Common.Logging;
 using Ryujinx.Common.PreciseSleep;
+using Ryujinx.Cpu;
 using Ryujinx.Graphics.GAL;
 using Ryujinx.Graphics.Gpu;
 using Ryujinx.HLE.HOS.Services.Nv.NvDrvServices.NvMap;
@@ -89,7 +90,7 @@ namespace Ryujinx.HLE.HOS.Services.SurfaceFlinger
            }
            else
            {
-                _ticksPerFrame = Stopwatch.Frequency / _device.TargetVSyncInterval;
+                _ticksPerFrame = ((Stopwatch.Frequency / _device.TargetVSyncInterval) * 100) / _device.TickScalar;
                _targetVSyncInterval = _device.TargetVSyncInterval;
            }
        }
--- a/src/Ryujinx.HLE/HleConfiguration.cs
+++ b/src/Ryujinx.HLE/HleConfiguration.cs
@@ -102,6 +102,11 @@ namespace Ryujinx.HLE
        /// Control if the Profiled Translation Cache (PTC) should be used.
        /// </summary>
        internal readonly bool EnablePtc;
+        
+        /// <summary>
+        /// Control the arbitrary scalar applied to emulated CPU tick timing.
+        /// </summary>
+        public long TickScalar { get; set; }

        /// <summary>
        /// Control if the guest application should be told that there is a Internet connection available.
@@ -201,6 +206,7 @@ namespace Ryujinx.HLE
                                VSyncMode vSyncMode,
                                bool enableDockedMode,
                                bool enablePtc,
+                                long tickScalar,
                                bool enableInternetAccess,
                                IntegrityCheckLevel fsIntegrityCheckLevel,
                                int fsGlobalAccessLogMode,
@@ -226,6 +232,7 @@ namespace Ryujinx.HLE
            CustomVSyncInterval = customVSyncInterval;
            EnableDockedMode = enableDockedMode;
            EnablePtc = enablePtc;
+            TickScalar = tickScalar;
            EnableInternetAccess = enableInternetAccess;
            FsIntegrityCheckLevel = fsIntegrityCheckLevel;
            FsGlobalAccessLogMode = fsGlobalAccessLogMode;
--- a/src/Ryujinx.HLE/PerformanceStatistics.cs
+++ b/src/Ryujinx.HLE/PerformanceStatistics.cs
@@ -6,6 +6,8 @@ namespace Ryujinx.HLE
 {
    public class PerformanceStatistics
    {
+        private readonly Switch _device;
+        
        private const int FrameTypeGame = 0;
        private const int PercentTypeFifo = 0;

@@ -28,8 +30,10 @@ namespace Ryujinx.HLE

        private readonly System.Timers.Timer _resetTimer;

-        public PerformanceStatistics()
+        public PerformanceStatistics(Switch device)
        {
+            _device = device;
+            
            _frameRate = new double[1];
            _accumulatedFrameTime = new double[1];
            _previousFrameTime = new double[1];
@@ -162,14 +166,6 @@ namespace Ryujinx.HLE
            return 1000 / _frameRate[FrameTypeGame];
        }
        
-        public string FormatGameFrameRate()
-        {
-            double frameRate = GetGameFrameRate();
-            double frameTime = GetGameFrameTime();
-
-            return $"{frameRate:00.00} FPS ({frameTime:00.00}ms)";
-        }
-        
        public string FormatFifoPercent()
        {
            double fifoPercent = GetFifoPercent();
--- a/src/Ryujinx.HLE/Switch.cs
+++ b/src/Ryujinx.HLE/Switch.cs
@@ -4,6 +4,7 @@ using Ryujinx.Audio.Backends.CompatLayer;
 using Ryujinx.Audio.Integration;
 using Ryujinx.Common;
 using Ryujinx.Common.Configuration;
+using Ryujinx.Cpu;
 using Ryujinx.Graphics.Gpu;
 using Ryujinx.HLE.FileSystem;
 using Ryujinx.HLE.HOS;
@@ -26,18 +27,26 @@ namespace Ryujinx.HLE
        public GpuContext Gpu { get; }
        public VirtualFileSystem FileSystem { get; }
        public HOS.Horizon System { get; }
+
+        public bool TurboMode = false;
+
+        public long TickScalar
+        {
+            get => System?.TickSource?.TickScalar ?? ITickSource.RealityTickScalar;
+            set => System.TickSource.TickScalar = value;
+        }
+        
        public ProcessLoader Processes { get; }
        public PerformanceStatistics Statistics { get; }
        public Hid Hid { get; }
        public TamperMachine TamperMachine { get; }
        public IHostUIHandler UIHandler { get; }

-        public int CpuCoresCount = 4; //Switch 1 has 4 cores
+        public int CpuCoresCount = 4; // Switch has a quad-core Tegra X1 SoC

        public VSyncMode VSyncMode { get; set; }
        public bool CustomVSyncIntervalEnabled { get; set; }
        public int CustomVSyncInterval { get; set; }
-
        public long TargetVSyncInterval { get; set; } = 60;

        public bool IsFrameAvailable => Gpu.Window.IsFrameAvailable;
@@ -64,7 +73,7 @@ namespace Ryujinx.HLE
            Memory            = new MemoryBlock(Configuration.MemoryConfiguration.ToDramSize(), memoryAllocationFlags);
            Gpu               = new GpuContext(Configuration.GpuRenderer, DirtyHacks);
            System            = new HOS.Horizon(this);
-            Statistics        = new PerformanceStatistics();
+            Statistics        = new PerformanceStatistics(this);
            Hid               = new Hid(this, System.HidStorage);
            Processes         = new ProcessLoader(this);
            TamperMachine     = new TamperMachine();
@@ -75,6 +84,7 @@ namespace Ryujinx.HLE

            VSyncMode                               = Configuration.VSyncMode;
            CustomVSyncInterval                     = Configuration.CustomVSyncInterval;
+            TickScalar                              = TurboMode ? Configuration.TickScalar : ITickSource.RealityTickScalar;
            System.State.DockedMode                 = Configuration.EnableDockedMode;
            System.PerformanceState.PerformanceMode = System.State.DockedMode ? PerformanceMode.Boost : PerformanceMode.Default;
            System.EnablePtc                        = Configuration.EnablePtc;
@@ -126,6 +136,12 @@ namespace Ryujinx.HLE
            }
        }

+        public void ToggleTurbo()
+        {
+            TurboMode = !TurboMode;
+            TickScalar = TurboMode ? Configuration.TickScalar : ITickSource.RealityTickScalar;
+        }
+
        public bool LoadCart(string exeFsDir, string romFsFile = null) => Processes.LoadUnpackedNca(exeFsDir, romFsFile);
        public bool LoadXci(string xciFile, ulong applicationId = 0) => Processes.LoadXci(xciFile, applicationId);
        public bool LoadNca(string ncaFile, BlitStruct<ApplicationControlProperty>? customNacpData = null) => Processes.LoadNca(ncaFile, customNacpData);
--- a/src/Ryujinx/Assets/Styles/Styles.xaml
+++ b/src/Ryujinx/Assets/Styles/Styles.xaml
@@ -49,6 +49,7 @@
                <TextBlock
                         Classes="globalConfigMarker"/>
            </StackPanel>
+            
        </Border>
    </Design.PreviewWith>
    <Style Selector="DropDownButton">
--- a/src/Ryujinx/Assets/locales.json
+++ b/src/Ryujinx/Assets/locales.json
--- a/src/Ryujinx/Common/KeyboardHotkeyState.cs
+++ b/src/Ryujinx/Common/KeyboardHotkeyState.cs
@@ -14,5 +14,6 @@ namespace Ryujinx.Ava.Common
        VolumeDown,
        CustomVSyncIntervalIncrement,
        CustomVSyncIntervalDecrement,
+        TurboMode,
    }
 }
--- a/src/Ryujinx/Common/LocaleManager.cs
+++ b/src/Ryujinx/Common/LocaleManager.cs
@@ -61,6 +61,13 @@ namespace Ryujinx.Ava.Common.Locale
            }
        }

+        public static string GetUnformatted(LocaleKeys key) => Instance.Get(key);
+
+        public string Get(LocaleKeys key) =>
+            _localeStrings.TryGetValue(key, out string value) 
+                ? value 
+                : key.ToString();
+
        public string this[LocaleKeys key]
        {
            get
--- a/src/Ryujinx/Headless/HeadlessRyujinx.Init.cs
+++ b/src/Ryujinx/Headless/HeadlessRyujinx.Init.cs
@@ -11,6 +11,7 @@ using Ryujinx.Common.Configuration.Hid.Controller.Motion;
 using Ryujinx.Common.Configuration.Hid.Keyboard;
 using Ryujinx.Common.Logging;
 using Ryujinx.Common.Utilities;
+using Ryujinx.Cpu;
 using Ryujinx.Graphics.GAL;
 using Ryujinx.Graphics.OpenGL;
 using Ryujinx.Graphics.Vulkan;
@@ -311,7 +312,7 @@ namespace Ryujinx.Headless

            return new OpenGLRenderer();
        }
-
+        
        private static Switch InitializeEmulationContext(WindowBase window, IRenderer renderer, Options options) =>
            new(
                new HleConfiguration(
@@ -321,6 +322,7 @@ namespace Ryujinx.Headless
                        options.VSyncMode,
                        !options.DisableDockedMode,
                        !options.DisablePTC,
+                        ITickSource.RealityTickScalar,
                        options.EnableInternetAccess,
                        !options.DisableFsIntegrityChecks ? IntegrityCheckLevel.ErrorOnInvalid : IntegrityCheckLevel.None,
                        options.FsGlobalAccessLogMode,
--- a/src/Ryujinx/Ryujinx.csproj
+++ b/src/Ryujinx/Ryujinx.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
  <PropertyGroup>
-    <RuntimeIdentifiers>win-x64;osx-x64;linux-x64</RuntimeIdentifiers>
+    <RuntimeIdentifiers>win-x64;osx-x64;linux-x64;win-arm64;osx-arm64;linux-arm64;</RuntimeIdentifiers>
    <OutputType>Exe</OutputType>
    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
    <Version>1.0.0-dirty</Version>
@@ -29,12 +29,18 @@
    <TrimMode>partial</TrimMode>
  </PropertyGroup>

+  <PropertyGroup Condition="'$(RuntimeIdentifier)' == 'win-arm64'">
+    <PublishSingleFile>true</PublishSingleFile>
+    <PublishTrimmed>false</PublishTrimmed>
+  </PropertyGroup>
+  
  <!--
    FluentAvalonia, used in the Avalonia UI, requires a workaround for the json serializer used internally when using .NET 8+ System.Text.Json.
    See:
      https://github.com/amwx/FluentAvalonia/issues/481
      https://devblogs.microsoft.com/dotnet/system-text-json-in-dotnet-8/
  -->
+  
  <PropertyGroup>
    <JsonSerializerIsReflectionEnabledByDefault>true</JsonSerializerIsReflectionEnabledByDefault>
  </PropertyGroup>
@@ -57,8 +63,8 @@
    <PackageReference Include="Projektanker.Icons.Avalonia.MaterialDesign" />
    <PackageReference Include="OpenTK.Core" />
    <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" />
-    <PackageReference Include="Ryujinx.Graphics.Vulkan.Dependencies.MoltenVK" Condition="'$(RuntimeIdentifier)' != 'linux-x64' AND '$(RuntimeIdentifier)' != 'linux-arm64' AND '$(RuntimeIdentifier)' != 'win-x64'" />
+    <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="securifybv.ShellLink" />
    <PackageReference Include="Sep" />
    <PackageReference Include="Silk.NET.Vulkan" />
@@ -67,7 +73,7 @@
    <PackageReference Include="SPB" />
    <PackageReference Include="SharpZipLib" />
  </ItemGroup>
-
+  
  <ItemGroup>
    <ProjectReference Include="..\Ryujinx.Audio.Backends.SDL2\Ryujinx.Audio.Backends.SDL2.csproj" />
    <ProjectReference Include="..\Ryujinx.Graphics.Vulkan\Ryujinx.Graphics.Vulkan.csproj" />
@@ -84,7 +90,7 @@
  </ItemGroup>

  <ItemGroup>
-    <Content Include="..\..\distribution\windows\alsoft.ini" Condition="'$(RuntimeIdentifier)' != 'linux-x64' AND '$(RuntimeIdentifier)' != 'linux-arm64' AND '$(RuntimeIdentifier)' != 'osx-x64'">
+    <Content Include="..\..\distribution\windows\alsoft.ini" Condition="'$(RuntimeIdentifier)' != 'linux-x64' AND '$(RuntimeIdentifier)' != 'linux-arm64' AND '$(RuntimeIdentifier)' != 'osx-x64' AND '$(RuntimeIdentifier)' != 'osx-arm64'">
      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
      <TargetPath>alsoft.ini</TargetPath>
    </Content>
--- a/src/Ryujinx/Systems/AppHost.cs
+++ b/src/Ryujinx/Systems/AppHost.cs
@@ -4,6 +4,7 @@ using Avalonia.Controls.ApplicationLifetimes;
 using Avalonia.Input;
 using Avalonia.Threading;
 using DiscordRPC;
+using Gommon;
 using LibHac.Common;
 using LibHac.Ns;
 using Ryujinx.Audio.Backends.Dummy;
@@ -1115,11 +1116,23 @@ namespace Ryujinx.Ava.Systems
                LocaleManager.Instance[LocaleKeys.VolumeShort] + $": {(int)(Device.GetVolume() * 100)}%",
                dockedMode,
                ConfigurationState.Instance.Graphics.AspectRatio.Value.ToText(),
-                Device.Statistics.FormatGameFrameRate(),
+                FormatGameFrameRate(),
                Device.Statistics.FormatFifoPercent(),
                _displayCount));
        }

+        private string FormatGameFrameRate()
+        {
+            string frameRate = Device.Statistics.GetGameFrameRate().ToString("00.00");
+            string frameTime = Device.Statistics.GetGameFrameTime().ToString("00.00");
+
+            return Device.TurboMode
+                ? LocaleManager.GetUnformatted(LocaleKeys.FpsTurboStatusBarText)
+                    .Format(frameRate, frameTime, Device.TickScalar)
+                : LocaleManager.GetUnformatted(LocaleKeys.FpsStatusBarText)
+                    .Format(frameRate, frameTime);
+        }
+
        public async Task ShowExitPrompt()
        {
            bool shouldExit = !ConfigurationState.Instance.ShowConfirmExit;
@@ -1215,6 +1228,12 @@ namespace Ryujinx.Ava.Systems

                if (currentHotkeyState != _prevHotkeyState)
                {
+                    if (ConfigurationState.Instance.Hid.Hotkeys.Value.TurboModeWhileHeld &&
+                        _keyboardInterface.IsPressed((Key)ConfigurationState.Instance.Hid.Hotkeys.Value.TurboMode) != Device.TurboMode)
+                    {
+                        Device.ToggleTurbo();
+                    }
+                    
                    switch (currentHotkeyState)
                    {
                        case KeyboardHotkeyState.ToggleVSyncMode:
@@ -1226,6 +1245,12 @@ namespace Ryujinx.Ava.Systems
                        case KeyboardHotkeyState.CustomVSyncIntervalIncrement:
                            _viewModel.CustomVSyncInterval = Device.IncrementCustomVSyncInterval();
                            break;
+                        case KeyboardHotkeyState.TurboMode:
+                            if (!ConfigurationState.Instance.Hid.Hotkeys.Value.TurboModeWhileHeld)
+                            {
+                                Device.ToggleTurbo();
+                            }
+                            break;
                        case KeyboardHotkeyState.Screenshot:
                            ScreenshotRequested = true;
                            break;
@@ -1355,6 +1380,10 @@ namespace Ryujinx.Ava.Systems
            {
                state = KeyboardHotkeyState.CustomVSyncIntervalDecrement;
            }
+            else if (_keyboardInterface.IsPressed((Key)ConfigurationState.Instance.Hid.Hotkeys.Value.TurboMode))
+            {
+                state = KeyboardHotkeyState.TurboMode;
+            }

            return state;
        }
--- a/src/Ryujinx/Systems/Configuration/ConfigurationFileFormat.cs
+++ b/src/Ryujinx/Systems/Configuration/ConfigurationFileFormat.cs
@@ -258,6 +258,11 @@ namespace Ryujinx.Ava.Systems.Configuration
        /// Enables or disables low-power profiled translation cache persistency loading
        /// </summary>
        public bool EnableLowPowerPtc { get; set; }
+        
+        /// <summary>
+        /// Clock tick scalar, in percent points (100 = 1.0).
+        /// </summary>
+        public long TickScalar { get; set; }

        /// <summary>
        /// Enables or disables guest Internet access
--- a/src/Ryujinx/Systems/Configuration/ConfigurationState.Migration.cs
+++ b/src/Ryujinx/Systems/Configuration/ConfigurationState.Migration.cs
@@ -93,6 +93,7 @@ namespace Ryujinx.Ava.Systems.Configuration
            System.EnableDockedMode.Value = cff.DockedMode;
            System.EnablePtc.Value = cff.EnablePtc;
            System.EnableLowPowerPtc.Value = cff.EnableLowPowerPtc;
+            System.TickScalar.Value = cff.TickScalar;
            System.EnableInternetAccess.Value = cff.EnableInternetAccess;
            System.EnableFsIntegrityChecks.Value = cff.EnableFsIntegrityChecks;
            System.FsGlobalAccessLogMode.Value = cff.FsGlobalAccessLogMode;
@@ -438,9 +439,27 @@ namespace Ryujinx.Ava.Systems.Configuration
                (64, static cff => cff.LoggingEnableAvalonia = false),
                (65, static cff => cff.UpdateCheckerType = cff.CheckUpdatesOnStart ? UpdaterType.PromptAtStartup : UpdaterType.Off),
                (66, static cff => cff.DisableInputWhenOutOfFocus = false),
-                (67, static cff => cff.FocusLostActionType = cff.DisableInputWhenOutOfFocus ? FocusLostType.BlockInput : FocusLostType.DoNothing)
-                // 68 was the version that added per-game configs; the file structure did not change
-                // the version was increased so external tools could know that your Ryujinx version has per-game config capabilities.
+                (67, static cff => cff.FocusLostActionType = cff.DisableInputWhenOutOfFocus ? FocusLostType.BlockInput : FocusLostType.DoNothing),
+                (68, static cff =>
+                {
+                    cff.TickScalar = 200;
+                    cff.Hotkeys = new KeyboardHotkeys
+                    {
+                        ToggleVSyncMode = cff.Hotkeys.ToggleVSyncMode,
+                        Screenshot = cff.Hotkeys.Screenshot,
+                        ShowUI = cff.Hotkeys.ShowUI,
+                        Pause = cff.Hotkeys.Pause,
+                        ToggleMute = cff.Hotkeys.ToggleMute,
+                        ResScaleUp = cff.Hotkeys.ResScaleUp,
+                        ResScaleDown = cff.Hotkeys.ResScaleDown,
+                        VolumeUp = cff.Hotkeys.VolumeUp,
+                        VolumeDown = cff.Hotkeys.VolumeDown,
+                        CustomVSyncIntervalIncrement = cff.Hotkeys.CustomVSyncIntervalIncrement,
+                        CustomVSyncIntervalDecrement = cff.Hotkeys.CustomVSyncIntervalDecrement,
+                        TurboMode = Key.Unbound,
+                        TurboModeWhileHeld = false
+                    };
+                })
            );
    }
 }
--- a/src/Ryujinx/Systems/Configuration/ConfigurationState.Model.cs
+++ b/src/Ryujinx/Systems/Configuration/ConfigurationState.Model.cs
@@ -335,6 +335,11 @@ namespace Ryujinx.Ava.Systems.Configuration
            /// Enables or disables persistent profiled translation cache
            /// </summary>
            public ReactiveObject<bool> EnablePtc { get; private set; }
+            
+            /// <summary>
+            /// Clock tick scalar, in percent points (100 = 1.0).
+            /// </summary>
+            public ReactiveObject<long> TickScalar { get; set; }

            /// <summary>
            /// Enables or disables low-power persistent profiled translation cache loading
@@ -415,6 +420,15 @@ namespace Ryujinx.Ava.Systems.Configuration
                EnableLowPowerPtc.LogChangesToValue(nameof(EnableLowPowerPtc));
                EnableLowPowerPtc.Event += (_, evnt) 
                    => Optimizations.LowPower = evnt.NewValue;
+                TickScalar = new ReactiveObject<long>();
+                TickScalar.LogChangesToValue(nameof(TickScalar));
+                TickScalar.Event += (_, evnt) =>
+                {
+                    if (Switch.Shared is null)
+                        return;
+
+                    Switch.Shared.Configuration.TickScalar = evnt.NewValue;
+                };
                EnableInternetAccess = new ReactiveObject<bool>();
                EnableInternetAccess.LogChangesToValue(nameof(EnableInternetAccess));
                EnableFsIntegrityChecks = new ReactiveObject<bool>();
@@ -842,6 +856,7 @@ namespace Ryujinx.Ava.Systems.Configuration
                Graphics.VSyncMode,
                System.EnableDockedMode,
                System.EnablePtc,
+                System.TickScalar,
                System.EnableInternetAccess,
                System.EnableFsIntegrityChecks 
                    ? IntegrityCheckLevel.ErrorOnInvalid 
@@ -860,8 +875,8 @@ namespace Ryujinx.Ava.Systems.Configuration
                Multiplayer.Mode,
                Multiplayer.DisableP2p,
                Multiplayer.LdnPassphrase,
-                Instance.Multiplayer.GetLdnServer(),
-                Instance.Graphics.CustomVSyncInterval,
-                Instance.Hacks.ShowDirtyHacks ? Instance.Hacks.EnabledHacks : null);
+                Multiplayer.GetLdnServer(),
+                Graphics.CustomVSyncInterval,
+                Hacks.ShowDirtyHacks ? Hacks.EnabledHacks : null);
    }
 }
--- a/src/Ryujinx/Systems/Configuration/ConfigurationState.cs
+++ b/src/Ryujinx/Systems/Configuration/ConfigurationState.cs
@@ -72,6 +72,7 @@ namespace Ryujinx.Ava.Systems.Configuration
                EnableColorSpacePassthrough = Graphics.EnableColorSpacePassthrough,
                EnablePtc = System.EnablePtc,
                EnableLowPowerPtc = System.EnableLowPowerPtc,
+                TickScalar = System.TickScalar,
                EnableInternetAccess = System.EnableInternetAccess,
                EnableFsIntegrityChecks = System.EnableFsIntegrityChecks,
                FsGlobalAccessLogMode = System.FsGlobalAccessLogMode,
@@ -260,6 +261,10 @@ namespace Ryujinx.Ava.Systems.Configuration
                ResScaleDown = Key.Unbound,
                VolumeUp = Key.Unbound,
                VolumeDown = Key.Unbound,
+                CustomVSyncIntervalIncrement = Key.Unbound,
+                CustomVSyncIntervalDecrement = Key.Unbound,
+                TurboMode = Key.Unbound,
+                TurboModeWhileHeld = false
            };
            Hid.RainbowSpeed.Value = 1f;
            Hid.InputConfig.Value =
@@ -269,7 +274,6 @@ namespace Ryujinx.Ava.Systems.Configuration
                    Version = InputConfig.CurrentVersion,
                    Backend = InputBackendType.WindowKeyboard,
                    Id = "0",
-                    Name = "Keyboard",
                    PlayerIndex = PlayerIndex.Player1,
                    ControllerType = ControllerType.ProController,
                    LeftJoycon = new LeftJoyconCommonConfig<Key>
--- a/src/Ryujinx/UI/Models/Input/GamepadInputConfig.cs
+++ b/src/Ryujinx/UI/Models/Input/GamepadInputConfig.cs
@@ -22,8 +22,6 @@ namespace Ryujinx.Ava.UI.Models.Input
        public float StrongRumble { get; set; }

        public string Id { get; set; }
-
-        public string Name { get; set; }
        public ControllerType ControllerType { get; set; }
        public PlayerIndex PlayerIndex { get; set; }

@@ -113,7 +111,6 @@ namespace Ryujinx.Ava.UI.Models.Input
            if (config != null)
            {
                Id = config.Id;
-                Name = config.Name;
                ControllerType = config.ControllerType;
                PlayerIndex = config.PlayerIndex;

@@ -204,7 +201,6 @@ namespace Ryujinx.Ava.UI.Models.Input
            StandardControllerInputConfig config = new()
            {
                Id = Id,
-                Name = Name, 
                Backend = InputBackendType.GamepadSDL2,
                PlayerIndex = PlayerIndex,
                ControllerType = ControllerType,
--- a/src/Ryujinx/UI/Models/Input/HotkeyConfig.cs
+++ b/src/Ryujinx/UI/Models/Input/HotkeyConfig.cs
@@ -28,6 +28,10 @@ namespace Ryujinx.Ava.UI.Models.Input

        [ObservableProperty] private Key _customVSyncIntervalDecrement;

+        [ObservableProperty] private Key _turboMode;
+
+        [ObservableProperty] private bool _turboModeWhileHeld;
+
        public HotkeyConfig(KeyboardHotkeys config)
        {
            if (config == null)
@@ -44,6 +48,8 @@ namespace Ryujinx.Ava.UI.Models.Input
            VolumeDown = config.VolumeDown;
            CustomVSyncIntervalIncrement = config.CustomVSyncIntervalIncrement;
            CustomVSyncIntervalDecrement = config.CustomVSyncIntervalDecrement;
+            TurboMode = config.TurboMode;
+            TurboModeWhileHeld = config.TurboModeWhileHeld;
        }

        public KeyboardHotkeys GetConfig() =>
@@ -60,6 +66,8 @@ namespace Ryujinx.Ava.UI.Models.Input
                VolumeDown = VolumeDown,
                CustomVSyncIntervalIncrement = CustomVSyncIntervalIncrement,
                CustomVSyncIntervalDecrement = CustomVSyncIntervalDecrement,
+                TurboMode = TurboMode,
+                TurboModeWhileHeld = TurboModeWhileHeld
            };
    }
 }
--- a/src/Ryujinx/UI/Models/Input/KeyboardInputConfig.cs
+++ b/src/Ryujinx/UI/Models/Input/KeyboardInputConfig.cs
@@ -2,14 +2,12 @@ using CommunityToolkit.Mvvm.ComponentModel;
 using Ryujinx.Ava.UI.ViewModels;
 using Ryujinx.Common.Configuration.Hid;
 using Ryujinx.Common.Configuration.Hid.Keyboard;
-using System.Xml.Linq;

 namespace Ryujinx.Ava.UI.Models.Input
 {
    public partial class KeyboardInputConfig : BaseModel
    {
        public string Id { get; set; }
-        public string Name { get; set; }
        public ControllerType ControllerType { get; set; }
        public PlayerIndex PlayerIndex { get; set; }

@@ -55,7 +53,6 @@ namespace Ryujinx.Ava.UI.Models.Input
            if (config != null)
            {
                Id = config.Id;
-                Name = config.Name;
                ControllerType = config.ControllerType;
                PlayerIndex = config.PlayerIndex;

@@ -103,7 +100,6 @@ namespace Ryujinx.Ava.UI.Models.Input
            StandardKeyboardInputConfig config = new()
            {
                Id = Id,
-                Name = Name,
                Backend = InputBackendType.WindowKeyboard,
                PlayerIndex = PlayerIndex,
                ControllerType = ControllerType,
--- a/src/Ryujinx/UI/ViewModels/AmiiboWindowViewModel.cs
+++ b/src/Ryujinx/UI/ViewModels/AmiiboWindowViewModel.cs
@@ -432,7 +432,7 @@ namespace Ryujinx.Ava.UI.ViewModels
        {
            try
            {
-                HttpResponseMessage response = await _httpClient.SendAsync(new HttpRequestMessage(HttpMethod.Head, "https://raw.githubusercontent.com/Ryubing/Ryujinx/refs/heads/master/assets/amiibo/Amiibo.json"));
+                HttpResponseMessage response = await _httpClient.SendAsync(new HttpRequestMessage(HttpMethod.Head, "https://raw.githubusercontent.com/Ryubing/Nfc/refs/heads/main/tags.json"));

                if (response.IsSuccessStatusCode)
                {
@@ -451,7 +451,7 @@ namespace Ryujinx.Ava.UI.ViewModels
        {
            try
            {
-                HttpResponseMessage response = await _httpClient.GetAsync($"https://raw.githubusercontent.com/Ryubing/Ryujinx/refs/heads/master/assets/amiibo/Amiibo.json");
+                HttpResponseMessage response = await _httpClient.GetAsync("https://raw.githubusercontent.com/Ryubing/Nfc/refs/heads/main/tags.json");

                if (response.IsSuccessStatusCode)
                {
--- a/src/Ryujinx/UI/ViewModels/Input/ControllerInputViewModel.cs
+++ b/src/Ryujinx/UI/ViewModels/Input/ControllerInputViewModel.cs
@@ -91,21 +91,18 @@ namespace Ryujinx.Ava.UI.ViewModels.Input
        }

        public async void ShowMotionConfig()
-        {      
+        {
            await MotionInputView.Show(this);
-            ParentModel.IsModified = true;
        }

        public async void ShowRumbleConfig()
-        {        
+        {
            await RumbleInputView.Show(this);
-            ParentModel.IsModified = true;
        }
        
        public async void ShowLedConfig()
        {
            await LedInputView.Show(this);
-            ParentModel.IsModified = true;
        }

        public void OnParentModelChanged()
--- a/src/Ryujinx/UI/ViewModels/Input/InputViewModel.cs
+++ b/src/Ryujinx/UI/ViewModels/Input/InputViewModel.cs
@@ -51,8 +51,6 @@ namespace Ryujinx.Ava.UI.ViewModels.Input
        private int _device;
        private object _configViewModel;
        [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()
        private bool _isLoaded;

        private static readonly InputConfigJsonSerializerContext _serializerContext = new(JsonHelper.GetDefaultSerializerOptions());
@@ -90,40 +88,13 @@ namespace Ryujinx.Ava.UI.ViewModels.Input
        public bool IsKeyboard => !IsController;
        public bool IsRight { get; set; }
        public bool IsLeft { get; set; }
-        public string RevertDeviceId { get; set; }
+
        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 bool IsModified { get; set; }
        public event Action NotifyChangesEvent;

-        public string _profileChoose;
-        public string ProfileChoose
-        {
-            get => _profileChoose;
-            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;
-                LoadProfile();
-                OnPropertyChanged();
-            }
-        }
-
        public object ConfigViewModel
        {
            get => _configViewModel;
@@ -149,14 +120,14 @@ namespace Ryujinx.Ava.UI.ViewModels.Input
            set
            {
                if (IsModified)
-                {                 
+                {
+
                    _playerIdChoose = value;
                    return;
                }
-             
+
                IsModified = false;
                _playerId = value;
-                _isChangeTrackingActive = false;

                if (!Enum.IsDefined<PlayerIndex>(_playerId))
                {
@@ -164,13 +135,13 @@ namespace Ryujinx.Ava.UI.ViewModels.Input

                }
                _isLoaded = false;
+
                LoadConfiguration();
                LoadDevice();
                LoadProfiles();

-                RevertDeviceId = Devices[Device].Id;
                _isLoaded = true;
-                _isChangeTrackingActive = true;
+
                OnPropertyChanged();
            }
        }
@@ -180,8 +151,6 @@ namespace Ryujinx.Ava.UI.ViewModels.Input
            get => _controller;
            set
            {
-                MarkAsChanged();
-
                _controller = value;

                if (_controller == -1)
@@ -216,11 +185,11 @@ namespace Ryujinx.Ava.UI.ViewModels.Input
                            IsLeft = false;
                            break;
                    }
-                    
+
                    LoadInputDriver();
                    LoadProfiles();
                }
-       
+
                OnPropertyChanged();
                NotifyChanges();
            }
@@ -260,8 +229,6 @@ namespace Ryujinx.Ava.UI.ViewModels.Input
            get => _device;
            set
            {
-                MarkAsChanged();
-
                _device = value < 0 ? 0 : value;

                if (_device >= Devices.Count)
@@ -281,13 +248,11 @@ namespace Ryujinx.Ava.UI.ViewModels.Input
                    }
                }

-                FindPairedDeviceInConfigFile();
                OnPropertyChanged();
                NotifyChanges();
            }
        }

-
        public InputConfig Config { get; set; }

        public InputViewModel(UserControl owner) : this()
@@ -309,8 +274,6 @@ namespace Ryujinx.Ava.UI.ViewModels.Input

                PlayerId = PlayerIndex.Player1;
            }
-
-            _isChangeTrackingActive = true;
        }

        public InputViewModel()
@@ -348,50 +311,8 @@ namespace Ryujinx.Ava.UI.ViewModels.Input
            {
                ConfigViewModel = new ControllerInputViewModel(this, new GamepadInputConfig(controllerInputConfig), VisualStick);
            }
-
-            FindPairedDeviceInConfigFile();
        }

-        private void FindPairedDeviceInConfigFile()
-        {
-            // This function allows you to output a message about the device configuration found in the file
-            // NOTE: if the configuration is found, we display the message "Waiting for controller connection",
-            // but only if the id gamepad belongs to the selected player
-            NotificationIsVisible = Config != null && Devices.FirstOrDefault(d => d.Id == Config.Id).Id != Config.Id && Config.PlayerIndex == PlayerId;
-            if (NotificationIsVisible)
-            {
-                if (string.IsNullOrEmpty(Config.Name))
-                {
-                    NotificationText = $"{LocaleManager.Instance[LocaleKeys.ControllerSettingsWaitingConnectDevice].Format("No information", Config.Id)}";
-                }
-                else
-                {
-                    NotificationText = $"{LocaleManager.Instance[LocaleKeys.ControllerSettingsWaitingConnectDevice].Format(Config.Name, Config.Id)}";
-                }
-            }
-        }
-
-
-        private void MarkAsChanged()
-        {
-            //If tracking is active, then allow changing the modifier      
-            if (!IsModified && _isChangeTrackingActive)
-            {
-                RevertDeviceId = Devices[Device].Id; // Remember the device to undo changes
-                IsModified = true;
-            }
-        }
-
-
-        public void UnlinkDevice()
-        {
-            // "Disabled" mode is available after unbinding the device
-            // NOTE: the IsModified flag to be able to apply the settings.
-            NotificationIsVisible = false;
-            IsModified = true;
-        }
-
-
        public void LoadDevice()
        {
            if (Config == null || Config.Backend == InputBackendType.Invalid)
@@ -457,34 +378,14 @@ namespace Ryujinx.Ava.UI.ViewModels.Input
            }
        }

-        private async void HandleOnGamepadDisconnected(string id)
+        private void HandleOnGamepadDisconnected(string id)
        {
-            _isChangeTrackingActive = false; // Disable configuration change tracking
-            await Dispatcher.UIThread.InvokeAsync(() =>
-            {
-                LoadDevices();
-
-                IsModified = true;
-                RevertChanges();
-                FindPairedDeviceInConfigFile();
-
-                _isChangeTrackingActive = true; // Enable configuration change tracking
-                return System.Threading.Tasks.Task.CompletedTask;
-            });
+            Dispatcher.UIThread.Post(LoadDevices);
        }

-        private async void HandleOnGamepadConnected(string id)
+        private void HandleOnGamepadConnected(string id)
        {
-            _isChangeTrackingActive = false; // Disable configuration change tracking
-            await Dispatcher.UIThread.InvokeAsync(() =>
-            {
-                LoadDevices();
-
-                IsModified = true;
-                RevertChanges();                  
-
-                _isChangeTrackingActive = true;// Enable configuration change tracking
-            });
+            Dispatcher.UIThread.Post(LoadDevices);
        }

        private string GetCurrentGamepadId()
@@ -657,14 +558,12 @@ namespace Ryujinx.Ava.UI.ViewModels.Input
            if (activeDevice.Type == DeviceType.Keyboard)
            {
                string id = activeDevice.Id;
-                string name = activeDevice.Name;

                config = new StandardKeyboardInputConfig
                {
                    Version = InputConfig.CurrentVersion,
                    Backend = InputBackendType.WindowKeyboard,
                    Id = id,
-                    Name = name,
                    ControllerType = ControllerType.ProController,
                    LeftJoycon = new LeftJoyconCommonConfig<Key>
                    {
@@ -714,14 +613,12 @@ namespace Ryujinx.Ava.UI.ViewModels.Input
                bool isNintendoStyle = Devices.ToList().FirstOrDefault(x => x.Id == activeDevice.Id).Name.Contains("Nintendo");

                string id = activeDevice.Id.Split(" ")[0];
-                string name = activeDevice.Name;

                config = new StandardControllerInputConfig
                {
                    Version = InputConfig.CurrentVersion,
                    Backend = InputBackendType.GamepadSDL2,
                    Id = id,
-                    Name = name,
                    ControllerType = ControllerType.ProController,
                    DeadzoneLeft = 0.1f,
                    DeadzoneRight = 0.1f,
@@ -791,12 +688,6 @@ namespace Ryujinx.Ava.UI.ViewModels.Input
            return config;
        }

-        public void LoadProfileButton()
-        { 
-            LoadProfile();
-            IsModified = true;
-        }
-
        public async void LoadProfile()
        {
            if (Device == 0)
@@ -848,11 +739,9 @@ namespace Ryujinx.Ava.UI.ViewModels.Input
            {
                _isLoaded = false;

-                config.Id = Config.Id; // Set current device id instead of changing device(independent profiles)
-
                LoadConfiguration(config);

-                //LoadDevice();  This line of code hard-links profiles to controllers, the commented line allows profiles to be applied to all controllers 
+                LoadDevice();

                _isLoaded = true;

@@ -862,58 +751,54 @@ namespace Ryujinx.Ava.UI.ViewModels.Input

        public async void SaveProfile()
        {
-           
-           if (Device == 0)
-           {
-               return;
-           }
-           
-           if (ConfigViewModel == null)
-           {
-               return;
-           }
-         
-           if (ProfileName == LocaleManager.Instance[LocaleKeys.ControllerSettingsProfileDefault])
-           {
-               await ContentDialogHelper.CreateErrorDialog(LocaleManager.Instance[LocaleKeys.DialogProfileDefaultProfileOverwriteErrorMessage]);
+            if (Device == 0)
+            {
+                return;
+            }

-               return;
-           }
-           else
-           {
-               bool validFileName = ProfileName.IndexOfAny(Path.GetInvalidFileNameChars()) == -1;
+            if (ConfigViewModel == null)
+            {
+                return;
+            }

-               if (validFileName)
-               {
-                   string path = Path.Combine(GetProfileBasePath(), ProfileName + ".json");
+            if (ProfileName == LocaleManager.Instance[LocaleKeys.ControllerSettingsProfileDefault])
+            {
+                await ContentDialogHelper.CreateErrorDialog(LocaleManager.Instance[LocaleKeys.DialogProfileDefaultProfileOverwriteErrorMessage]);

-                   InputConfig config = null;
+                return;
+            }
+            else
+            {
+                bool validFileName = ProfileName.IndexOfAny(Path.GetInvalidFileNameChars()) == -1;

-                   if (IsKeyboard)
-                   {
-                       config = (ConfigViewModel as KeyboardInputViewModel).Config.GetConfig();
-                   }
-                   else if (IsController)
-                   {
-                       config = (ConfigViewModel as ControllerInputViewModel).Config.GetConfig();
-                   }
+                if (validFileName)
+                {
+                    string path = Path.Combine(GetProfileBasePath(), ProfileName + ".json");

-                   config.ControllerType = Controllers[_controller].Type;
+                    InputConfig config = null;

-                   string jsonString = JsonHelper.Serialize(config, _serializerContext.InputConfig);
+                    if (IsKeyboard)
+                    {
+                        config = (ConfigViewModel as KeyboardInputViewModel).Config.GetConfig();
+                    }
+                    else if (IsController)
+                    {
+                        config = (ConfigViewModel as ControllerInputViewModel).Config.GetConfig();
+                    }

-                   await File.WriteAllTextAsync(path, jsonString);
+                    config.ControllerType = Controllers[_controller].Type;

-                   LoadProfiles();
+                    string jsonString = JsonHelper.Serialize(config, _serializerContext.InputConfig);

-                   ProfileChoose = ProfileName; // Show new profile
-               }
-               else
-               {
-                   await ContentDialogHelper.CreateErrorDialog(LocaleManager.Instance[LocaleKeys.DialogProfileInvalidProfileNameErrorMessage]);
-               }
-           }
-           
+                    await File.WriteAllTextAsync(path, jsonString);
+
+                    LoadProfiles();
+                }
+                else
+                {
+                    await ContentDialogHelper.CreateErrorDialog(LocaleManager.Instance[LocaleKeys.DialogProfileInvalidProfileNameErrorMessage]);
+                }
+            }
        }

        public async void RemoveProfile()
@@ -940,33 +825,14 @@ namespace Ryujinx.Ava.UI.ViewModels.Input
                }

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

-        public void RevertChanges()
-        {
-                Device = Devices.ToList().FindIndex(d => d.Id == RevertDeviceId);
-                LoadDevice();
-                LoadConfiguration();
-                OnPropertyChanged();
-                IsModified = false;
-        }
-
        public void Save()
        {
-            
-            if (!IsModified)
-            {
-                return; //If the input settings were not touched, then do nothing
-            }
-
            IsModified = false;

-            RevertDeviceId = Devices[Device].Id; // Remember selected device after saving
-
-            List <InputConfig> newConfig = [];
+            List<InputConfig> newConfig = [];

            newConfig.AddRange(ConfigurationState.Instance.Hid.InputConfig.Value);

@@ -996,7 +862,6 @@ namespace Ryujinx.Ava.UI.ViewModels.Input
                    : (ConfigViewModel as ControllerInputViewModel).Config.GetConfig();
                config.ControllerType = Controllers[_controller].Type;
                config.PlayerIndex = _playerId;
-                config.Name = device.Name;

                int i = newConfig.FindIndex(x => x.PlayerIndex == PlayerId);
                if (i == -1)
--- a/src/Ryujinx/UI/ViewModels/SettingsViewModel.cs
+++ b/src/Ryujinx/UI/ViewModels/SettingsViewModel.cs
@@ -60,6 +60,7 @@ namespace Ryujinx.Ava.UI.ViewModels
        private bool _enableCustomVSyncInterval;
        private int _customVSyncIntervalPercentageProxy;
        private VSyncMode _vSyncMode;
+        private long _turboModeMultiplier;

        public event Action CloseWindow;
        public event Action SaveSettingsEvent;
@@ -206,6 +207,25 @@ namespace Ryujinx.Ava.UI.ViewModels
        }
        public bool EnablePptc { get; set; }
        public bool EnableLowPowerPptc { get; set; }
+        
+        
+        public long TurboMultiplier
+        {
+            get => _turboModeMultiplier;
+            set
+            {
+                if (_turboModeMultiplier != value)
+                {
+                    _turboModeMultiplier = value;
+                    
+                    OnPropertyChanged();
+                    OnPropertyChanged((nameof(TurboMultiplierPercentageText)));
+                }
+            }
+        }
+        
+        public string TurboMultiplierPercentageText => $"{TurboMultiplier}%";
+
        public bool EnableInternetAccess { get; set; }
        public bool EnableFsIntegrityChecks { get; set; }
        public bool IgnoreMissingServices { get; set; }
@@ -592,6 +612,7 @@ namespace Ryujinx.Ava.UI.ViewModels
            EnableLowPowerPptc = config.System.EnableLowPowerPtc;
            MemoryMode = (int)config.System.MemoryManagerMode.Value;
            UseHypervisor = config.System.UseHypervisor;
+            TurboMultiplier = config.System.TickScalar;

            // Graphics
            GraphicsBackendIndex = (int)config.Graphics.GraphicsBackend.Value;
@@ -694,6 +715,7 @@ namespace Ryujinx.Ava.UI.ViewModels
            config.System.EnableLowPowerPtc.Value = EnableLowPowerPptc;
            config.System.MemoryManagerMode.Value = (MemoryManagerMode)MemoryMode;
            config.System.UseHypervisor.Value = UseHypervisor;
+            config.System.TickScalar.Value = TurboMultiplier;

            // Graphics
            config.Graphics.VSyncMode.Value = VSyncMode;
--- a/src/Ryujinx/UI/Views/Input/ControllerInputView.axaml.cs
+++ b/src/Ryujinx/UI/Views/Input/ControllerInputView.axaml.cs
@@ -64,9 +64,8 @@ namespace Ryujinx.Ava.UI.Views.Input
                };

                if (!float.IsNaN(_changeSlider) && _changeSlider != (float)check.Value)
-                {     
-                    FlagInputConfigChanged();
-
+                {
+                    (DataContext as ControllerInputViewModel)!.ParentModel.IsModified = true;
                    _changeSlider = (float)check.Value;
                }
            }
@@ -76,8 +75,7 @@ namespace Ryujinx.Ava.UI.Views.Input
        {
            if (sender is CheckBox { IsPointerOver: true })
            {
-                FlagInputConfigChanged();
-
+                (DataContext as ControllerInputViewModel)!.ParentModel.IsModified = true;
                _currentAssigner?.Cancel();
                _currentAssigner = null;
            }
@@ -104,7 +102,7 @@ namespace Ryujinx.Ava.UI.Views.Input
                        this.Focus(NavigationMethod.Pointer);

                        PointerPressed += MouseClick;
-                       
+
                        ControllerInputViewModel viewModel = (DataContext as ControllerInputViewModel);

                        IKeyboard keyboard =
@@ -117,7 +115,7 @@ namespace Ryujinx.Ava.UI.Views.Input
                            if (e.ButtonValue.HasValue)
                            {
                                Button buttonValue = e.ButtonValue.Value;
-                                FlagInputConfigChanged();
+                                viewModel.ParentModel.IsModified = true;

                                switch (button.Name)
                                {
@@ -211,11 +209,6 @@ namespace Ryujinx.Ava.UI.Views.Input
            }
        }

-        private void FlagInputConfigChanged()
-        {
-            (DataContext as ControllerInputViewModel)!.ParentModel.IsModified = true;
-        }
-
        private void MouseClick(object sender, PointerPressedEventArgs e)
        {
            bool shouldUnbind = e.GetCurrentPoint(this).Properties.IsMiddleButtonPressed;
@@ -239,6 +232,7 @@ namespace Ryujinx.Ava.UI.Views.Input
            {
                gamepad?.ClearLed();
            }
+            
            _currentAssigner?.Cancel();
            _currentAssigner = null;
        }
--- a/src/Ryujinx/UI/Views/Input/InputView.axaml
+++ b/src/Ryujinx/UI/Views/Input/InputView.axaml
@@ -41,20 +41,13 @@
                    Grid.Column="0"
                    Margin="2"
                    HorizontalAlignment="Stretch"
-                    VerticalAlignment="Center" ColumnDefinitions="Auto,*,Auto">
-                    <StackPanel 
-                        Orientation="Vertical"   
+                    VerticalAlignment="Center" ColumnDefinitions="Auto,*">
+                    <TextBlock
                        Margin="5,0,10,0"
+                        Width="90"
                        HorizontalAlignment="Left"
                        VerticalAlignment="Center"
-                        Width="90">
-                        <TextBlock
-                            Text="{ext:Locale ControllerSettingsPlayer}" />
-                         <TextBlock                        
-                            Classes="pending" 
-                            Text ="{ext:Locale ControllerSettingsModifiedNotification}"
-                            IsVisible="{Binding IsModified}"/>
-                    </StackPanel>
+                        Text="{ext:Locale ControllerSettingsPlayer}" />
                    <ComboBox
                        Grid.Column="1"
                        Name="PlayerIndexBox"
@@ -69,18 +62,6 @@
                            </DataTemplate>
                        </ComboBox.ItemTemplate>
                    </ComboBox>
-                    <Button
-                        Grid.Column="2"
-                            MinWidth="0"
-                            Margin="5,0,0,0"
-                            VerticalAlignment="Center"
-                            ToolTip.Tip="{ext:Locale ControllerSettingsCancelCurrentChangesToolTip}"
-                            Command="{Binding RevertChanges}">
-                        <ui:SymbolIcon
-                            Symbol="Undo"
-                            FontSize="15"
-                            Height="20" />
-                    </Button>
                </Grid>
                <!-- Profile Selection -->
                <Grid
@@ -100,8 +81,7 @@
                        Name="ProfileBox"
                        HorizontalAlignment="Stretch"
                        VerticalAlignment="Center"
-                        SelectedItem="{Binding ProfileChoose, Mode=TwoWay}"
-                        SelectionChanged="ComboBox_SelectionChanged"
+                        SelectedIndex="0"
                        ItemsSource="{Binding ProfilesList}"
                        Text="{Binding ProfileName, Mode=TwoWay}" />
                    <Button
@@ -110,7 +90,7 @@
                        Margin="5,0,0,0"
                        VerticalAlignment="Center"
                        ToolTip.Tip="{ext:Locale ControllerSettingsLoadProfileToolTip}"
-                        Command="{Binding LoadProfileButton}">
+                        Command="{Binding LoadProfile}">
                        <ui:SymbolIcon
                            Symbol="View"
                            FontSize="15"
@@ -168,7 +148,7 @@
                        MinWidth="0"
                        Margin="5,0,0,0"
                        VerticalAlignment="Center"
-                        Command="{Binding LoadDevice}">
+                        Command="{Binding LoadDevices}">
                        <ui:SymbolIcon
                            Symbol="Refresh"
                            FontSize="15"
@@ -201,37 +181,15 @@
                </Grid>
            </Grid>
        </StackPanel>
-        <ContentControl IsVisible="{Binding NotificationIsVisible}">
-            <ContentControl.Content>
-
-                <StackPanel>
-                    <TextBlock 
-                        Margin="5,20,0,0"
-                        Text="{Binding NotificationText}" />       
-                    <Button
-                        MinWidth="0"
-                        Width="90"
-                        Height="27"
-                        Margin="0,10,0,0"
-                        VerticalAlignment="Center"
-                        Command="{Binding UnlinkDevice}">
-                        <TextBlock
-                            Text="{ext:Locale ControllerSettingsUnlink}"
-                            VerticalAlignment="Center"
-                            HorizontalAlignment="Center" />
-                    </Button>
-                </StackPanel>
-            </ContentControl.Content>
+        <ContentControl Content="{Binding ConfigViewModel}" IsVisible="{Binding ShowSettings}">
+            <ContentControl.DataTemplates>
+                <DataTemplate DataType="viewModels:ControllerInputViewModel">
+                    <views:ControllerInputView />
+                </DataTemplate>
+                <DataTemplate DataType="viewModels:KeyboardInputViewModel">
+                    <views:KeyboardInputView />
+                </DataTemplate>
+            </ContentControl.DataTemplates>
        </ContentControl>
-            <ContentControl Content="{Binding ConfigViewModel}" IsVisible="{Binding ShowSettings}">        
-                <ContentControl.DataTemplates>
-                    <DataTemplate DataType="viewModels:ControllerInputViewModel">
-                        <views:ControllerInputView />
-                    </DataTemplate>
-                    <DataTemplate DataType="viewModels:KeyboardInputViewModel">
-                        <views:KeyboardInputView />
-                    </DataTemplate>
-                </ContentControl.DataTemplates>
-            </ContentControl>
    </StackPanel>
 </UserControl>
--- a/src/Ryujinx/UI/Views/Input/InputView.axaml.cs
+++ b/src/Ryujinx/UI/Views/Input/InputView.axaml.cs
@@ -1,5 +1,4 @@
 using Avalonia.Controls;
-using FluentAvalonia.UI.Controls;
 using Ryujinx.Ava.Common.Locale;
 using Ryujinx.Ava.UI.Controls;
 using Ryujinx.Ava.UI.Helpers;
@@ -63,21 +62,12 @@ namespace Ryujinx.Ava.UI.Views.Input
                    }
                    return;
                }
+                
+                ViewModel.PlayerId = ViewModel.PlayerIdChoose;

                ViewModel.IsModified = false;
-                ViewModel.PlayerId = ViewModel.PlayerIdChoose;
-                
-            }   
-            
-        }
-
-        private void ComboBox_SelectionChanged(object sender, SelectionChangedEventArgs e)
-        {
-            if (sender is FAComboBox faComboBox)
-            {
-                faComboBox.IsDropDownOpen = false;
-                ViewModel.IsModified = true;
            }
+            
        }

        public void Dispose()
--- a/src/Ryujinx/UI/Views/Input/KeyboardInputView.axaml.cs
+++ b/src/Ryujinx/UI/Views/Input/KeyboardInputView.axaml.cs
@@ -9,8 +9,6 @@ using Ryujinx.Ava.UI.Helpers;
 using Ryujinx.Ava.UI.ViewModels.Input;
 using Ryujinx.Input;
 using Ryujinx.Input.Assigner;
-using System.Collections.Generic;
-using System;
 using Button = Ryujinx.Input.Button;
 using Key = Ryujinx.Common.Configuration.Hid.Key;

@@ -188,63 +186,11 @@ namespace Ryujinx.Ava.UI.Views.Input
        {
            bool shouldUnbind = e.GetCurrentPoint(this).Properties.IsMiddleButtonPressed;

-            bool shouldRemoveBinding = e.GetCurrentPoint(this).Properties.IsRightButtonPressed;
-
-            if (shouldRemoveBinding)
-            {
-                DeleteBind();
-            }
-
            _currentAssigner?.Cancel(shouldUnbind);

            PointerPressed -= MouseClick;
        }

-        private void DeleteBind()
-        {
-
-            if (_currentAssigner != null)
-            {
-                Dictionary<string, Action> buttonActions = new Dictionary<string, Action>
-                {
-                    { "ButtonZl", () => ViewModel.Config.ButtonZl = Key.Unbound },
-                    { "ButtonL", () => ViewModel.Config.ButtonL = Key.Unbound },
-                    { "ButtonMinus", () => ViewModel.Config.ButtonMinus = Key.Unbound },
-                    { "LeftStickButton", () => ViewModel.Config.LeftStickButton = Key.Unbound },
-                    { "LeftStickUp", () => ViewModel.Config.LeftStickUp = Key.Unbound },
-                    { "LeftStickDown", () => ViewModel.Config.LeftStickDown = Key.Unbound },
-                    { "LeftStickRight", () => ViewModel.Config.LeftStickRight = Key.Unbound },
-                    { "LeftStickLeft", () => ViewModel.Config.LeftStickLeft = Key.Unbound },
-                    { "DpadUp", () => ViewModel.Config.DpadUp = Key.Unbound },
-                    { "DpadDown", () => ViewModel.Config.DpadDown = Key.Unbound },
-                    { "DpadLeft", () => ViewModel.Config.DpadLeft = Key.Unbound },
-                    { "DpadRight", () => ViewModel.Config.DpadRight = Key.Unbound },
-                    { "LeftButtonSr", () => ViewModel.Config.LeftButtonSr = Key.Unbound },
-                    { "LeftButtonSl", () => ViewModel.Config.LeftButtonSl = Key.Unbound },
-                    { "RightButtonSr", () => ViewModel.Config.RightButtonSr = Key.Unbound },
-                    { "RightButtonSl", () => ViewModel.Config.RightButtonSl = Key.Unbound },
-                    { "ButtonZr", () => ViewModel.Config.ButtonZr = Key.Unbound },
-                    { "ButtonR", () => ViewModel.Config.ButtonR = Key.Unbound },
-                    { "ButtonPlus", () => ViewModel.Config.ButtonPlus = Key.Unbound },
-                    { "ButtonA", () => ViewModel.Config.ButtonA = Key.Unbound },
-                    { "ButtonB", () => ViewModel.Config.ButtonB = Key.Unbound },
-                    { "ButtonX", () => ViewModel.Config.ButtonX = Key.Unbound },
-                    { "ButtonY", () => ViewModel.Config.ButtonY = Key.Unbound },
-                    { "RightStickButton", () => ViewModel.Config.RightStickButton = Key.Unbound },
-                    { "RightStickUp", () => ViewModel.Config.RightStickUp = Key.Unbound },
-                    { "RightStickDown", () => ViewModel.Config.RightStickDown = Key.Unbound },
-                    { "RightStickRight", () => ViewModel.Config.RightStickRight = Key.Unbound },
-                    { "RightStickLeft", () => ViewModel.Config.RightStickLeft = Key.Unbound }
-                };
-
-                if (buttonActions.TryGetValue(_currentAssigner.ToggledButton.Name, out Action action))
-                {
-                    action();
-                    ViewModel.ParentModel.IsModified = true;
-                }
-            }
-        }
-
        protected override void OnDetachedFromVisualTree(VisualTreeAttachmentEventArgs e)
        {
            base.OnDetachedFromVisualTree(e);
--- a/src/Ryujinx/UI/Views/Settings/SettingsCPUView.axaml
+++ b/src/Ryujinx/UI/Views/Settings/SettingsCPUView.axaml
@@ -7,6 +7,7 @@
    xmlns:ext="clr-namespace:Ryujinx.Ava.Common.Markup"
    xmlns:viewModels="clr-namespace:Ryujinx.Ava.UI.ViewModels"
    xmlns:helper="clr-namespace:Ryujinx.Common.Helper;assembly=Ryujinx.Common"
+    xmlns:ui="clr-namespace:FluentAvalonia.UI.Controls;assembly=FluentAvalonia"
    mc:Ignorable="d"
    x:DataType="viewModels:SettingsViewModel">
    <Design.DataContext>
@@ -76,6 +77,57 @@
                                   ToolTip.Tip="{ext:Locale UseHypervisorTooltip}" />
                    </CheckBox>
                </StackPanel>
+                <Separator Height="1" />
+                <StackPanel
+                    Orientation="Vertical"
+                    Spacing="5">
+                    <TextBlock
+                        Classes="h1"
+                        Text="{ext:Locale SettingsTabSystemHacks}" />
+                    <TextBlock
+                        Foreground="{DynamicResource SecondaryTextColor}"
+                        TextDecorations="Underline"
+                        Text="{ext:Locale SettingsTabSystemHacksNote}" />
+                </StackPanel>
+                <StackPanel
+                    Margin="10,0,0,0"
+                    HorizontalAlignment="Stretch"
+                    Orientation="Vertical">
+                    <StackPanel Margin="0,0,0,10"
+                                Orientation="Horizontal">
+                        <TextBlock
+                            VerticalAlignment="Center"
+                            Background="Transparent"
+                            Text="{ext:Locale SettingsTabSystemTurboMultiplier}"
+                            ToolTip.Tip="{ext:Locale SettingsTabSystemTurboMultiplierToolTip}"
+                            Width="250" />
+                        <ui:NumberBox ToolTip.Tip="{ext:Locale SettingsTabSystemTurboMultiplierValueToolTip}"
+                                      Value="{Binding TurboMultiplier}"
+                                      Width="165"
+                                      SmallChange="1.0"
+                                      LargeChange="10"
+                                      SimpleNumberFormat="F0"
+                                      SpinButtonPlacementMode="Hidden"
+                                      Minimum="50"
+                                      Maximum="300" />
+                        <Slider Value="{Binding TurboMultiplier}"
+                                ToolTip.Tip="{ext:Locale SettingsTabSystemTurboMultiplierValueToolTip}"
+                                MinWidth="175"
+                                Margin="10,-3,0,0"
+                                Height="32"
+                                Padding="0,-5"
+                                TickFrequency="1"
+                                IsSnapToTickEnabled="True"
+                                LargeChange="10"
+                                SmallChange="1"
+                                VerticalAlignment="Center"
+                                Minimum="50"
+                                Maximum="500" />
+                        <TextBlock Margin="5,0"
+                                   Width="40"
+                                   Text="{Binding TurboMultiplierPercentageText}"/>
+                    </StackPanel>
+                </StackPanel>
            </StackPanel>
        </Border>
    </ScrollViewer>
--- a/src/Ryujinx/UI/Views/Settings/SettingsHotkeysView.axaml
+++ b/src/Ryujinx/UI/Views/Settings/SettingsHotkeysView.axaml
@@ -19,7 +19,7 @@
            <Setter Property="Margin" Value="10, 0, 0, 0" />
            <Setter Property="Orientation" Value="Horizontal" />
        </Style>
-        <Style Selector="StackPanel > StackPanel > TextBlock">
+        <Style Selector="StackPanel > StackPanel > TextBlock.settingHeader">
            <Setter Property="VerticalAlignment" Value="Center" />
            <Setter Property="Width" Value="230" />
        </Style>
@@ -47,71 +47,79 @@
                    Classes="h1"
                    Text="{ext:Locale SettingsTabHotkeysHotkeys}" />
                <StackPanel>
-                    <TextBlock Text="{ext:Locale SettingsTabHotkeysToggleVSyncModeHotkey}" />
+                    <TextBlock Text="{ext:Locale SettingsTabHotkeysToggleVSyncModeHotkey}" Classes="settingHeader" />
                    <ToggleButton Name="ToggleVSyncMode">
                        <TextBlock Text="{Binding KeyboardHotkey.ToggleVSyncMode, Converter={x:Static helpers:KeyValueConverter.Instance}}" />
                    </ToggleButton>
                </StackPanel>
                <StackPanel>
-                    <TextBlock Text="{ext:Locale SettingsTabHotkeysScreenshotHotkey}" />
+                    <TextBlock Text="{ext:Locale SettingsTabHotkeysScreenshotHotkey}" Classes="settingHeader" />
                    <ToggleButton Name="Screenshot">
                        <TextBlock Text="{Binding KeyboardHotkey.Screenshot, Converter={x:Static helpers:KeyValueConverter.Instance}}" />
                    </ToggleButton>
                </StackPanel>
                <StackPanel>
-                    <TextBlock Text="{ext:Locale SettingsTabHotkeysShowUiHotkey}" />
+                    <TextBlock Text="{ext:Locale SettingsTabHotkeysShowUiHotkey}" Classes="settingHeader" />
                    <ToggleButton Name="ShowUI">
                        <TextBlock Text="{Binding KeyboardHotkey.ShowUI, Converter={x:Static helpers:KeyValueConverter.Instance}}" />
                    </ToggleButton>
                </StackPanel>
                <StackPanel>
-                    <TextBlock Text="{ext:Locale SettingsTabHotkeysPauseHotkey}" />
+                    <TextBlock Text="{ext:Locale SettingsTabHotkeysPauseHotkey}" Classes="settingHeader" />
                    <ToggleButton Name="Pause">
                        <TextBlock Text="{Binding KeyboardHotkey.Pause, Converter={x:Static helpers:KeyValueConverter.Instance}}" />
                    </ToggleButton>
                </StackPanel>
                <StackPanel>
-                    <TextBlock Text="{ext:Locale SettingsTabHotkeysToggleMuteHotkey}" />
+                    <TextBlock Text="{ext:Locale SettingsTabHotkeysToggleMuteHotkey}" Classes="settingHeader" />
                    <ToggleButton Name="ToggleMute">
                        <TextBlock Text="{Binding KeyboardHotkey.ToggleMute, Converter={x:Static helpers:KeyValueConverter.Instance}}" />
                    </ToggleButton>
                </StackPanel>
                <StackPanel>
-                    <TextBlock Text="{ext:Locale SettingsTabHotkeysResScaleUpHotkey}" />
+                    <TextBlock Text="{ext:Locale SettingsTabHotkeysResScaleUpHotkey}" Classes="settingHeader" />
                    <ToggleButton Name="ResScaleUp">
                        <TextBlock Text="{Binding KeyboardHotkey.ResScaleUp, Converter={x:Static helpers:KeyValueConverter.Instance}}" />
                    </ToggleButton>
                </StackPanel>
                <StackPanel>
-                    <TextBlock Text="{ext:Locale SettingsTabHotkeysResScaleDownHotkey}" />
+                    <TextBlock Text="{ext:Locale SettingsTabHotkeysResScaleDownHotkey}" Classes="settingHeader" />
                    <ToggleButton Name="ResScaleDown">
                        <TextBlock Text="{Binding KeyboardHotkey.ResScaleDown, Converter={x:Static helpers:KeyValueConverter.Instance}}" />
                    </ToggleButton>
                </StackPanel>
                <StackPanel>
-                    <TextBlock Text="{ext:Locale SettingsTabHotkeysVolumeUpHotkey}" />
+                    <TextBlock Text="{ext:Locale SettingsTabHotkeysVolumeUpHotkey}" Classes="settingHeader" />
                    <ToggleButton Name="VolumeUp">
                        <TextBlock Text="{Binding KeyboardHotkey.VolumeUp, Converter={x:Static helpers:KeyValueConverter.Instance}}" />
                    </ToggleButton>
                </StackPanel>
                <StackPanel>
-                    <TextBlock Text="{ext:Locale SettingsTabHotkeysVolumeDownHotkey}" />
+                    <TextBlock Text="{ext:Locale SettingsTabHotkeysVolumeDownHotkey}" Classes="settingHeader" />
                    <ToggleButton Name="VolumeDown">
                        <TextBlock Text="{Binding KeyboardHotkey.VolumeDown, Converter={x:Static helpers:KeyValueConverter.Instance}}" />
                    </ToggleButton>
                </StackPanel>
                <StackPanel Margin="10,0,0,0" Orientation="Horizontal">
-                    <TextBlock Text="{ext:Locale SettingsTabHotkeysIncrementCustomVSyncIntervalHotkey}" />
+                    <TextBlock Text="{ext:Locale SettingsTabHotkeysIncrementCustomVSyncIntervalHotkey}" Classes="settingHeader" />
                    <ToggleButton Name="CustomVSyncIntervalIncrement">
                        <TextBlock Text="{Binding KeyboardHotkey.CustomVSyncIntervalIncrement, Converter={x:Static helpers:KeyValueConverter.Instance}}" />
                    </ToggleButton>
                </StackPanel>
                <StackPanel Margin="10,0,0,0" Orientation="Horizontal">
-                    <TextBlock Text="{ext:Locale SettingsTabHotkeysDecrementCustomVSyncIntervalHotkey}" />
+                    <TextBlock Text="{ext:Locale SettingsTabHotkeysDecrementCustomVSyncIntervalHotkey}" Classes="settingHeader" />
                    <ToggleButton Name="CustomVSyncIntervalDecrement">
                        <TextBlock Text="{Binding KeyboardHotkey.CustomVSyncIntervalDecrement, Converter={x:Static helpers:KeyValueConverter.Instance}}" />
                    </ToggleButton>
                </StackPanel>
+                <StackPanel Orientation="Horizontal">
+                    <TextBlock Text="{ext:Locale SettingsTabHotkeysTurboMode}" Classes="settingHeader" ToolTip.Tip="{ext:Locale SettingsTabHotkeysTurboModeToolTip}" Background="Transparent" />
+                    <ToggleButton Name="TurboMode">
+                        <TextBlock Text="{Binding KeyboardHotkey.TurboMode, Converter={x:Static helpers:KeyValueConverter.Instance}}" />
+                    </ToggleButton>
+                    <TextBlock Text="{ext:Locale SettingsTabHotkeysOnlyWhilePressed}" Margin="10,0" />
+                    <CheckBox IsChecked="{Binding KeyboardHotkey.TurboModeWhileHeld}" />
+                </StackPanel>
            </StackPanel>
        </Border>
   </ScrollViewer>
--- a/src/Ryujinx/UI/Views/Settings/SettingsHotkeysView.axaml.cs
+++ b/src/Ryujinx/UI/Views/Settings/SettingsHotkeysView.axaml.cs
@@ -10,8 +10,6 @@ using Ryujinx.Ava.UI.Helpers;
 using Ryujinx.Ava.UI.ViewModels;
 using Ryujinx.Input;
 using Ryujinx.Input.Assigner;
-using System.Collections.Generic;
-using System;
 using Button = Ryujinx.Input.Button;
 using Key = Ryujinx.Common.Configuration.Hid.Key;

@@ -50,47 +48,12 @@ namespace Ryujinx.Ava.UI.Views.Settings
        private void MouseClick(object sender, PointerPressedEventArgs e)
        {
            bool shouldUnbind = e.GetCurrentPoint(this).Properties.IsMiddleButtonPressed;
-            bool shouldRemoveBinding = e.GetCurrentPoint(this).Properties.IsRightButtonPressed;

-            if (shouldRemoveBinding)
-            {
-                DeleteBind();
-            }
-          
            _currentAssigner?.Cancel(shouldUnbind);

            PointerPressed -= MouseClick;
        }

-        private void DeleteBind()
-        {
-            if (DataContext is not SettingsViewModel viewModel)
-                return;
-
-            if (_currentAssigner != null)
-            {
-                Dictionary<string, Action> buttonActions = new Dictionary<string, Action>
-                {
-                    { "ToggleVSyncMode", () => viewModel.KeyboardHotkey.ToggleVSyncMode = Key.Unbound },
-                    { "Screenshot", () => viewModel.KeyboardHotkey.Screenshot = Key.Unbound },
-                    { "ShowUI", () => viewModel.KeyboardHotkey.ShowUI = Key.Unbound },
-                    { "Pause", () => viewModel.KeyboardHotkey.Pause = Key.Unbound },
-                    { "ToggleMute", () => viewModel.KeyboardHotkey.ToggleMute = Key.Unbound },
-                    { "ResScaleUp", () => viewModel.KeyboardHotkey.ResScaleUp = Key.Unbound },
-                    { "ResScaleDown", () => viewModel.KeyboardHotkey.ResScaleDown = Key.Unbound },
-                    { "VolumeUp", () => viewModel.KeyboardHotkey.VolumeUp = Key.Unbound },
-                    { "VolumeDown", () => viewModel.KeyboardHotkey.VolumeDown = Key.Unbound },
-                    { "CustomVSyncIntervalIncrement", () => viewModel.KeyboardHotkey.CustomVSyncIntervalIncrement = Key.Unbound },
-                    { "CustomVSyncIntervalDecrement", () => viewModel.KeyboardHotkey.CustomVSyncIntervalDecrement = Key.Unbound }
-                };
-
-                if (buttonActions.TryGetValue(_currentAssigner.ToggledButton.Name, out Action action))
-                {
-                    action();
-                }
-            }
-        }
-
        private void Button_IsCheckedChanged(object sender, RoutedEventArgs e)
        {
            if (sender is ToggleButton button)
@@ -158,6 +121,9 @@ namespace Ryujinx.Ava.UI.Views.Settings
                                            ViewModel.KeyboardHotkey.CustomVSyncIntervalDecrement =
                                                buttonValue.AsHidType<Key>();
                                            break;
+                                        case "TurboMode":
+                                            ViewModel.KeyboardHotkey.TurboMode = buttonValue.AsHidType<Key>();
+                                            break;
                                    }
                                });
                            }
Author	SHA1	Message	Date
Evan Husted	3247145155	Merge branch 'master' into feature/turbo-mode	2025-03-13 21:35:03 -05:00
Keaton	7664f8cde9	update FFmpeg to 6.1.2 & Windows on ARM support (#702 ) As stated in the title, win-arm64 (Windows 11 ARM) has been added to the workflows, so these builds should automatically compile for this PR and all other releases going forward. Also updated the FFmpeg runtimes from 5.0.3 to 6.1.2. macOS (x64/arm64) is _currently_ excluded from the update until a proper cross-compiling environment can be set up for these architectures. Windows 11 ARM users, please test the win-arm64 build for any issues. --------- Co-authored-by: Evan Husted <greem@greemdev.net>	2025-03-13 18:36:57 -05:00
Hack茶ん	ddc00cf2d8	Update Korean translation (#764 )	2025-03-13 13:56:47 -05:00
Evan Husted	05b4bd8c61	UI: Use a new repo for amiibo stuff specifically	2025-03-12 14:17:14 -05:00
Evan Husted	709f0dd59c	Merge branch 'master' into feature/turbo-mode	2025-03-12 13:38:41 -05:00
Milihraim	20111a651c	Update Russian (#745 )	2025-03-12 00:12:37 -05:00
WilliamWsyHK	659e580f4d	Update TChinese translation (#738 )	2025-03-11 23:34:57 -05:00
Evan Husted	e6339ac950	fix logo in readme	2025-03-11 21:35:25 -05:00
Evan Husted	aa4a983056	Merge branch 'master' into feature/turbo-mode	2025-03-11 01:54:47 -05:00
Evan Husted	51f3554f82	cap turbo to 300%	2025-03-10 01:27:24 -05:00
Evan Husted	8e285579ae	Merge branch 'master' into feature/turbo-mode	2025-03-10 01:24:40 -05:00
Evan Husted	3644e3fd92	Merge branch 'master' into feature/turbo-mode	2025-03-10 01:10:22 -05:00
Evan Husted	3abee2a0be	Merge branch 'master' into feature/turbo-mode	2025-03-04 02:57:30 -06:00
Evan Husted	94f34a9ed1	properly merge + move hleconfig tick scalar parameter	2025-03-04 01:19:18 -06:00
Evan Husted	776c0cb5cf	merge	2025-03-04 01:08:39 -06:00
Evan Husted	ef1529a2d9	localize Turbo Mode for French	2025-03-03 13:38:52 -06:00
Evan Husted	768406cb67	Improve description of Turbo Mode in the UI and localize FPS/Turbo indicator on status bar	2025-03-03 12:42:00 -06:00
Evan Husted	ed5cb82aa8	feature: Turbo Mode Adds an elapsed tick multiplier feature which speeds up games which are built upon delta time. More information: https://web.archive.org/web/20240713135029/https://github.com/Ryujinx/Ryujinx/pull/6456	2025-03-03 02:33:28 -06:00
Evan Husted	c48a2e6ba0	join assignment and declaration for this local variable in ipc service	2025-03-03 02:30:26 -06:00
Evan Husted	90f2b089eb	fix nullref when switching vsync mode with turbo mode	2025-03-02 23:51:56 -06:00