SPAWNRYS/bloxstrap
1
0
Fork 0
mirror of https://github.com/bloxstraplabs/bloxstrap.git synced 2025-04-21 10:01:27 -07:00
Code Issues Actions Packages Projects Releases Wiki Activity

Temporarily disable escape menu version preset

Browse Source 
Will be readded a later time when it is convenient to do so
This commit is contained in:
pizzaboxer 2024-10-24 23:49:23 +01:00
parent 7e51852c0b
commit 21396fb39e
No known key found for this signature in database
GPG Key ID: 59D4A1DBAD0F2BA8
3 changed files with 84 additions and 69 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

134
Bloxstrap/FastFlagManager.cs
View File

@ -39,17 +39,17 @@ namespace Bloxstrap
{ "UI.FullscreenTitlebarDelay", "FIntFullscreenTitleBarTriggerDelayMillis" }, { "UI.FullscreenTitlebarDelay", "FIntFullscreenTitleBarTriggerDelayMillis" },
{ "UI.Menu.Style.V2Rollout", "FIntNewInGameMenuPercentRollout3" }, //{ "UI.Menu.Style.V2Rollout", "FIntNewInGameMenuPercentRollout3" },
{ "UI.Menu.Style.EnableV4.1", "FFlagEnableInGameMenuControls" }, //{ "UI.Menu.Style.EnableV4.1", "FFlagEnableInGameMenuControls" },
{ "UI.Menu.Style.EnableV4.2", "FFlagEnableInGameMenuModernization" }, //{ "UI.Menu.Style.EnableV4.2", "FFlagEnableInGameMenuModernization" },
{ "UI.Menu.Style.EnableV4Chrome", "FFlagEnableInGameMenuChrome" }, //{ "UI.Menu.Style.EnableV4Chrome", "FFlagEnableInGameMenuChrome" },
{ "UI.Menu.Style.ReportButtonCutOff", "FFlagFixReportButtonCutOff" }, //{ "UI.Menu.Style.ReportButtonCutOff", "FFlagFixReportButtonCutOff" },
{ "UI.Menu.Style.ABTest.1", "FFlagEnableMenuControlsABTest" }, //{ "UI.Menu.Style.ABTest.1", "FFlagEnableMenuControlsABTest" },
{ "UI.Menu.Style.ABTest.2", "FFlagEnableV3MenuABTest3" }, //{ "UI.Menu.Style.ABTest.2", "FFlagEnableV3MenuABTest3" },
{ "UI.Menu.Style.ABTest.3", "FFlagEnableInGameMenuChromeABTest3" }, //{ "UI.Menu.Style.ABTest.3", "FFlagEnableInGameMenuChromeABTest3" },
{ "UI.Menu.Style.ABTest.4", "FFlagEnableInGameMenuChromeABTest4" } //{ "UI.Menu.Style.ABTest.4", "FFlagEnableInGameMenuChromeABTest4" }
}; };
public static IReadOnlyDictionary<RenderingMode, string> RenderingModes => new Dictionary<RenderingMode, string> public static IReadOnlyDictionary<RenderingMode, string> RenderingModes => new Dictionary<RenderingMode, string>
@ -86,68 +86,68 @@ namespace Bloxstrap
// this is one hell of a dictionary definition lmao // this is one hell of a dictionary definition lmao
// since these all set the same flags, wouldn't making this use bitwise operators be better? // since these all set the same flags, wouldn't making this use bitwise operators be better?
public static IReadOnlyDictionary<InGameMenuVersion, Dictionary<string, string?>> IGMenuVersions => new Dictionary<InGameMenuVersion, Dictionary<string, string?>> //public static IReadOnlyDictionary<InGameMenuVersion, Dictionary<string, string?>> IGMenuVersions => new Dictionary<InGameMenuVersion, Dictionary<string, string?>>
{ //{
{ // {
InGameMenuVersion.Default, // InGameMenuVersion.Default,
new Dictionary<string, string?> // new Dictionary<string, string?>
{ // {
{ "V2Rollout", null }, // { "V2Rollout", null },
{ "EnableV4", null }, // { "EnableV4", null },
{ "EnableV4Chrome", null }, // { "EnableV4Chrome", null },
{ "ABTest", null }, // { "ABTest", null },
{ "ReportButtonCutOff", null } // { "ReportButtonCutOff", null }
} // }
}, // },
{ // {
InGameMenuVersion.V1, // InGameMenuVersion.V1,
new Dictionary<string, string?> // new Dictionary<string, string?>
{ // {
{ "V2Rollout", "0" }, // { "V2Rollout", "0" },
{ "EnableV4", "False" }, // { "EnableV4", "False" },
{ "EnableV4Chrome", "False" }, // { "EnableV4Chrome", "False" },
{ "ABTest", "False" }, // { "ABTest", "False" },
{ "ReportButtonCutOff", "False" } // { "ReportButtonCutOff", "False" }
} // }
}, // },
{ // {
InGameMenuVersion.V2, // InGameMenuVersion.V2,
new Dictionary<string, string?> // new Dictionary<string, string?>
{ // {
{ "V2Rollout", "100" }, // { "V2Rollout", "100" },
{ "EnableV4", "False" }, // { "EnableV4", "False" },
{ "EnableV4Chrome", "False" }, // { "EnableV4Chrome", "False" },
{ "ABTest", "False" }, // { "ABTest", "False" },
{ "ReportButtonCutOff", null } // { "ReportButtonCutOff", null }
} // }
}, // },
{ // {
InGameMenuVersion.V4, // InGameMenuVersion.V4,
new Dictionary<string, string?> // new Dictionary<string, string?>
{ // {
{ "V2Rollout", "0" }, // { "V2Rollout", "0" },
{ "EnableV4", "True" }, // { "EnableV4", "True" },
{ "EnableV4Chrome", "False" }, // { "EnableV4Chrome", "False" },
{ "ABTest", "False" }, // { "ABTest", "False" },
{ "ReportButtonCutOff", null } // { "ReportButtonCutOff", null }
} // }
}, // },
{ // {
InGameMenuVersion.V4Chrome, // InGameMenuVersion.V4Chrome,
new Dictionary<string, string?> // new Dictionary<string, string?>
{ // {
{ "V2Rollout", "0" }, // { "V2Rollout", "0" },
{ "EnableV4", "True" }, // { "EnableV4", "True" },
{ "EnableV4Chrome", "True" }, // { "EnableV4Chrome", "True" },
{ "ABTest", "False" }, // { "ABTest", "False" },
{ "ReportButtonCutOff", null } // { "ReportButtonCutOff", null }
} // }
} // }
}; //};
// all fflags are stored as strings // all fflags are stored as strings
// to delete a flag, set the value as null // to delete a flag, set the value as null

