Skip to content

Commit

Permalink
Finalize v1.4.0 update
Browse files Browse the repository at this point in the history
Fix LIVE being treated as a channel, alter tooltip and update README
  • Loading branch information
pizzaboxer committed Aug 26, 2022
1 parent 246ae94 commit ff2bd47
Show file tree
Hide file tree
Showing 4 changed files with 31 additions and 16 deletions.
4 changes: 2 additions & 2 deletions Bloxstrap/Dialogs/Preferences.Designer.cs

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

14 changes: 11 additions & 3 deletions Bloxstrap/Dialogs/Preferences.resx
Original file line number Diff line number Diff line change
Expand Up @@ -60,10 +60,18 @@
<metadata name="InfoTooltip.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>222, 17</value>
</metadata>
<data name="SelectChannel.ToolTip" xml:space="preserve">
<value>Choose what build channel to install Roblox from.
You really shouldn't change this if you don't have to.

Channels to note:
The default channel is LIVE.
ZCanary is equivalent to sitetest1.
ZIntegration is equivalent to sitetest2.

</value>
</data>
<metadata name="InstallLocationBrowseDialog.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>17, 17</value>
</metadata>
<metadata name="InfoTooltip.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>222, 17</value>
</metadata>
</root>
26 changes: 16 additions & 10 deletions Bloxstrap/Helpers/Protocol.cs
Original file line number Diff line number Diff line change
Expand Up @@ -41,17 +41,23 @@ public static string ParseUri(string protocol)
if (key == "placelauncherurl")
val = HttpUtility.UrlDecode(val).Replace("browserTrackerId", "lol");

if (key == "channel" && val != Program.Settings.Channel)
if (key == "channel")
{
DialogResult result = Program.ShowMessageBox(
$"{Program.ProjectName} was launched with the Roblox build channel set to {val}, however your current preferred channel is {Program.Settings.Channel}.\n\n" +
$"Would you like to switch channels from {Program.Settings.Channel} to {val}?",
MessageBoxIcon.Question,
MessageBoxButtons.YesNo
);

if (result == DialogResult.Yes)
Program.Settings.Channel = val;
if (val != Program.Settings.Channel)
{
DialogResult result = Program.ShowMessageBox(
$"{Program.ProjectName} was launched with the Roblox build channel set to {val}, however your current preferred channel is {Program.Settings.Channel}.\n\n" +
$"Would you like to switch channels from {Program.Settings.Channel} to {val}?",
MessageBoxIcon.Question,
MessageBoxButtons.YesNo
);

if (result == DialogResult.Yes)
Program.Settings.Channel = val;
}

if (val == DeployManager.DefaultChannel)
continue;
}

commandLine.Append(UriKeyArgMap[key] + val + " ");
Expand Down
3 changes: 2 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,8 @@ Bloxstrap is only supported for PCs running Windows.
Here's some of the features that Bloxstrap provides over the stock Roblox bootstrapper:

* Support for persistent file modifications (including re-adding the old death sound!)
* Ability to choose where Roblox is installed to
* Ability to choose where Roblox is installed to
* Ability to choose which Roblox build channel to download from
* Integration with Discord Rich Presence and [rbxfpsunlocker](https://github.com/axstin/rbxfpsunlocker)
* Custom bootstrapper styles (includes old versions and dark theme)

Expand Down

0 comments on commit ff2bd47

Please sign in to comment.