stuff idk anymore

This commit is contained in:
Bitl 2020-05-13 12:42:40 -07:00
parent a4305aaad4
commit 6e7d792f2e
6 changed files with 2825 additions and 101 deletions

View File

@ -146,6 +146,7 @@ namespace NovetusLauncher
this.checkBox3 = new System.Windows.Forms.CheckBox();
this.checkBox1 = new System.Windows.Forms.CheckBox();
this.button9 = new System.Windows.Forms.Button();
this.SettingsButton = new System.Windows.Forms.Button();
this.button26 = new System.Windows.Forms.Button();
this.button5 = new System.Windows.Forms.Button();
this.richTextBox3 = new System.Windows.Forms.RichTextBox();
@ -1557,6 +1558,7 @@ namespace NovetusLauncher
this.panel3 = new System.Windows.Forms.Panel();
this.panel4 = new System.Windows.Forms.Panel();
this.button35 = new System.Windows.Forms.Button();
this.SettingsButton = new System.Windows.Forms.Button();
((System.ComponentModel.ISupportInitialize)(this.pictureBox2)).BeginInit();
this.panel1.SuspendLayout();
this.panel2.SuspendLayout();
@ -2239,6 +2241,7 @@ namespace NovetusLauncher
this.tabPage5.Controls.Add(this.checkBox1);
this.tabPage5.Controls.Add(this.button5);
this.tabPage5.Controls.Add(this.richTextBox3);
this.tabPage5.Controls.Add(this.SettingsButton);
this.tabPage5.Location = new System.Drawing.Point(4, 22);
this.tabPage5.Name = "tabPage5";
this.tabPage5.Size = new System.Drawing.Size(405, 258);
@ -2302,6 +2305,7 @@ namespace NovetusLauncher
this.label8.TabIndex = 48;
this.label8.Text = "0.13333337";
this.label8.TextAlign = System.Drawing.ContentAlignment.TopCenter;
this.label8.Click += new System.EventHandler(this.label8_Click);
//
// label9
//
@ -2320,7 +2324,7 @@ namespace NovetusLauncher
this.button9.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.button9.Location = new System.Drawing.Point(91, 4);
this.button9.Name = "button9";
this.button9.Size = new System.Drawing.Size(69, 46);
this.button9.Size = new System.Drawing.Size(69, 23);
this.button9.TabIndex = 37;
this.button9.Text = "Reset CFG";
this.button9.UseVisualStyleBackColor = true;
@ -2354,11 +2358,20 @@ namespace NovetusLauncher
this.button5.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.button5.Location = new System.Drawing.Point(14, 4);
this.button5.Name = "button5";
this.button5.Size = new System.Drawing.Size(69, 46);
this.button5.Size = new System.Drawing.Size(69, 23);
this.button5.TabIndex = 10;
this.button5.Text = "Save CFG";
this.button5.UseVisualStyleBackColor = true;
this.button5.Click += new System.EventHandler(this.Button5Click);
this.SettingsButton.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.SettingsButton.Location = new System.Drawing.Point(14, 28);
this.SettingsButton.Name = "button5";
this.SettingsButton.Size = new System.Drawing.Size(146, 23);
this.SettingsButton.TabIndex = 10;
this.SettingsButton.Text = "Settings";
this.SettingsButton.UseVisualStyleBackColor = true;
this.SettingsButton.Click += new System.EventHandler(this.SettingsButtonClick);
//
// button25
//
@ -2460,7 +2473,7 @@ namespace NovetusLauncher
this.button3.TabIndex = 6;
this.button3.Text = "Studio";
this.button3.UseVisualStyleBackColor = true;
this.button3.Click += new System.EventHandler(this.Button3Click);
this.button3.Click += new System.EventHandler(this.Button3Click_legacy);
//
// label25
//
@ -2625,6 +2638,7 @@ namespace NovetusLauncher
private System.Windows.Forms.ListBox listBox4;
private System.Windows.Forms.TabPage tabPage6;
private System.Windows.Forms.Button button9;
private System.Windows.Forms.Button SettingsButton;
private System.Windows.Forms.TextBox textBox6;
private System.Windows.Forms.Button button8;
private System.Windows.Forms.TextBox textBox5;