15
Bloxstrap/Installer.cs
View File

@ -590,6 +590,21 @@ namespace Bloxstrap
} }
} }
if (Utilities.CompareVersions(existingVer, "2.8.1") == VersionComparison.LessThan)
{
// wipe all escape menu flag presets
App.FastFlags.SetValue("FIntNewInGameMenuPercentRollout3", null);
App.FastFlags.SetValue("FFlagEnableInGameMenuControls", null);
App.FastFlags.SetValue("FFlagEnableInGameMenuModernization", null);
App.FastFlags.SetValue("FFlagEnableInGameMenuChrome", null);
App.FastFlags.SetValue("FFlagFixReportButtonCutOff", null);
App.FastFlags.SetValue("FFlagEnableMenuControlsABTest", null);
App.FastFlags.SetValue("FFlagEnableV3MenuABTest3", null);
App.FastFlags.SetValue("FFlagEnableInGameMenuChromeABTest3", null);
App.FastFlags.SetValue("FFlagEnableInGameMenuChromeABTest4", null);
}
App.Settings.Save(); App.Settings.Save();
App.FastFlags.Save(); App.FastFlags.Save();
} }

4
Bloxstrap/UI/Elements/Settings/Pages/FastFlagsPage.xaml
View File

@ -131,7 +131,7 @@
<ui:TextBox Width="200" Padding="10,5,10,5" Text="{Binding FontSize, Mode=TwoWay}" PreviewTextInput="ValidateInt32" /> <ui:TextBox Width="200" Padding="10,5,10,5" Text="{Binding FontSize, Mode=TwoWay}" PreviewTextInput="ValidateInt32" />
</controls:OptionControl> </controls:OptionControl>
<controls:OptionControl <!--<controls:OptionControl
Header="{x:Static resources:Strings.Menu_FastFlags_Presets_EscapeMenuVersion_Title}" Header="{x:Static resources:Strings.Menu_FastFlags_Presets_EscapeMenuVersion_Title}"
HelpLink="https://github.com/bloxstraplabs/bloxstrap/wiki/A-guide-to-FastFlags#escape-menu-version"> HelpLink="https://github.com/bloxstraplabs/bloxstrap/wiki/A-guide-to-FastFlags#escape-menu-version">
<ComboBox Margin="5,0,0,0" Padding="10,5,10,5" Width="200" ItemsSource="{Binding IGMenuVersions.Keys, Mode=OneTime}" Text="{Binding SelectedIGMenuVersion, Mode=TwoWay}"> <ComboBox Margin="5,0,0,0" Padding="10,5,10,5" Width="200" ItemsSource="{Binding IGMenuVersions.Keys, Mode=OneTime}" Text="{Binding SelectedIGMenuVersion, Mode=TwoWay}">
@ -141,7 +141,7 @@
</DataTemplate> </DataTemplate>
</ComboBox.ItemTemplate> </ComboBox.ItemTemplate>
</ComboBox> </ComboBox>
</controls:OptionControl> </controls:OptionControl>-->
<controls:OptionControl <controls:OptionControl
Margin="0,24,0,0" Margin="0,24,0,0"