Merge branch 'pizzaboxer:main' into main

ThotArchive · Oct 6, 2024 · 668e686 · 668e686
2 parents e476200 + cb8f8a7
commit 668e686
Show file tree

Hide file tree

Showing 13 changed files with 16 additions and 73 deletions.
diff --git a/Bloxstrap/Bloxstrap.ico b/Bloxstrap/Bloxstrap.ico
diff --git a/Bloxstrap/FastFlagManager.cs b/Bloxstrap/FastFlagManager.cs
@@ -16,15 +16,6 @@ public class FastFlagManager : JsonManager<Dictionary<string, object>>
         {
             { "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<Dictionary<string, object>>
 
             { "UI.Hide", "DFIntCanHideGuiGroupId" },
             { "UI.FontSize", "FIntFontSizePadding" },
-#if DEBUG
-            { "UI.FlagState", "FStringDebugShowFlagState" },
-#endif
 
             { "UI.FullscreenTitlebarDelay", "FIntFullscreenTitleBarTriggerDelayMillis" },
 
@@ -60,7 +48,8 @@ public class FastFlagManager : JsonManager<Dictionary<string, object>>
 
             { "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<RenderingMode, string> RenderingModes => new Dictionary<RenderingMode, string>

diff --git 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
diff --git a/Bloxstrap/Resources/Strings.Designer.cs b/Bloxstrap/Resources/Strings.Designer.cs
diff --git 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
     <value>Rendering mode</value>
   </data>
   <data name="Menu.FastFlags.Title" xml:space="preserve">
-    <value>Fast Flags</value>
+    <value>Engine settings</value>
   </data>
   <data name="Menu.FontFiles" xml:space="preserve">
     <value>Font files</value>

diff --git a/Bloxstrap/UI/Elements/About/Pages/AboutPage.xaml b/Bloxstrap/UI/Elements/About/Pages/AboutPage.xaml
@@ -143,6 +143,8 @@
                     <controls:MarkdownTextBlock MarkdownText="[axstin](https://github.com/axstin)" />
                     <controls:MarkdownTextBlock MarkdownText="[Mantaraix](https://github.com/Mantaraix)" />
                     <controls:MarkdownTextBlock MarkdownText="[apprehensions](https://github.com/apprehensions)" />
+                    <controls:MarkdownTextBlock MarkdownText="[axellse](https://github.com/axellse)" />
+                    <controls:MarkdownTextBlock MarkdownText="[BlueOutside](https://github.com/BlueOutside)" />
                 </StackPanel>
             </controls:Expander>
         </Grid>

diff --git a/Bloxstrap/UI/Elements/Settings/Pages/FastFlagsPage.xaml b/Bloxstrap/UI/Elements/Settings/Pages/FastFlagsPage.xaml
@@ -21,34 +21,6 @@
                 <TextBlock Margin="0,2,0,0" FontSize="12" Text="{x:Static resources:Strings.Menu_FastFlags_Help_Description}" Padding="0,0,16,0"  Foreground="{DynamicResource TextFillColorTertiaryBrush}" />
             </StackPanel>
         </ui:CardAction>
-
-        <controls:OptionControl 
-            Header="{x:Static resources:Strings.Menu_FastFlags_ManagerEnabled_Title}"
-            Description="{x:Static resources:Strings.Menu_FastFlags_ManagerEnabled_Description}">
-            <ui:ToggleSwitch IsChecked="{Binding UseFastFlagManager, Mode=TwoWay}" />
-        </controls:OptionControl>
-
-        <StackPanel Visibility="{Binding ShowDebugFlags, Mode=OneTime}">
-            <TextBlock Text="Debug" FontSize="20" FontWeight="Medium" Margin="0,16,0,0" />
-
-            <controls:OptionControl 
-                Header="HTTP request logging" 
-                Description="Enables logging of HTTP requests (DFLogHttpTraceLight=12).">
-                <ui:ToggleSwitch IsChecked="{Binding HttpRequestLogging, Mode=TwoWay}" />
-            </controls:OptionControl>
-
-            <controls:OptionControl 
-                Header="HTTP proxy address" 
-                Description="Set blank if not using a proxy. Don't forget to add cacert.pem as a mod.">
-                <ui:TextBox Margin="5,0,0,0" Padding="10,5,10,5" Width="200" Text="{Binding HttpRequestProxy, Mode=TwoWay}" />
-            </controls:OptionControl>
-
-            <controls:OptionControl 
-                Header="Flag state overlay" 
-                Description="Show values of specified flags during runtime. Each flag is comma separated.">
-                <ui:TextBox Margin="5,0,0,0" Padding="10,5,10,5" Width="200" Text="{Binding StateOverlayFlags, Mode=TwoWay}" />
-            </controls:OptionControl>
-        </StackPanel>
 
         <TextBlock Text="{x:Static resources:Strings.Common_Presets}" FontSize="20" FontWeight="Medium" Margin="0,16,0,0" />
 

diff --git a/Bloxstrap/UI/ViewModels/Settings/FastFlagsViewModel.cs b/Bloxstrap/UI/ViewModels/Settings/FastFlagsViewModel.cs
@@ -18,42 +18,13 @@ 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
         {
             get => App.Settings.Prop.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
diff --git a/Images/Bloxstrap-full-light.png b/Images/Bloxstrap-full-light.png
diff --git a/Images/Bloxstrap.png b/Images/Bloxstrap.png
diff --git 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.
 
-# <img src="https://github.com/pizzaboxer/bloxstrap/raw/main/Images/Bloxstrap.png" width="48"/> Bloxstrap
+<p align="center">
+<img src="https://github.com/pizzaboxer/bloxstrap/raw/main/Images/Bloxstrap-full-dark.png#gh-dark-mode-only" width="500">
+<img src="https://github.com/pizzaboxer/bloxstrap/raw/main/Images/Bloxstrap-full-light.png#gh-light-mode-only" width="500">
+</p>
 
 [![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)