diff --git a/NovetusLauncher/NovetusLauncher/CharacterCustomization.cs b/NovetusLauncher/NovetusLauncher/CharacterCustomization.cs index e3faa23..7c7d30d 100644 --- a/NovetusLauncher/NovetusLauncher/CharacterCustomization.cs +++ b/NovetusLauncher/NovetusLauncher/CharacterCustomization.cs @@ -1032,7 +1032,6 @@ namespace NovetusLauncher button4.BackColor = ConvertStringtoColor(GlobalVars.ColorMenu_LeftArmColor); button5.BackColor = ConvertStringtoColor(GlobalVars.ColorMenu_RightLegColor); button6.BackColor = ConvertStringtoColor(GlobalVars.ColorMenu_LeftLegColor); - MessageBox.Show("Colors Reset!"); } //3dview diff --git a/NovetusLauncher/NovetusLauncher/ItemMaker.Designer.cs b/NovetusLauncher/NovetusLauncher/ItemMaker.Designer.cs index 107ebc6..53a6390 100644 --- a/NovetusLauncher/NovetusLauncher/ItemMaker.Designer.cs +++ b/NovetusLauncher/NovetusLauncher/ItemMaker.Designer.cs @@ -68,7 +68,7 @@ namespace NovetusLauncher // this.numericUpDown1.Location = new System.Drawing.Point(161, 27); this.numericUpDown1.Maximum = new decimal(new int[] { - 3, + 99, 0, 0, 0}); @@ -99,7 +99,9 @@ namespace NovetusLauncher this.comboBox1.FormattingEnabled = true; this.comboBox1.Items.AddRange(new object[] { "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.Name = "comboBox1"; this.comboBox1.Size = new System.Drawing.Size(238, 21); @@ -134,8 +136,8 @@ namespace NovetusLauncher this.MaximizeBox = false; this.Name = "ItemMaker"; this.Text = "Novetus Item SDK"; - this.Load += new System.EventHandler(this.ItemMakerLoad); this.Closing += new System.ComponentModel.CancelEventHandler(this.ItemMakerClose); + this.Load += new System.EventHandler(this.ItemMakerLoad); ((System.ComponentModel.ISupportInitialize)(this.numericUpDown1)).EndInit(); this.ResumeLayout(false); this.PerformLayout(); diff --git a/NovetusLauncher/NovetusLauncher/ItemMaker.cs b/NovetusLauncher/NovetusLauncher/ItemMaker.cs index 54021fd..ec3d33d 100644 --- a/NovetusLauncher/NovetusLauncher/ItemMaker.cs +++ b/NovetusLauncher/NovetusLauncher/ItemMaker.cs @@ -23,6 +23,7 @@ namespace NovetusLauncher public partial class ItemMaker : Form { private static string url = "http://www.roblox.com/asset?id="; + private static bool isWebSite = false; public ItemMaker() { @@ -40,7 +41,7 @@ namespace NovetusLauncher { 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); @@ -60,16 +61,29 @@ namespace NovetusLauncher if (comboBox1.SelectedIndex == 0) { url = "http://www.roblox.com/asset?id="; + isWebSite = false; } else if (comboBox1.SelectedIndex == 1) { 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) { comboBox1.Text = "http://www.roblox.com/"; + isWebSite = false; if (GlobalVars.DisabledHelp == true) { diff --git a/NovetusLauncher/NovetusLauncher/MainForm.cs b/NovetusLauncher/NovetusLauncher/MainForm.cs index d947463..bd0a795 100644 --- a/NovetusLauncher/NovetusLauncher/MainForm.cs +++ b/NovetusLauncher/NovetusLauncher/MainForm.cs @@ -1459,7 +1459,7 @@ namespace NovetusLauncher 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)