diff --git a/Bloxstrap/Bloxstrap.ico b/Bloxstrap/Bloxstrap.ico index 56ab2c5f..a9a04b95 100644 Binary files a/Bloxstrap/Bloxstrap.ico and b/Bloxstrap/Bloxstrap.ico differ diff --git a/Bloxstrap/FastFlagManager.cs b/Bloxstrap/FastFlagManager.cs index 1ba55130..284df3de 100644 --- a/Bloxstrap/FastFlagManager.cs +++ b/Bloxstrap/FastFlagManager.cs @@ -16,15 +16,6 @@ public class FastFlagManager : JsonManager> { { "Network.Log", "FLogNetwork" }, -#if DEBUG - { "HTTP.Log", "DFLogHttpTraceLight" }, - - { "HTTP.Proxy.Enable", "DFFlagDebugEnableHttpProxy" }, - { "HTTP.Proxy.Address.1", "DFStringDebugPlayerHttpProxyUrl" }, - { "HTTP.Proxy.Address.2", "DFStringHttpCurlProxyHostAndPort" }, - { "HTTP.Proxy.Address.3", "DFStringHttpCurlProxyHostAndPortForExternalUrl" }, -#endif - { "Rendering.Framerate", "DFIntTaskSchedulerTargetFps" }, { "Rendering.ManualFullscreen", "FFlagHandleAltEnterFullscreenManually" }, { "Rendering.DisableScaling", "DFFlagDisableDPIScale" }, @@ -45,9 +36,6 @@ public class FastFlagManager : JsonManager> { "UI.Hide", "DFIntCanHideGuiGroupId" }, { "UI.FontSize", "FIntFontSizePadding" }, -#if DEBUG - { "UI.FlagState", "FStringDebugShowFlagState" }, -#endif { "UI.FullscreenTitlebarDelay", "FIntFullscreenTitleBarTriggerDelayMillis" }, @@ -60,7 +48,8 @@ public class FastFlagManager : JsonManager> { "UI.Menu.Style.ABTest.1", "FFlagEnableMenuControlsABTest" }, { "UI.Menu.Style.ABTest.2", "FFlagEnableV3MenuABTest3" }, - { "UI.Menu.Style.ABTest.3", "FFlagEnableInGameMenuChromeABTest3" } + { "UI.Menu.Style.ABTest.3", "FFlagEnableInGameMenuChromeABTest3" }, + { "UI.Menu.Style.ABTest.4", "FFlagEnableInGameMenuChromeABTest4" } }; public static IReadOnlyDictionary RenderingModes => new Dictionary diff --git a/Bloxstrap/Installer.cs b/Bloxstrap/Installer.cs index 0e9cd074..326a8cd1 100644 --- a/Bloxstrap/Installer.cs +++ b/Bloxstrap/Installer.cs @@ -563,6 +563,9 @@ public static void HandleUpgrade() App.FastFlags.SetPreset("UI.Menu.Style.V2Rollout", "100"); } + if (App.FastFlags.GetPreset("UI.Menu.Style.ABTest.1") is not null) + App.FastFlags.SetPreset("UI.Menu.Style.ABTest", "False"); + App.FastFlags.SetValue("FFlagDisableNewIGMinDUA", null); } diff --git a/Bloxstrap/Resources/IconBloxstrap.ico b/Bloxstrap/Resources/IconBloxstrap.ico index 56ab2c5f..a9a04b95 100644 Binary files a/Bloxstrap/Resources/IconBloxstrap.ico and b/Bloxstrap/Resources/IconBloxstrap.ico differ diff --git a/Bloxstrap/Resources/Strings.Designer.cs b/Bloxstrap/Resources/Strings.Designer.cs index ee9fe4df..888ca6e0 100644 --- a/Bloxstrap/Resources/Strings.Designer.cs +++ b/Bloxstrap/Resources/Strings.Designer.cs @@ -2541,7 +2541,7 @@ public static string Menu_FastFlags_Reset_Title { } /// - /// Looks up a localized string similar to Fast Flags. + /// Looks up a localized string similar to Engine settings. /// public static string Menu_FastFlags_Title { get { diff --git a/Bloxstrap/Resources/Strings.resx b/Bloxstrap/Resources/Strings.resx index f6a48243..fca85aee 100644 --- a/Bloxstrap/Resources/Strings.resx +++ b/Bloxstrap/Resources/Strings.resx @@ -646,7 +646,7 @@ Do NOT use this to import large "flag lists" made by other people that promise t Rendering mode - Fast Flags + Engine settings Font files diff --git a/Bloxstrap/UI/Elements/About/Pages/AboutPage.xaml b/Bloxstrap/UI/Elements/About/Pages/AboutPage.xaml index 92a6275d..f894da4a 100644 --- a/Bloxstrap/UI/Elements/About/Pages/AboutPage.xaml +++ b/Bloxstrap/UI/Elements/About/Pages/AboutPage.xaml @@ -143,6 +143,8 @@ + + diff --git a/Bloxstrap/UI/Elements/Settings/Pages/FastFlagsPage.xaml b/Bloxstrap/UI/Elements/Settings/Pages/FastFlagsPage.xaml index 20a1d986..e11a8b13 100644 --- a/Bloxstrap/UI/Elements/Settings/Pages/FastFlagsPage.xaml +++ b/Bloxstrap/UI/Elements/Settings/Pages/FastFlagsPage.xaml @@ -21,34 +21,6 @@ - - - - - - - - - - - - - - - - - - - - diff --git a/Bloxstrap/UI/ViewModels/Settings/FastFlagsViewModel.cs b/Bloxstrap/UI/ViewModels/Settings/FastFlagsViewModel.cs index 537520b5..bb3ea2dd 100644 --- a/Bloxstrap/UI/ViewModels/Settings/FastFlagsViewModel.cs +++ b/Bloxstrap/UI/ViewModels/Settings/FastFlagsViewModel.cs @@ -18,12 +18,6 @@ public class FastFlagsViewModel : NotifyPropertyChangedViewModel private void OpenFastFlagEditor() => OpenFlagEditorEvent?.Invoke(this, EventArgs.Empty); public ICommand OpenFastFlagEditorCommand => new RelayCommand(OpenFastFlagEditor); - -#if DEBUG - public Visibility ShowDebugFlags => Visibility.Visible; -#else - public Visibility ShowDebugFlags => Visibility.Collapsed; -#endif public bool UseFastFlagManager { @@ -31,29 +25,6 @@ public bool UseFastFlagManager set => App.Settings.Prop.UseFastFlagManager = value; } - public bool HttpRequestLogging - { - get => App.FastFlags.GetPreset("HTTP.Log") is not null; - set => App.FastFlags.SetPreset("HTTP.Log", value ? 12 : null); - } - - public string HttpRequestProxy - { - get => App.FastFlags.GetPreset("HTTP.Proxy.Address.1") ?? ""; - - set - { - App.FastFlags.SetPreset("HTTP.Proxy.Enable", String.IsNullOrEmpty(value) ? null : true); - App.FastFlags.SetPreset("HTTP.Proxy.Address", String.IsNullOrEmpty(value) ? null : value); - } - } - - public string StateOverlayFlags - { - get => App.FastFlags.GetPreset("UI.FlagState") ?? ""; - set => App.FastFlags.SetPreset("UI.FlagState", String.IsNullOrEmpty(value) ? null : value); - } - public int FramerateLimit { get => int.TryParse(App.FastFlags.GetPreset("Rendering.Framerate"), out int x) ? x : 0; diff --git a/Images/Bloxstrap-full-dark.png b/Images/Bloxstrap-full-dark.png new file mode 100644 index 00000000..71804960 Binary files /dev/null and b/Images/Bloxstrap-full-dark.png differ diff --git a/Images/Bloxstrap-full-light.png b/Images/Bloxstrap-full-light.png new file mode 100644 index 00000000..c2f7a30d Binary files /dev/null and b/Images/Bloxstrap-full-light.png differ diff --git a/Images/Bloxstrap.png b/Images/Bloxstrap.png index d95d7181..b77c144c 100644 Binary files a/Images/Bloxstrap.png and b/Images/Bloxstrap.png differ diff --git a/README.md b/README.md index 43a2e0c2..665f2b3c 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,13 @@ +> [!IMPORTANT] +> [6th October 2024 ‐ Upcoming changes to Bloxstrap](https://github.com/pizzaboxer/bloxstrap/wiki/6th-October-2024-%E2%80%90-Upcoming-changes-to-Bloxstrap) + > [!CAUTION] > The only official places to download Bloxstrap are this GitHub repository and [bloxstraplabs.com](https://bloxstraplabs.com). Any other websites offering downloads or claiming to be us are not controlled by us. -# Bloxstrap +

+ + +

[![License](https://img.shields.io/github/license/pizzaboxer/bloxstrap)](https://github.com/pizzaboxer/bloxstrap/blob/main/LICENSE) [![GitHub Workflow Status](https://img.shields.io/github/actions/workflow/status/pizzaboxer/bloxstrap/ci.yml?branch=main&label=builds)](https://github.com/pizzaboxer/bloxstrap/actions)