Skip to content

Commit 70b767b

Browse files
ItsBrankItsBrank
committed
v1.2.8
- Added a "update in progress" status on the dashboard to indicate a update is being downloaded. - Fixed the injection delay setting not being parsed correctly. - Fixed some popups not being double buffered.
1 parent 425ba68 commit 70b767b

11 files changed

Lines changed: 59 additions & 59 deletions

File tree

‎Controls/CRDuplicate.Designer.cs‎

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Controls/CRLabel.Designer.cs‎

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Controls/CRPolicy.Designer.cs‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Controls/CRPolicy.resx‎

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -129,15 +129,6 @@
129129
<metadata name="AltBtn.Locked" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
130130
<value>True</value>
131131
</metadata>
132-
<metadata name="AcceptBtn.Locked" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
133-
<value>True</value>
134-
</metadata>
135-
<metadata name="DenyBtn.Locked" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
136-
<value>True</value>
137-
</metadata>
138-
<metadata name="AltBtn.Locked" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
139-
<value>True</value>
140-
</metadata>
141132
<metadata name="TitleLbl.Locked" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
142133
<value>True</value>
143134
</metadata>

‎Controls/CRStatus.cs‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ public enum StatusTypes : byte
2121
Process_Outdated,
2222
Version_Idle,
2323
Version_Checking,
24+
Version_Downloading,
2425
Version_Module,
2526
Version_Launcher,
2627
Version_Both,
@@ -278,6 +279,10 @@ private void FormatType()
278279
TitleLbl.Text = "Checking for Updates";
279280
DescriptionLbl.Text = "Waiting for response...";
280281
break;
282+
case StatusTypes.Version_Downloading:
283+
TitleLbl.Text = "Update in Progress";
284+
DescriptionLbl.Text = "Downloading and installing...";
285+
break;
281286
case StatusTypes.Version_Module:
282287
TitleLbl.Text = "Module Out of Date";
283288
DescriptionLbl.Text = "Your module version is out of date!";

‎Forms/MainFrm.Designer.cs‎

Lines changed: 21 additions & 21 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Forms/MainFrm.cs‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1191,13 +1191,11 @@ private async void InstallCodeRed(bool bManuallyChoose)
11911191
}
11921192
else if (moduleReport.FailReason != null)
11931193
{
1194-
Logger.Write(moduleReport.FailReason, LogLevel.LEVEL_ERROR);
11951194
MessageBox.Show(moduleReport.FailReason, Assembly.GetTitle());
11961195
}
11971196
}
11981197
else if (pathReport.FailReason != null)
11991198
{
1200-
Logger.Write(pathReport.FailReason, LogLevel.LEVEL_ERROR);
12011199
MessageBox.Show(pathReport.FailReason, Assembly.GetTitle());
12021200
}
12031201

@@ -1253,6 +1251,7 @@ private async void UpdatePopup_ButtonClickAccept(object sender, EventArgs e)
12531251
this.TopMost = false;
12541252
UpdatePopup.ButtonsEnabled = false;
12551253
UpdatePopup.UpdateType = CRUpdate.UpdateLayouts.Downloading;
1254+
UpdateStatusCtrl.DisplayType = StatusTypes.Version_Downloading;
12561255

12571256
Retrievers.Invalidate();
12581257
await Retrievers.CheckInitialized();

‎Forms/MainFrm.resx‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -165,9 +165,6 @@
165165
<metadata name="CreditsLbl.Locked" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
166166
<value>True</value>
167167
</metadata>
168-
<data name="CreditsLbl.Text" xml:space="preserve">
169-
<value>CodeRed is developed by @ItsBranK, but its creation would not have been possible without the inspiration of the following people: Bakkes, Martinn, TaylorSasser, ButternCream, GlenHumphrey, BeardedOranges, and Megasplat/Aberinkula/FrancesElMute.</value>
170-
</data>
171168
<metadata name="UpdateStatusCtrl.Locked" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
172169
<value>True</value>
173170
</metadata>

‎Framework/Assembly.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,10 @@ public static class Assembly
77
private static readonly string _title = "CodeRed Launcher";
88
private static readonly string _description = "Manages the CodeRed Module for Rocket League.";
99
private static readonly string _company = "CodeRedModding";
10-
private static readonly string _product = "CodeRed Launcher";
10+
private static readonly string _product = "CodeRedLauncher";
1111
private static readonly string _copyright = "CodeRedModding 2023";
1212
private static readonly string _license = "MIT License";
13-
private static readonly string _version = "1.2.7";
13+
private static readonly string _version = "1.2.8";
1414
private static readonly bool _termsOfUse = false;
1515
private static readonly bool _privatePolicy = false;
1616