View File

@ -342,7 +342,7 @@ namespace NovetusLauncher
if (GlobalVars.CloseOnLaunch == true)
{
this.Visible = false;
Visible = false;
}
}
@ -353,7 +353,7 @@ namespace NovetusLauncher
if (GlobalVars.CloseOnLaunch == true)
{
this.Visible = false;
Visible = false;
}
}
@ -367,7 +367,7 @@ namespace NovetusLauncher
StartStudio(false);
if (GlobalVars.CloseOnLaunch == true)
{
this.Visible = false;
Visible = false;
}
}
@ -378,7 +378,7 @@ namespace NovetusLauncher
if (GlobalVars.CloseOnLaunch == true)
{
this.Visible = false;
Visible = false;
}
}
@ -389,7 +389,7 @@ namespace NovetusLauncher
if (GlobalVars.CloseOnLaunch == true)
{
this.Visible = false;
Visible = false;
}
}
@ -403,7 +403,7 @@ namespace NovetusLauncher
StartStudio(true);
if (GlobalVars.CloseOnLaunch == true)
{
this.Visible = false;
Visible = false;
}
}
@ -440,7 +440,7 @@ namespace NovetusLauncher
GlobalVars.Map = GlobalVars.DefaultMap;
GlobalVars.MapPath = GlobalVars.MapsDir + @"\\" + GlobalVars.DefaultMap;
GlobalVars.MapPathSnip = GlobalVars.MapsDirBase + @"\\" + GlobalVars.DefaultMap;
this.Text = "Novetus " + GlobalVars.Version;
Text = "Novetus " + GlobalVars.Version;
ConsolePrint("Novetus version " + GlobalVars.Version + " loaded. Initializing config.", 4);
ConsolePrint("Novetus path: " + GlobalVars.BasePath, 4);
if (File.Exists(GlobalVars.RootPath + "\\changelog.txt"))
@ -557,6 +557,8 @@ namespace NovetusLauncher
label38.Text = GlobalVars.RobloxPort.ToString();
checkBox4.Checked = GlobalVars.UPnP;
checkBox2.Checked = GlobalVars.DiscordPresence;
if (!GlobalVars.OldLayout)
{
checkBox5.Checked = GlobalVars.ReShade;
checkBox6.Checked = GlobalVars.ReShadeFPSDisplay;
checkBox7.Checked = GlobalVars.ReShadePerformanceMode;
@ -589,6 +591,7 @@ namespace NovetusLauncher
{
comboBox2.SelectedIndex = 4;
}
}
ConsolePrint("Config loaded.", 3);
ReadClientValues(GlobalVars.SelectedClient);
@ -994,7 +997,7 @@ namespace NovetusLauncher
LauncherFuncs.UpdateRichPresence(LauncherFuncs.LauncherState.InLauncher, "");
if (GlobalVars.CloseOnLaunch == true)
{
this.Visible = true;
Visible = true;
}
}
@ -1097,7 +1100,7 @@ namespace NovetusLauncher
{
if (GlobalVars.CloseOnLaunch == true)
{
this.Visible = true;
Visible = true;
}
}
@ -1151,7 +1154,7 @@ namespace NovetusLauncher
LauncherFuncs.UpdateRichPresence(LauncherFuncs.LauncherState.InLauncher, "");
if (GlobalVars.CloseOnLaunch == true)
{
this.Visible = true;
Visible = true;
}
}
@ -1738,7 +1741,7 @@ namespace NovetusLauncher
if (GlobalVars.CloseOnLaunch == true)
{
this.Visible = false;
Visible = false;
}
}
}
@ -1795,11 +1798,13 @@ namespace NovetusLauncher
label12.Text = LocalVars.prevsplash;
if (GlobalVars.CloseOnLaunch == true)
{
this.Visible = true;
Visible = true;
}
}
private void checkBox5_CheckedChanged(object sender, EventArgs e)
{
if (!GlobalVars.OldLayout)
{
if (checkBox5.Checked == true)
{
@ -1810,8 +1815,11 @@ namespace NovetusLauncher
GlobalVars.ReShade = false;
}
}
}
private void checkBox6_CheckedChanged(object sender, EventArgs e)
{
if (!GlobalVars.OldLayout)
{
if (checkBox6.Checked == true)
{
@ -1822,8 +1830,11 @@ namespace NovetusLauncher
GlobalVars.ReShadeFPSDisplay = false;
}
}
}
private void checkBox7_CheckedChanged(object sender, EventArgs e)
{
if (!GlobalVars.OldLayout)
{
if (checkBox7.Checked == true)
{
@ -1834,8 +1845,11 @@ namespace NovetusLauncher
GlobalVars.ReShadePerformanceMode = false;
}
}
}
private void comboBox1_SelectedIndexChanged(object sender, EventArgs e)
{
if (!GlobalVars.OldLayout)
{
if (comboBox1.SelectedIndex == 0)
{
@ -1846,8 +1860,11 @@ namespace NovetusLauncher
GlobalVars.GraphicsMode = 2;
}
}
}
private void comboBox2_SelectedIndexChanged(object sender, EventArgs e)
{
if (!GlobalVars.OldLayout)
{
if (comboBox2.SelectedIndex == 0)
{
@ -1871,4 +1888,38 @@ namespace NovetusLauncher
}
}
}
void SettingsButtonClick(object sender, EventArgs e)
{
if (GlobalVars.OldLayout)
{
NovetusSettings im = new NovetusSettings();
im.Show();
}
}
void Button3Click_legacy(object sender, EventArgs e)
{
if (GlobalVars.OldLayout)
{
DialogResult result = MessageBox.Show("If you want to test out your place, you will have to save your place in Novetus's map folder, then launch your place in Play Solo." + Environment.NewLine + Environment.NewLine + "Press Yes to launch Studio with a map, or No to launch Studio without a map.", "Novetus - Launch ROBLOX Studio", MessageBoxButtons.YesNoCancel, MessageBoxIcon.Information);
bool nomap = false;
if (result == DialogResult.Cancel)
{
return;
}
else if (result == DialogResult.No)
{
nomap = true;
}
WriteConfigValues();
StartStudio(nomap);
if (GlobalVars.CloseOnLaunch == true)
{
Visible = false;
}
}
}
}
}

