Compare commits

..

5 Commits

7 changed files with 19 additions and 11 deletions

View File

@@ -165,10 +165,8 @@ namespace Ryujinx.Headless
ReloadConfig();
if (option.InheritConfig)
{
if (!option.DisableMainInputConfig)
option.InheritMainConfigInput(originalArgs, ConfigurationState.Instance);
}
_virtualFileSystem = VirtualFileSystem.CreateInstance();
_libHacHorizonManager = new LibHacHorizonManager();

View File

@@ -193,6 +193,9 @@ namespace Ryujinx.Headless
[Option("use-main-config", Required = false, Default = false, HelpText = "Use the settings from what was configured via the UI.")]
public bool InheritConfig { get; set; }
[Option("disable-main-input-config", Required = false, Default = false, HelpText = "Do not use the input-related settings from what was configured via the UI.")]
public bool DisableMainInputConfig { get; set; }
[Option("root-data-dir", Required = false, HelpText = "Set the custom folder path for Ryujinx data.")]
public string BaseDataDir { get; set; }

View File

@@ -1116,8 +1116,8 @@ namespace Ryujinx.Ava.Systems
LocaleManager.Instance[LocaleKeys.VolumeShort] + $": {(int)(Device.GetVolume() * 100)}%",
dockedMode,
ConfigurationState.Instance.Graphics.AspectRatio.Value.ToText(),
FormatGameFrameRate(),
Device.Statistics.FormatFifoPercent(),
Device.System.IsPaused ? LocaleManager.GetUnformatted(LocaleKeys.Paused) : FormatGameFrameRate(),
Device.System.IsPaused ? string.Empty : Device.Statistics.FormatFifoPercent(),
_displayCount));
}

View File

@@ -23,7 +23,7 @@ namespace Ryujinx.Ava.Systems
private static readonly string _description =
ReleaseInformation.IsValid
? $"{VersionString} {ReleaseInformation.ReleaseChannelOwner}/{ReleaseInformation.ReleaseChannelSourceRepo}"
? $"{VersionString} {ReleaseInformation.ReleaseChannelOwner}/{ReleaseInformation.ReleaseChannelRepo}"
: "dev build";
private const string ApplicationId = "1293250299716173864";

View File

@@ -14,8 +14,8 @@ namespace Ryujinx.Ava.UI.ViewModels
[ObservableProperty] private Bitmap _gitLabLogo;
[ObservableProperty] private Bitmap _discordLogo;
[ObservableProperty] private string _version;
public string Developers => "GreemDev";
public string Developers => "GreemDev, LotP";
public string FormerDevelopers => LocaleManager.Instance.UpdateAndGetDynamicValue(LocaleKeys.AboutPageDeveloperListMore, "gdkchan, Ac_K, marysaka, rip in peri peri, LDj3SNuD, emmaus, Thealexbarney, GoffyDude, TSRBerry, IsaacMarovitz");

View File

@@ -249,7 +249,14 @@
IsVisible="{Binding !ShowLoadProgress}"
Text="{Binding GameStatusText}"
TextAlignment="Start" />
<controls:MiniVerticalSeparator IsVisible="{Binding !ShowLoadProgress}" />
<controls:MiniVerticalSeparator>
<controls:MiniVerticalSeparator.IsVisible>
<MultiBinding Converter="{x:Static BoolConverters.And}">
<Binding Path="!ShowLoadProgress"/>
<Binding Path="!IsPaused"/>
</MultiBinding>
</controls:MiniVerticalSeparator.IsVisible>
</controls:MiniVerticalSeparator>
<TextBlock
Margin="5,0,5,0"
HorizontalAlignment="Left"

View File

@@ -109,7 +109,7 @@
SimpleNumberFormat="F0"
SpinButtonPlacementMode="Hidden"
Minimum="50"
Maximum="300" />
Maximum="1000" />
<Slider Value="{Binding TurboMultiplier}"
ToolTip.Tip="{ext:Locale SettingsTabSystemTurboMultiplierValueToolTip}"
MinWidth="175"
@@ -122,7 +122,7 @@
SmallChange="1"
VerticalAlignment="Center"
Minimum="50"
Maximum="500" />
Maximum="1000" />
<TextBlock Margin="5,0"
Width="40"
Text="{Binding TurboMultiplierPercentageText}"/>