‎Framework/Configuration.cs‎

Lines changed: 26 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
using System;
22
using System.IO;
3+
using System.Linq;
34
using System.Windows.Forms;
45

56
namespace CodeRedLauncher
@@ -17,31 +18,31 @@ public static class Configuration
1718
private static Architecture.Path _storageFile = new Architecture.Path();
1819

1920
public static PublicSetting PrivacyPolicy = new PublicSetting(
20-
"False",
21-
"PrivacyPolicy",
22-
"Agree to the private policy.",
23-
"If the user has argeed to use the private policy or not."
21+
"False",
22+
"PrivacyPolicy",
23+
"Agree to the private policy.",
24+
"If the user has argeed to use the private policy or not."
2425
);
2526

2627
public static PublicSetting TermsOfUse = new PublicSetting(
27-
"False",
28-
"TermsOfUse",
29-
"Agree to the terms of use.",
30-
"If the user has argeed to use the terms of use or not."
28+
"False",
29+
"TermsOfUse",
30+
"Agree to the terms of use.",
31+
"If the user has argeed to use the terms of use or not."
3132
);
3233

3334
public static PublicSetting PrivacyHash = new PublicSetting(
34-
"0",
35-
"PrivacyHash",
36-
"The current privacy policy hash.",
37-
"The last known hash of the privacy policy the user agreed to"
35+
"0",
36+
"PrivacyHash",
37+
"The current privacy policy hash.",
38+
"The last known hash of the privacy policy the user agreed to"
3839
);
3940

4041
public static PublicSetting TermsHash = new PublicSetting(
41-
"0",
42-
"TermsHash",
43-
"The current terms of use hash.",
44-
"The last known hash of the terms of use the user agreed to"
42+
"0",
43+
"TermsHash",
44+
"The current terms of use hash.",
45+
"The last known hash of the terms of use the user agreed to"
4546
);
4647

4748
public static PublicSetting OfflineMode = new PublicSetting(
@@ -131,7 +132,7 @@ public static class Configuration
131132
SaveChanges
132133
);
133134

134-
public static Architecture.Range32 InjectionTimeoutRange = new Architecture.Range32(5000, 300000); // Five seconds to five minutes.
135+
public static Architecture.Range32 InjectionTimeoutRange = new Architecture.Range32(2500, 300000); // 2.5 seconds to 5 minutes.
135136

136137
private static bool ParseConfigFile()
137138
{
@@ -156,9 +157,14 @@ private static bool ParseConfigFile()
156157
if (line.Contains(MinimizeOnStartup.Name)) { MinimizeOnStartup.SetValue(line.Contains("True") ? "True" : "False"); continue; }
157158
if (line.Contains(HideWhenMinimized.Name)) { HideWhenMinimized.SetValue(line.Contains("True") ? "True" : "False"); continue; }
158159
if (line.Contains(InjectAllInstances.Name)) { InjectAllInstances.SetValue(line.Contains("True") ? "True" : "False"); continue; }
159-
if (line.Contains("Timeout")) { InjectionType.SetValue(InjectionTypes.Timeout.ToString()); continue; }
160-
if (line.Contains("Manual")) { InjectionType.SetValue(InjectionTypes.Manual.ToString()); continue; }
161-
if (line.Contains(InjectionTimeout.Name)) { InjectionTimeout.SetValue(line.Substring(17, line.Length - 17)); continue; }
160+
161+
if (line.Contains(InjectionType.Name))
162+
{
163+
if (line.Contains("Timeout")) { InjectionType.SetValue(InjectionTypes.Timeout.ToString()); continue; }
164+
if (line.Contains("Manual")) { InjectionType.SetValue(InjectionTypes.Manual.ToString()); continue; }
165+
}
166+
167+
if (line.Contains(InjectionTimeout.Name)) { InjectionTimeout.SetValue(line.Substring((InjectionTimeout.Name.Length + 1), (line.Length - (InjectionTimeout.Name.Length + 1)))); continue; }
162168
if (line.Contains(LightMode.Name)) { LightMode.SetValue(line.Contains("True") ? "True" : "False"); continue; }
163169
}
164170
catch (Exception ex)

0 commit comments

Comments
 (0)