View File

@ -128,6 +128,12 @@
<DependentUpon>CharacterCustomization.cs</DependentUpon>
</Compile>
<Compile Include="LocalVars.cs" />
<Compile Include="NovetusSettings.cs">
<SubType>Form</SubType>
</Compile>
<Compile Include="NovetusSettings.Designer.cs">
<DependentUpon>NovetusSettings.cs</DependentUpon>
</Compile>
<Compile Include="SDK\ClientinfoCreator.cs">
<SubType>Form</SubType>
</Compile>
@ -188,6 +194,9 @@
<EmbeddedResource Include="CharacterCustomization.resx">
<DependentUpon>CharacterCustomization.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="NovetusSettings.resx">
<DependentUpon>NovetusSettings.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="SDK\ClientinfoCreator.resx">
<DependentUpon>ClientinfoCreator.cs</DependentUpon>
</EmbeddedResource>

View File

@ -0,0 +1,171 @@
namespace NovetusLauncher
{
partial class NovetusSettings
{
/// <summary>
/// Required designer variable.
/// </summary>
private System.ComponentModel.IContainer components = null;
/// <summary>
/// Clean up any resources being used.
/// </summary>
/// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
protected override void Dispose(bool disposing)
{
if (disposing && (components != null))
{
components.Dispose();
}
base.Dispose(disposing);
}
#region Windows Form Designer generated code
/// <summary>
/// Required method for Designer support - do not modify
/// the contents of this method with the code editor.
/// </summary>
private void InitializeComponent()
{
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(NovetusSettings));
this.label3 = new System.Windows.Forms.Label();
this.comboBox2 = new System.Windows.Forms.ComboBox();
this.label31 = new System.Windows.Forms.Label();
this.comboBox1 = new System.Windows.Forms.ComboBox();
this.checkBox6 = new System.Windows.Forms.CheckBox();
this.checkBox7 = new System.Windows.Forms.CheckBox();
this.label22 = new System.Windows.Forms.Label();
this.checkBox5 = new System.Windows.Forms.CheckBox();
this.SuspendLayout();
//
// label3
//
this.label3.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.label3.ForeColor = System.Drawing.Color.Red;
this.label3.Location = new System.Drawing.Point(12, 60);
this.label3.Name = "label3";
this.label3.Size = new System.Drawing.Size(246, 82);
this.label3.TabIndex = 82;
this.label3.Text = "NOTE: Some video settings may require multiple client restarts or may require man" +
"ual application by opening the Tools>Settings dialog in Studio and then closing " +
"it.";
this.label3.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
//
// comboBox2
//
this.comboBox2.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
this.comboBox2.FormattingEnabled = true;
this.comboBox2.Items.AddRange(new object[] {
"Very Low",
"Low",
"Medium",
"High",
"Ultra"});
this.comboBox2.Location = new System.Drawing.Point(129, 38);
this.comboBox2.Name = "comboBox2";
this.comboBox2.Size = new System.Drawing.Size(84, 21);
this.comboBox2.TabIndex = 81;
this.comboBox2.SelectedIndexChanged += new System.EventHandler(this.comboBox2_SelectedIndexChanged);
//
// label31
//
this.label31.AutoSize = true;
this.label31.Location = new System.Drawing.Point(42, 15);
this.label31.Name = "label31";
this.label31.Size = new System.Drawing.Size(79, 13);
this.label31.TabIndex = 80;
this.label31.Text = "Graphics Mode";
//
// comboBox1
//
this.comboBox1.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
this.comboBox1.FormattingEnabled = true;
this.comboBox1.Items.AddRange(new object[] {
"OpenGL",
"DirectX"});
this.comboBox1.Location = new System.Drawing.Point(129, 12);
this.comboBox1.Name = "comboBox1";
this.comboBox1.Size = new System.Drawing.Size(84, 21);
this.comboBox1.TabIndex = 79;
this.comboBox1.SelectedIndexChanged += new System.EventHandler(this.comboBox1_SelectedIndexChanged);
//
// checkBox6
//
this.checkBox6.Location = new System.Drawing.Point(63, 179);
this.checkBox6.Name = "checkBox6";
this.checkBox6.Size = new System.Drawing.Size(131, 16);
this.checkBox6.TabIndex = 76;
this.checkBox6.Text = "ReShade FPS Display";
this.checkBox6.UseVisualStyleBackColor = true;
this.checkBox6.CheckedChanged += new System.EventHandler(this.checkBox6_CheckedChanged);
//
// checkBox7
//
this.checkBox7.AutoSize = true;
this.checkBox7.Location = new System.Drawing.Point(63, 162);
this.checkBox7.Name = "checkBox7";
this.checkBox7.Size = new System.Drawing.Size(164, 17);
this.checkBox7.TabIndex = 77;
this.checkBox7.Text = "ReShade Performance Mode";
this.checkBox7.UseVisualStyleBackColor = true;
this.checkBox7.CheckedChanged += new System.EventHandler(this.checkBox7_CheckedChanged);
//
// label22
//
this.label22.AutoSize = true;
this.label22.Location = new System.Drawing.Point(42, 41);
this.label22.Name = "label22";
this.label22.Size = new System.Drawing.Size(84, 13);
this.label22.TabIndex = 78;
this.label22.Text = "Graphics Quality";
//
// checkBox5
//
this.checkBox5.AutoSize = true;
this.checkBox5.Checked = true;
this.checkBox5.CheckState = System.Windows.Forms.CheckState.Checked;
this.checkBox5.Location = new System.Drawing.Point(63, 145);
this.checkBox5.Name = "checkBox5";
this.checkBox5.Size = new System.Drawing.Size(107, 17);
this.checkBox5.TabIndex = 75;
this.checkBox5.Text = "Toggle ReShade";
this.checkBox5.UseVisualStyleBackColor = true;
this.checkBox5.CheckedChanged += new System.EventHandler(this.checkBox5_CheckedChanged);
//
// NovetusSettings
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.BackColor = System.Drawing.SystemColors.ControlLightLight;
this.ClientSize = new System.Drawing.Size(270, 202);
this.Controls.Add(this.label3);
this.Controls.Add(this.comboBox2);
this.Controls.Add(this.label31);
this.Controls.Add(this.comboBox1);
this.Controls.Add(this.checkBox6);
this.Controls.Add(this.checkBox7);
this.Controls.Add(this.label22);
this.Controls.Add(this.checkBox5);
this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedSingle;
this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
this.Name = "NovetusSettings";
this.Text = "Novetus Settings";
this.Load += new System.EventHandler(this.NovetusSettings_Load);
this.ResumeLayout(false);
this.PerformLayout();
}
#endregion
private System.Windows.Forms.Label label3;
private System.Windows.Forms.ComboBox comboBox2;
private System.Windows.Forms.Label label31;
private System.Windows.Forms.ComboBox comboBox1;
private System.Windows.Forms.CheckBox checkBox6;
private System.Windows.Forms.CheckBox checkBox7;
private System.Windows.Forms.Label label22;
private System.Windows.Forms.CheckBox checkBox5;
}
}

