more rc5 stuff

This commit is contained in:
Bitl 2019-10-04 12:54:16 -07:00
parent 6a23c0434c
commit 08464fcb00
4 changed files with 21 additions and 6 deletions

View File

@ -1032,7 +1032,6 @@ namespace NovetusLauncher
button4.BackColor = ConvertStringtoColor(GlobalVars.ColorMenu_LeftArmColor); button4.BackColor = ConvertStringtoColor(GlobalVars.ColorMenu_LeftArmColor);
button5.BackColor = ConvertStringtoColor(GlobalVars.ColorMenu_RightLegColor); button5.BackColor = ConvertStringtoColor(GlobalVars.ColorMenu_RightLegColor);
button6.BackColor = ConvertStringtoColor(GlobalVars.ColorMenu_LeftLegColor); button6.BackColor = ConvertStringtoColor(GlobalVars.ColorMenu_LeftLegColor);
MessageBox.Show("Colors Reset!");
} }
//3dview //3dview

View File

@ -68,7 +68,7 @@ namespace NovetusLauncher
// //
this.numericUpDown1.Location = new System.Drawing.Point(161, 27); this.numericUpDown1.Location = new System.Drawing.Point(161, 27);
this.numericUpDown1.Maximum = new decimal(new int[] { this.numericUpDown1.Maximum = new decimal(new int[] {
3, 99,
0, 0,
0, 0,
0}); 0});
@ -99,7 +99,9 @@ namespace NovetusLauncher
this.comboBox1.FormattingEnabled = true; this.comboBox1.FormattingEnabled = true;
this.comboBox1.Items.AddRange(new object[] { this.comboBox1.Items.AddRange(new object[] {
"http://www.roblox.com/", "http://www.roblox.com/",
"http://assetgame.roblox.com/"}); "http://assetgame.roblox.com/",
"https://www.roblox.com/catalog/",
"https://www.roblox.com/library/"});
this.comboBox1.Location = new System.Drawing.Point(3, 53); this.comboBox1.Location = new System.Drawing.Point(3, 53);
this.comboBox1.Name = "comboBox1"; this.comboBox1.Name = "comboBox1";
this.comboBox1.Size = new System.Drawing.Size(238, 21); this.comboBox1.Size = new System.Drawing.Size(238, 21);
@ -134,8 +136,8 @@ namespace NovetusLauncher
this.MaximizeBox = false; this.MaximizeBox = false;
this.Name = "ItemMaker"; this.Name = "ItemMaker";
this.Text = "Novetus Item SDK"; this.Text = "Novetus Item SDK";
this.Load += new System.EventHandler(this.ItemMakerLoad);
this.Closing += new System.ComponentModel.CancelEventHandler(this.ItemMakerClose); this.Closing += new System.ComponentModel.CancelEventHandler(this.ItemMakerClose);
this.Load += new System.EventHandler(this.ItemMakerLoad);
((System.ComponentModel.ISupportInitialize)(this.numericUpDown1)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.numericUpDown1)).EndInit();
this.ResumeLayout(false); this.ResumeLayout(false);
this.PerformLayout(); this.PerformLayout();

View File

@ -23,6 +23,7 @@ namespace NovetusLauncher
public partial class ItemMaker : Form public partial class ItemMaker : Form
{ {
private static string url = "http://www.roblox.com/asset?id="; private static string url = "http://www.roblox.com/asset?id=";
private static bool isWebSite = false;
public ItemMaker() public ItemMaker()
{ {
@ -40,7 +41,7 @@ namespace NovetusLauncher
{ {
try try
{ {
string version = (numericUpDown1.Value != 0) ? "&version=" + numericUpDown1.Value : ""; string version = ((numericUpDown1.Value != 0) && (isWebSite != true)) ? "&version=" + numericUpDown1.Value : "";
System.Diagnostics.Process.Start(url + textBox2.Text + version); System.Diagnostics.Process.Start(url + textBox2.Text + version);
@ -60,16 +61,29 @@ namespace NovetusLauncher
if (comboBox1.SelectedIndex == 0) if (comboBox1.SelectedIndex == 0)
{ {
url = "http://www.roblox.com/asset?id="; url = "http://www.roblox.com/asset?id=";
isWebSite = false;
} }
else if (comboBox1.SelectedIndex == 1) else if (comboBox1.SelectedIndex == 1)
{ {
url = "http://assetgame.roblox.com/asset/?id="; url = "http://assetgame.roblox.com/asset/?id=";
isWebSite = false;
}
else if (comboBox1.SelectedIndex == 2)
{
url = "https://www.roblox.com/catalog/";
isWebSite = true;
}
else if (comboBox1.SelectedIndex == 2)
{
url = "https://www.roblox.com/library/";
isWebSite = true;
} }
} }
void ItemMakerLoad(object sender, EventArgs e) void ItemMakerLoad(object sender, EventArgs e)
{ {
comboBox1.Text = "http://www.roblox.com/"; comboBox1.Text = "http://www.roblox.com/";
isWebSite = false;
if (GlobalVars.DisabledHelp == true) if (GlobalVars.DisabledHelp == true)
{ {

View File

@ -1459,7 +1459,7 @@ namespace NovetusLauncher
void CheckBox4Click(object sender, EventArgs e) void CheckBox4Click(object sender, EventArgs e)
{ {
MessageBox.Show("Please restart the Novetus launcher for the UPnP changes to take effect.","Novetus - UPnP", MessageBoxButtons.OK, MessageBoxIcon.Information); MessageBox.Show("Please restart the Novetus launcher for this option to take effect.","Novetus - UPnP", MessageBoxButtons.OK, MessageBoxIcon.Information);
} }
void Button24Click(object sender, EventArgs e) void Button24Click(object sender, EventArgs e)