View File

@ -0,0 +1,133 @@
using System;
using System.Collections.Generic;
using System.ComponentModel;
using System.Data;
using System.Drawing;
using System.Linq;
using System.Text;
using System.Windows.Forms;
namespace NovetusLauncher
{
public partial class NovetusSettings : Form
{
public NovetusSettings()
{
InitializeComponent();
}
void ReadConfigValues()
{
LauncherFuncs.Config(GlobalVars.ConfigDir + "\\" + GlobalVars.ConfigName, false);
checkBox5.Checked = GlobalVars.ReShade;
checkBox6.Checked = GlobalVars.ReShadeFPSDisplay;
checkBox7.Checked = GlobalVars.ReShadePerformanceMode;
if (GlobalVars.GraphicsMode == 1)
{
comboBox1.SelectedIndex = 0;
}
else if (GlobalVars.GraphicsMode == 2)
{
comboBox1.SelectedIndex = 1;
}
if (GlobalVars.QualityLevel == 1)
{
comboBox2.SelectedIndex = 0;
}
else if (GlobalVars.QualityLevel == 2)
{
comboBox2.SelectedIndex = 1;
}
else if (GlobalVars.QualityLevel == 3)
{
comboBox2.SelectedIndex = 2;
}
else if (GlobalVars.QualityLevel == 4)
{
comboBox2.SelectedIndex = 3;
}
else if (GlobalVars.QualityLevel == 5)
{
comboBox2.SelectedIndex = 4;
}
}
private void checkBox5_CheckedChanged(object sender, EventArgs e)
{
if (checkBox5.Checked == true)
{
GlobalVars.ReShade = true;
}
else if (checkBox5.Checked == false)
{
GlobalVars.ReShade = false;
}
}
private void checkBox6_CheckedChanged(object sender, EventArgs e)
{
if (checkBox6.Checked == true)
{
GlobalVars.ReShadeFPSDisplay = true;
}
else if (checkBox6.Checked == false)
{
GlobalVars.ReShadeFPSDisplay = false;
}
}
private void checkBox7_CheckedChanged(object sender, EventArgs e)
{
if (checkBox7.Checked == true)
{
GlobalVars.ReShadePerformanceMode = true;
}
else if (checkBox7.Checked == false)
{
GlobalVars.ReShadePerformanceMode = false;
}
}
private void comboBox1_SelectedIndexChanged(object sender, EventArgs e)
{
if (comboBox1.SelectedIndex == 0)
{
GlobalVars.GraphicsMode = 1;
}
else if (comboBox1.SelectedIndex == 1)
{
GlobalVars.GraphicsMode = 2;
}
}
private void comboBox2_SelectedIndexChanged(object sender, EventArgs e)
{
if (comboBox2.SelectedIndex == 0)
{
GlobalVars.QualityLevel = 1;
}
else if (comboBox2.SelectedIndex == 1)
{
GlobalVars.QualityLevel = 2;
}
else if (comboBox2.SelectedIndex == 2)
{
GlobalVars.QualityLevel = 3;
}
else if (comboBox2.SelectedIndex == 3)
{
GlobalVars.QualityLevel = 4;
}
else if (comboBox2.SelectedIndex == 4)
{
GlobalVars.QualityLevel = 5;
}
}
private void NovetusSettings_Load(object sender, EventArgs e)
{
ReadConfigValues();
}
}
}

File diff suppressed because it is too large Load Diff