diff --git a/NovetusLauncher/NovetusCMD/NovetusCMD.csproj b/NovetusLauncher/NovetusCMD/NovetusCMD.csproj index 2a23e5c..979af4a 100644 --- a/NovetusLauncher/NovetusCMD/NovetusCMD.csproj +++ b/NovetusLauncher/NovetusCMD/NovetusCMD.csproj @@ -74,6 +74,9 @@ ..\packages\DotNetZip.1.11.0\lib\net20\DotNetZip.dll True + + ..\packages\LiteNetLib.0.9.2.2\lib\net35\LiteNetLib.dll + 4.0 diff --git a/NovetusLauncher/NovetusCMD/packages.config b/NovetusLauncher/NovetusCMD/packages.config index aabae54..d55d390 100644 --- a/NovetusLauncher/NovetusCMD/packages.config +++ b/NovetusLauncher/NovetusCMD/packages.config @@ -1,6 +1,7 @@  + diff --git a/NovetusLauncher/NovetusFuncs/CodeExtensions.cs b/NovetusLauncher/NovetusFuncs/CodeExtensions.cs index b7a0d1d..c5410a4 100644 --- a/NovetusLauncher/NovetusFuncs/CodeExtensions.cs +++ b/NovetusLauncher/NovetusFuncs/CodeExtensions.cs @@ -144,6 +144,15 @@ public partial class TabControlWithoutHeader : TabControl int layoutval = 1; public TabControlWithoutHeader(int layout) + { + SetLayout(layout); + } + public TabControlWithoutHeader() + { + SetLayout(1); + } + + private void SetLayout(int layout) { layoutval = layout; if (layoutval == 1) diff --git a/NovetusLauncher/NovetusLauncher/MainForm/MainForm.Designer.cs b/NovetusLauncher/NovetusLauncher/MainForm/MainForm.Designer.cs index f9a5c9a..dab0318 100644 --- a/NovetusLauncher/NovetusLauncher/MainForm/MainForm.Designer.cs +++ b/NovetusLauncher/NovetusLauncher/MainForm/MainForm.Designer.cs @@ -6,7 +6,7 @@ * * To change this template use Tools | Options | Coding | Edit Standard Headers. */ -//this.tabControl1 = new TabControlWithoutHeader(); +//this.tabControl1 = new TabControlWithoutHeader(1); //This ALWAYS gets lost whenever I compile. WTF VS? namespace NovetusLauncher { @@ -42,24 +42,7 @@ namespace NovetusLauncher private void InitializeComponent() { System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(MainForm)); - this.button25 = new System.Windows.Forms.Button(); - this.button21 = new System.Windows.Forms.Button(); - this.textBox5 = new System.Windows.Forms.TextBox(); - this.label15 = new System.Windows.Forms.Label(); - this.label13 = new System.Windows.Forms.Label(); - this.textBox2 = new System.Windows.Forms.TextBox(); - this.button4 = new System.Windows.Forms.Button(); - this.pictureBox2 = new System.Windows.Forms.PictureBox(); - this.button8 = new System.Windows.Forms.Button(); - this.button3 = new System.Windows.Forms.Button(); - this.label25 = new System.Windows.Forms.Label(); - this.label26 = new System.Windows.Forms.Label(); - this.label27 = new System.Windows.Forms.Label(); - this.label28 = new System.Windows.Forms.Label(); - this.label11 = new System.Windows.Forms.Label(); - this.label12 = new System.Windows.Forms.Label(); - this.label16 = new System.Windows.Forms.Label(); - this.button20 = new System.Windows.Forms.Button(); + this.tabControl1 = new TabControlWithoutHeader(1); this.tabPage1 = new System.Windows.Forms.TabPage(); this.label24 = new System.Windows.Forms.Label(); this.label23 = new System.Windows.Forms.Label(); @@ -74,6 +57,7 @@ namespace NovetusLauncher this.button1 = new System.Windows.Forms.Button(); this.textBox1 = new System.Windows.Forms.TextBox(); this.tabPage2 = new System.Windows.Forms.TabPage(); + this.checkBox8 = new System.Windows.Forms.CheckBox(); this.label19 = new System.Windows.Forms.Label(); this.textBox3 = new System.Windows.Forms.TextBox(); this.label17 = new System.Windows.Forms.Label(); @@ -90,7 +74,6 @@ namespace NovetusLauncher this.textBox6 = new System.Windows.Forms.TextBox(); this.label30 = new System.Windows.Forms.Label(); this.listBox2 = new System.Windows.Forms.ListBox(); - this.tabControl1 = new TabControlWithoutHeader(1); this.tabPage4 = new System.Windows.Forms.TabPage(); this.textBox4 = new System.Windows.Forms.TextBox(); this.button24 = new System.Windows.Forms.Button(); @@ -137,6 +120,24 @@ namespace NovetusLauncher this.label18 = new System.Windows.Forms.Label(); this.label8 = new System.Windows.Forms.Label(); this.label7 = new System.Windows.Forms.Label(); + this.button25 = new System.Windows.Forms.Button(); + this.button21 = new System.Windows.Forms.Button(); + this.textBox5 = new System.Windows.Forms.TextBox(); + this.label15 = new System.Windows.Forms.Label(); + this.label13 = new System.Windows.Forms.Label(); + this.textBox2 = new System.Windows.Forms.TextBox(); + this.button4 = new System.Windows.Forms.Button(); + this.pictureBox2 = new System.Windows.Forms.PictureBox(); + this.button8 = new System.Windows.Forms.Button(); + this.button3 = new System.Windows.Forms.Button(); + this.label25 = new System.Windows.Forms.Label(); + this.label26 = new System.Windows.Forms.Label(); + this.label27 = new System.Windows.Forms.Label(); + this.label28 = new System.Windows.Forms.Label(); + this.label11 = new System.Windows.Forms.Label(); + this.label12 = new System.Windows.Forms.Label(); + this.label16 = new System.Windows.Forms.Label(); + this.button20 = new System.Windows.Forms.Button(); this.button27 = new System.Windows.Forms.Button(); this.panel1 = new System.Windows.Forms.Panel(); this.button33 = new System.Windows.Forms.Button(); @@ -152,7 +153,6 @@ namespace NovetusLauncher this.panel4 = new System.Windows.Forms.Panel(); this.button35 = new System.Windows.Forms.Button(); this.UAButton = new System.Windows.Forms.Button(); - ((System.ComponentModel.ISupportInitialize)(this.pictureBox2)).BeginInit(); this.tabControl1.SuspendLayout(); this.tabPage1.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.numericUpDown1)).BeginInit(); @@ -166,186 +166,13 @@ namespace NovetusLauncher this.tabPage8.SuspendLayout(); this.tabPage5.SuspendLayout(); this.panel5.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.pictureBox2)).BeginInit(); this.panel1.SuspendLayout(); this.panel2.SuspendLayout(); this.panel3.SuspendLayout(); this.panel4.SuspendLayout(); this.SuspendLayout(); // - // button25 - // - this.button25.Font = new System.Drawing.Font("Microsoft Sans Serif", 6.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.button25.Location = new System.Drawing.Point(278, 3); - this.button25.Name = "button25"; - this.button25.Size = new System.Drawing.Size(75, 20); - this.button25.TabIndex = 56; - this.button25.Text = "Install Addon"; - this.button25.UseVisualStyleBackColor = true; - this.button25.Click += new System.EventHandler(this.button25_Click); - // - // button21 - // - this.button21.Font = new System.Drawing.Font("Microsoft Sans Serif", 6.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.button21.Location = new System.Drawing.Point(356, 3); - this.button21.Name = "button21"; - this.button21.Size = new System.Drawing.Size(128, 20); - this.button21.TabIndex = 44; - this.button21.Text = "Register UserAgent Library"; - this.button21.UseVisualStyleBackColor = true; - this.button21.Click += new System.EventHandler(this.Button21Click); - // - // textBox5 - // - this.textBox5.Location = new System.Drawing.Point(97, 25); - this.textBox5.Multiline = true; - this.textBox5.Name = "textBox5"; - this.textBox5.Size = new System.Drawing.Size(71, 18); - this.textBox5.TabIndex = 20; - this.textBox5.Text = "0"; - this.textBox5.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; - this.textBox5.TextChanged += new System.EventHandler(this.TextBox5TextChanged); - // - // label15 - // - this.label15.Location = new System.Drawing.Point(57, 6); - this.label15.Name = "label15"; - this.label15.Size = new System.Drawing.Size(40, 16); - this.label15.TabIndex = 12; - this.label15.Text = "Name:"; - // - // label13 - // - this.label13.Location = new System.Drawing.Point(57, 27); - this.label13.Name = "label13"; - this.label13.Size = new System.Drawing.Size(34, 13); - this.label13.TabIndex = 7; - this.label13.Text = "ID:"; - // - // textBox2 - // - this.textBox2.Location = new System.Drawing.Point(97, 3); - this.textBox2.Name = "textBox2"; - this.textBox2.Size = new System.Drawing.Size(121, 20); - this.textBox2.TabIndex = 11; - this.textBox2.Text = "Player"; - this.textBox2.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; - this.textBox2.TextChanged += new System.EventHandler(this.TextBox2TextChanged); - // - // button4 - // - this.button4.Font = new System.Drawing.Font("Microsoft Sans Serif", 6.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.button4.Location = new System.Drawing.Point(171, 24); - this.button4.Name = "button4"; - this.button4.Size = new System.Drawing.Size(48, 20); - this.button4.TabIndex = 9; - this.button4.Text = "Regen"; - this.button4.UseVisualStyleBackColor = true; - this.button4.Click += new System.EventHandler(this.Button4Click); - // - // pictureBox2 - // - this.pictureBox2.BackgroundImage = ((System.Drawing.Image)(resources.GetObject("pictureBox2.BackgroundImage"))); - this.pictureBox2.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch; - this.pictureBox2.Location = new System.Drawing.Point(3, 3); - this.pictureBox2.Name = "pictureBox2"; - this.pictureBox2.Size = new System.Drawing.Size(43, 41); - this.pictureBox2.TabIndex = 7; - this.pictureBox2.TabStop = false; - // - // button8 - // - this.button8.Font = new System.Drawing.Font("Microsoft Sans Serif", 6.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.button8.Location = new System.Drawing.Point(6, 3); - this.button8.Name = "button8"; - this.button8.Size = new System.Drawing.Size(104, 20); - this.button8.TabIndex = 35; - this.button8.Text = "Customize Character"; - this.button8.UseVisualStyleBackColor = true; - this.button8.Click += new System.EventHandler(this.Button8Click); - // - // button3 - // - this.button3.Font = new System.Drawing.Font("Microsoft Sans Serif", 6.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.button3.Location = new System.Drawing.Point(157, 3); - this.button3.Name = "button3"; - this.button3.Size = new System.Drawing.Size(81, 20); - this.button3.TabIndex = 6; - this.button3.Text = "Studio with Map"; - this.button3.UseVisualStyleBackColor = true; - this.button3.Click += new System.EventHandler(this.Button3Click); - // - // label25 - // - this.label25.Location = new System.Drawing.Point(236, 10); - this.label25.Name = "label25"; - this.label25.Size = new System.Drawing.Size(109, 14); - this.label25.TabIndex = 16; - this.label25.Text = "SELECTED CLIENT:"; - // - // label26 - // - this.label26.Location = new System.Drawing.Point(341, 10); - this.label26.Name = "label26"; - this.label26.Size = new System.Drawing.Size(391, 13); - this.label26.TabIndex = 17; - this.label26.Text = "2009E"; - // - // label27 - // - this.label27.Location = new System.Drawing.Point(236, 24); - this.label27.Name = "label27"; - this.label27.Size = new System.Drawing.Size(95, 12); - this.label27.TabIndex = 18; - this.label27.Text = "SELECTED MAP:"; - // - // label28 - // - this.label28.Font = new System.Drawing.Font("Microsoft Sans Serif", 6.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.label28.Location = new System.Drawing.Point(329, 25); - this.label28.Name = "label28"; - this.label28.Size = new System.Drawing.Size(403, 11); - this.label28.TabIndex = 19; - this.label28.Text = "Baseplate.rbxl"; - // - // label11 - // - this.label11.Font = new System.Drawing.Font("Microsoft Sans Serif", 6.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.label11.Location = new System.Drawing.Point(3, 212); - this.label11.Name = "label11"; - this.label11.Size = new System.Drawing.Size(75, 48); - this.label11.TabIndex = 50; - this.label11.Text = "v1.0"; - this.label11.TextAlign = System.Drawing.ContentAlignment.TopCenter; - // - // label12 - // - this.label12.Font = new System.Drawing.Font("Microsoft Sans Serif", 6.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.label12.Location = new System.Drawing.Point(4, 47); - this.label12.Name = "label12"; - this.label12.Size = new System.Drawing.Size(214, 17); - this.label12.TabIndex = 0; - this.label12.Text = "Novetus!"; - this.label12.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; - // - // label16 - // - this.label16.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D; - this.label16.Location = new System.Drawing.Point(52, 3); - this.label16.Name = "label16"; - this.label16.Size = new System.Drawing.Size(2, 41); - this.label16.TabIndex = 51; - // - // button20 - // - this.button20.Location = new System.Drawing.Point(3, 30); - this.button20.Name = "button20"; - this.button20.Size = new System.Drawing.Size(75, 23); - this.button20.TabIndex = 57; - this.button20.TabStop = false; - this.button20.Text = "HOST"; - this.button20.UseVisualStyleBackColor = true; - this.button20.Click += new System.EventHandler(this.button20_Click); - // // tabControl1 // this.tabControl1.Alignment = System.Windows.Forms.TabAlignment.Bottom; @@ -521,6 +348,7 @@ namespace NovetusLauncher // // tabPage2 // + this.tabPage2.Controls.Add(this.checkBox8); this.tabPage2.Controls.Add(this.label19); this.tabPage2.Controls.Add(this.textBox3); this.tabPage2.Controls.Add(this.label17); @@ -542,6 +370,17 @@ namespace NovetusLauncher this.tabPage2.ToolTipText = "Start a server for other players to play"; this.tabPage2.UseVisualStyleBackColor = true; // + // checkBox8 + // + this.checkBox8.AutoSize = true; + this.checkBox8.Location = new System.Drawing.Point(326, 182); + this.checkBox8.Name = "checkBox8"; + this.checkBox8.Size = new System.Drawing.Size(188, 17); + this.checkBox8.TabIndex = 61; + this.checkBox8.Text = "Toggle UDP Hole Punching (WIP)"; + this.checkBox8.UseVisualStyleBackColor = true; + this.checkBox8.CheckedChanged += new System.EventHandler(this.checkBox8_CheckedChanged); + // // label19 // this.label19.AutoSize = true; @@ -575,7 +414,7 @@ namespace NovetusLauncher // // checkBox4 // - this.checkBox4.Location = new System.Drawing.Point(318, 180); + this.checkBox4.Location = new System.Drawing.Point(438, 155); this.checkBox4.Name = "checkBox4"; this.checkBox4.Size = new System.Drawing.Size(104, 17); this.checkBox4.TabIndex = 57; @@ -1246,6 +1085,180 @@ namespace NovetusLauncher this.label7.Text = "PROJECT STARLIGHT"; this.label7.TextAlign = System.Drawing.ContentAlignment.TopCenter; // + // button25 + // + this.button25.Font = new System.Drawing.Font("Microsoft Sans Serif", 6.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.button25.Location = new System.Drawing.Point(278, 3); + this.button25.Name = "button25"; + this.button25.Size = new System.Drawing.Size(75, 20); + this.button25.TabIndex = 56; + this.button25.Text = "Install Addon"; + this.button25.UseVisualStyleBackColor = true; + this.button25.Click += new System.EventHandler(this.button25_Click); + // + // button21 + // + this.button21.Font = new System.Drawing.Font("Microsoft Sans Serif", 6.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.button21.Location = new System.Drawing.Point(356, 3); + this.button21.Name = "button21"; + this.button21.Size = new System.Drawing.Size(128, 20); + this.button21.TabIndex = 44; + this.button21.Text = "Register UserAgent Library"; + this.button21.UseVisualStyleBackColor = true; + this.button21.Click += new System.EventHandler(this.Button21Click); + // + // textBox5 + // + this.textBox5.Location = new System.Drawing.Point(97, 25); + this.textBox5.Multiline = true; + this.textBox5.Name = "textBox5"; + this.textBox5.Size = new System.Drawing.Size(71, 18); + this.textBox5.TabIndex = 20; + this.textBox5.Text = "0"; + this.textBox5.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; + this.textBox5.TextChanged += new System.EventHandler(this.TextBox5TextChanged); + // + // label15 + // + this.label15.Location = new System.Drawing.Point(57, 6); + this.label15.Name = "label15"; + this.label15.Size = new System.Drawing.Size(40, 16); + this.label15.TabIndex = 12; + this.label15.Text = "Name:"; + // + // label13 + // + this.label13.Location = new System.Drawing.Point(57, 27); + this.label13.Name = "label13"; + this.label13.Size = new System.Drawing.Size(34, 13); + this.label13.TabIndex = 7; + this.label13.Text = "ID:"; + // + // textBox2 + // + this.textBox2.Location = new System.Drawing.Point(97, 3); + this.textBox2.Name = "textBox2"; + this.textBox2.Size = new System.Drawing.Size(121, 20); + this.textBox2.TabIndex = 11; + this.textBox2.Text = "Player"; + this.textBox2.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; + this.textBox2.TextChanged += new System.EventHandler(this.TextBox2TextChanged); + // + // button4 + // + this.button4.Font = new System.Drawing.Font("Microsoft Sans Serif", 6.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.button4.Location = new System.Drawing.Point(171, 24); + this.button4.Name = "button4"; + this.button4.Size = new System.Drawing.Size(48, 20); + this.button4.TabIndex = 9; + this.button4.Text = "Regen"; + this.button4.UseVisualStyleBackColor = true; + this.button4.Click += new System.EventHandler(this.Button4Click); + // + // pictureBox2 + // + this.pictureBox2.BackgroundImage = ((System.Drawing.Image)(resources.GetObject("pictureBox2.BackgroundImage"))); + this.pictureBox2.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch; + this.pictureBox2.Location = new System.Drawing.Point(3, 3); + this.pictureBox2.Name = "pictureBox2"; + this.pictureBox2.Size = new System.Drawing.Size(43, 41); + this.pictureBox2.TabIndex = 7; + this.pictureBox2.TabStop = false; + // + // button8 + // + this.button8.Font = new System.Drawing.Font("Microsoft Sans Serif", 6.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.button8.Location = new System.Drawing.Point(6, 3); + this.button8.Name = "button8"; + this.button8.Size = new System.Drawing.Size(104, 20); + this.button8.TabIndex = 35; + this.button8.Text = "Customize Character"; + this.button8.UseVisualStyleBackColor = true; + this.button8.Click += new System.EventHandler(this.Button8Click); + // + // button3 + // + this.button3.Font = new System.Drawing.Font("Microsoft Sans Serif", 6.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.button3.Location = new System.Drawing.Point(157, 3); + this.button3.Name = "button3"; + this.button3.Size = new System.Drawing.Size(81, 20); + this.button3.TabIndex = 6; + this.button3.Text = "Studio with Map"; + this.button3.UseVisualStyleBackColor = true; + this.button3.Click += new System.EventHandler(this.Button3Click); + // + // label25 + // + this.label25.Location = new System.Drawing.Point(236, 10); + this.label25.Name = "label25"; + this.label25.Size = new System.Drawing.Size(109, 14); + this.label25.TabIndex = 16; + this.label25.Text = "SELECTED CLIENT:"; + // + // label26 + // + this.label26.Location = new System.Drawing.Point(341, 10); + this.label26.Name = "label26"; + this.label26.Size = new System.Drawing.Size(391, 13); + this.label26.TabIndex = 17; + this.label26.Text = "2009E"; + // + // label27 + // + this.label27.Location = new System.Drawing.Point(236, 24); + this.label27.Name = "label27"; + this.label27.Size = new System.Drawing.Size(95, 12); + this.label27.TabIndex = 18; + this.label27.Text = "SELECTED MAP:"; + // + // label28 + // + this.label28.Font = new System.Drawing.Font("Microsoft Sans Serif", 6.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.label28.Location = new System.Drawing.Point(329, 25); + this.label28.Name = "label28"; + this.label28.Size = new System.Drawing.Size(403, 11); + this.label28.TabIndex = 19; + this.label28.Text = "Baseplate.rbxl"; + // + // label11 + // + this.label11.Font = new System.Drawing.Font("Microsoft Sans Serif", 6.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.label11.Location = new System.Drawing.Point(3, 212); + this.label11.Name = "label11"; + this.label11.Size = new System.Drawing.Size(75, 48); + this.label11.TabIndex = 50; + this.label11.Text = "v1.0"; + this.label11.TextAlign = System.Drawing.ContentAlignment.TopCenter; + // + // label12 + // + this.label12.Font = new System.Drawing.Font("Microsoft Sans Serif", 6.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.label12.Location = new System.Drawing.Point(4, 47); + this.label12.Name = "label12"; + this.label12.Size = new System.Drawing.Size(214, 17); + this.label12.TabIndex = 0; + this.label12.Text = "Novetus!"; + this.label12.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; + // + // label16 + // + this.label16.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D; + this.label16.Location = new System.Drawing.Point(52, 3); + this.label16.Name = "label16"; + this.label16.Size = new System.Drawing.Size(2, 41); + this.label16.TabIndex = 51; + // + // button20 + // + this.button20.Location = new System.Drawing.Point(3, 30); + this.button20.Name = "button20"; + this.button20.Size = new System.Drawing.Size(75, 23); + this.button20.TabIndex = 57; + this.button20.TabStop = false; + this.button20.Text = "HOST"; + this.button20.UseVisualStyleBackColor = true; + this.button20.Click += new System.EventHandler(this.button20_Click); + // // button27 // this.button27.Location = new System.Drawing.Point(3, 4); @@ -1438,7 +1451,6 @@ namespace NovetusLauncher this.Text = "Novetus"; this.Closing += new System.ComponentModel.CancelEventHandler(this.MainFormClose); this.Load += new System.EventHandler(this.MainFormLoad); - ((System.ComponentModel.ISupportInitialize)(this.pictureBox2)).EndInit(); this.tabControl1.ResumeLayout(false); this.tabPage1.ResumeLayout(false); this.tabPage1.PerformLayout(); @@ -1457,6 +1469,7 @@ namespace NovetusLauncher this.tabPage5.ResumeLayout(false); this.panel5.ResumeLayout(false); this.panel5.PerformLayout(); + ((System.ComponentModel.ISupportInitialize)(this.pictureBox2)).EndInit(); this.panel1.ResumeLayout(false); this.panel2.ResumeLayout(false); this.panel3.ResumeLayout(false); @@ -1577,5 +1590,6 @@ namespace NovetusLauncher private System.Windows.Forms.ComboBox comboBox2; private System.Windows.Forms.Label label3; private System.Windows.Forms.Button button36; + private System.Windows.Forms.CheckBox checkBox8; } } diff --git a/NovetusLauncher/NovetusLauncher/MainForm/MainForm.cs b/NovetusLauncher/NovetusLauncher/MainForm/MainForm.cs index a576cd5..48f26c1 100644 --- a/NovetusLauncher/NovetusLauncher/MainForm/MainForm.cs +++ b/NovetusLauncher/NovetusLauncher/MainForm/MainForm.cs @@ -1571,10 +1571,12 @@ namespace NovetusLauncher if (checkBox4.Checked == true) { GlobalVars.UPnP = true; + checkBox8.Checked = false; } else if (checkBox4.Checked == false) { GlobalVars.UPnP = false; + //checkBox8.Checked = GlobalVars.UDP; } } @@ -1869,5 +1871,10 @@ namespace NovetusLauncher WriteConfigValues(); Application.Restart(); } + + private void checkBox8_CheckedChanged(object sender, EventArgs e) + { + + } } } diff --git a/NovetusLauncher/NovetusLauncher/MainForm/MainForm.resx b/NovetusLauncher/NovetusLauncher/MainForm/MainForm.resx index 2afb042..9aa1c53 100644 --- a/NovetusLauncher/NovetusLauncher/MainForm/MainForm.resx +++ b/NovetusLauncher/NovetusLauncher/MainForm/MainForm.resx @@ -117,6 +117,17 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + NOTE: +- If you have a problem where you can't see your character, REGENERATE YOUR PLAYER ID THEN REJOIN THE SERVER. +- If you tried to connect to the server and you get an error, REJOIN THE SERVER. +- To reset your character, type !!!reset into chat. +- Your tripcode will only be seen by you and the server host of any server you join. It is used to verify that you are a unique player. + + + + + @@ -19613,17 +19624,6 @@ aMoiAAAAAAAAAIymLAIAAAAAAADAaMoiAAAAAAAAAIymLAIAAAAAAADAaMoiAAAAAAAAAIymLAIAAAAA AADAaMoiAAAAAAAAAIymLAIAAAAAAADAaMoiAAAAAAAAAIymLAIAAAAAAADAaMoiAAAAAAAAAIxlc9X/ AxppXSXTqYivAAAAAElFTkSuQmCC - - - - NOTE: -- If you have a problem where you can't see your character, REGENERATE YOUR PLAYER ID THEN REJOIN THE SERVER. -- If you tried to connect to the server and you get an error, REJOIN THE SERVER. -- To reset your character, type !!!reset into chat. -- Your tripcode will only be seen by you and the server host of any server you join. It is used to verify that you are a unique player. - - - diff --git a/NovetusLauncher/NovetusLauncher/MainForm/MainForm_legacy.Designer.cs b/NovetusLauncher/NovetusLauncher/MainForm/MainForm_legacy.Designer.cs index cba5d12..3ab6684 100644 --- a/NovetusLauncher/NovetusLauncher/MainForm/MainForm_legacy.Designer.cs +++ b/NovetusLauncher/NovetusLauncher/MainForm/MainForm_legacy.Designer.cs @@ -6,7 +6,7 @@ * * To change this template use Tools | Options | Coding | Edit Standard Headers. */ -//this.tabControl1 = new TabControlWithoutHeader(); +//this.tabControl1 = new TabControlWithoutHeader(2); //This ALWAYS gets lost whenever I compile. WTF VS? namespace NovetusLauncher { @@ -44,34 +44,7 @@ namespace NovetusLauncher private void InitializeComponent() { System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(MainForm_legacy)); - this.button25 = new System.Windows.Forms.Button(); - this.button21 = new System.Windows.Forms.Button(); - this.textBox5 = new System.Windows.Forms.TextBox(); - this.label15 = new System.Windows.Forms.Label(); - this.label13 = new System.Windows.Forms.Label(); - this.textBox2 = new System.Windows.Forms.TextBox(); - this.button4 = new System.Windows.Forms.Button(); - this.pictureBox2 = new System.Windows.Forms.PictureBox(); - this.button8 = new System.Windows.Forms.Button(); - this.button3 = new System.Windows.Forms.Button(); - this.label25 = new System.Windows.Forms.Label(); - this.label26 = new System.Windows.Forms.Label(); - this.label27 = new System.Windows.Forms.Label(); - this.label28 = new System.Windows.Forms.Label(); - this.label11 = new System.Windows.Forms.Label(); - this.label12 = new System.Windows.Forms.Label(); - this.label16 = new System.Windows.Forms.Label(); - this.button20 = new System.Windows.Forms.Button(); - this.button27 = new System.Windows.Forms.Button(); - this.panel1 = new System.Windows.Forms.Panel(); - this.button33 = new System.Windows.Forms.Button(); - this.button32 = new System.Windows.Forms.Button(); - this.button31 = new System.Windows.Forms.Button(); - this.button30 = new System.Windows.Forms.Button(); - this.button29 = new System.Windows.Forms.Button(); - this.button28 = new System.Windows.Forms.Button(); - this.button34 = new System.Windows.Forms.Button(); - this.panel2 = new System.Windows.Forms.Panel(); + this.tabControl1 = new TabControlWithoutHeader(2); this.tabPage1 = new System.Windows.Forms.TabPage(); this.label2 = new System.Windows.Forms.Label(); this.label1 = new System.Windows.Forms.Label(); @@ -86,6 +59,7 @@ namespace NovetusLauncher this.label3 = new System.Windows.Forms.Label(); this.textBox1 = new System.Windows.Forms.TextBox(); this.tabPage2 = new System.Windows.Forms.TabPage(); + this.checkBox8 = new System.Windows.Forms.CheckBox(); this.label19 = new System.Windows.Forms.Label(); this.textBox3 = new System.Windows.Forms.TextBox(); this.label17 = new System.Windows.Forms.Label(); @@ -141,7 +115,34 @@ namespace NovetusLauncher this.richTextBox3 = new System.Windows.Forms.RichTextBox(); this.SettingsButton = new System.Windows.Forms.Button(); this.UAButton = new System.Windows.Forms.Button(); - this.tabControl1 = new TabControlWithoutHeader(2); + this.button25 = new System.Windows.Forms.Button(); + this.button21 = new System.Windows.Forms.Button(); + this.textBox5 = new System.Windows.Forms.TextBox(); + this.label15 = new System.Windows.Forms.Label(); + this.label13 = new System.Windows.Forms.Label(); + this.textBox2 = new System.Windows.Forms.TextBox(); + this.button4 = new System.Windows.Forms.Button(); + this.pictureBox2 = new System.Windows.Forms.PictureBox(); + this.button8 = new System.Windows.Forms.Button(); + this.button3 = new System.Windows.Forms.Button(); + this.label25 = new System.Windows.Forms.Label(); + this.label26 = new System.Windows.Forms.Label(); + this.label27 = new System.Windows.Forms.Label(); + this.label28 = new System.Windows.Forms.Label(); + this.label11 = new System.Windows.Forms.Label(); + this.label12 = new System.Windows.Forms.Label(); + this.label16 = new System.Windows.Forms.Label(); + this.button20 = new System.Windows.Forms.Button(); + this.button27 = new System.Windows.Forms.Button(); + this.panel1 = new System.Windows.Forms.Panel(); + this.button33 = new System.Windows.Forms.Button(); + this.button32 = new System.Windows.Forms.Button(); + this.button31 = new System.Windows.Forms.Button(); + this.button30 = new System.Windows.Forms.Button(); + this.button29 = new System.Windows.Forms.Button(); + this.button28 = new System.Windows.Forms.Button(); + this.button34 = new System.Windows.Forms.Button(); + this.panel2 = new System.Windows.Forms.Panel(); this.label24 = new System.Windows.Forms.Label(); this.label23 = new System.Windows.Forms.Label(); this.panel5 = new System.Windows.Forms.Panel(); @@ -154,7 +155,7 @@ namespace NovetusLauncher this.panel3 = new System.Windows.Forms.Panel(); this.panel4 = new System.Windows.Forms.Panel(); this.button35 = new System.Windows.Forms.Button(); - ((System.ComponentModel.ISupportInitialize)(this.pictureBox2)).BeginInit(); + this.tabControl1.SuspendLayout(); this.tabPage1.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.numericUpDown1)).BeginInit(); this.tabPage2.SuspendLayout(); @@ -166,248 +167,28 @@ namespace NovetusLauncher this.tabPage7.SuspendLayout(); this.tabPage8.SuspendLayout(); this.tabPage5.SuspendLayout(); - this.tabControl1.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.pictureBox2)).BeginInit(); this.SuspendLayout(); // - // button25 + // tabControl1 // - this.button25.Font = new System.Drawing.Font("Microsoft Sans Serif", 6.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.button25.Location = new System.Drawing.Point(315, 31); - this.button25.Name = "button25"; - this.button25.Size = new System.Drawing.Size(63, 20); - this.button25.TabIndex = 56; - this.button25.Text = "Install Mod"; - this.button25.UseVisualStyleBackColor = true; - this.button25.Click += new System.EventHandler(this.button25_Click); - // - // button21 - // - this.button21.Font = new System.Drawing.Font("Microsoft Sans Serif", 6.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.button21.Location = new System.Drawing.Point(380, 31); - this.button21.Name = "button21"; - this.button21.Size = new System.Drawing.Size(35, 20); - this.button21.TabIndex = 44; - this.button21.Text = "SDK"; - this.button21.UseVisualStyleBackColor = true; - this.button21.Click += new System.EventHandler(this.button34_Click); - // - // textBox5 - // - this.textBox5.Location = new System.Drawing.Point(95, 53); - this.textBox5.Multiline = true; - this.textBox5.Name = "textBox5"; - this.textBox5.Size = new System.Drawing.Size(71, 18); - this.textBox5.TabIndex = 20; - this.textBox5.Text = "0"; - this.textBox5.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; - this.textBox5.TextChanged += new System.EventHandler(this.TextBox5TextChanged); - // - // label15 - // - this.label15.Location = new System.Drawing.Point(55, 34); - this.label15.Name = "label15"; - this.label15.Size = new System.Drawing.Size(40, 16); - this.label15.TabIndex = 12; - this.label15.Text = "Name:"; - // - // label13 - // - this.label13.Location = new System.Drawing.Point(55, 55); - this.label13.Name = "label13"; - this.label13.Size = new System.Drawing.Size(34, 13); - this.label13.TabIndex = 7; - this.label13.Text = "ID:"; - // - // textBox2 - // - this.textBox2.Location = new System.Drawing.Point(95, 31); - this.textBox2.Name = "textBox2"; - this.textBox2.Size = new System.Drawing.Size(121, 20); - this.textBox2.TabIndex = 11; - this.textBox2.Text = "Player"; - this.textBox2.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; - this.textBox2.TextChanged += new System.EventHandler(this.TextBox2TextChanged); - // - // button4 - // - this.button4.Font = new System.Drawing.Font("Microsoft Sans Serif", 6.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.button4.Location = new System.Drawing.Point(169, 52); - this.button4.Name = "button4"; - this.button4.Size = new System.Drawing.Size(48, 20); - this.button4.TabIndex = 9; - this.button4.Text = "Regen"; - this.button4.UseVisualStyleBackColor = true; - this.button4.Click += new System.EventHandler(this.Button4Click); - // - // pictureBox2 - // - this.pictureBox2.BackgroundImage = ((System.Drawing.Image)(resources.GetObject("pictureBox2.BackgroundImage"))); - this.pictureBox2.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch; - this.pictureBox2.Location = new System.Drawing.Point(6, 12); - this.pictureBox2.Name = "pictureBox2"; - this.pictureBox2.Size = new System.Drawing.Size(43, 41); - this.pictureBox2.TabIndex = 7; - this.pictureBox2.TabStop = false; - // - // button8 - // - this.button8.Font = new System.Drawing.Font("Microsoft Sans Serif", 6.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.button8.Location = new System.Drawing.Point(223, 31); - this.button8.Name = "button8"; - this.button8.Size = new System.Drawing.Size(47, 20); - this.button8.TabIndex = 35; - this.button8.Text = "Avatar"; - this.button8.UseVisualStyleBackColor = true; - this.button8.Click += new System.EventHandler(this.Button8Click); - // - // button3 - // - this.button3.Font = new System.Drawing.Font("Microsoft Sans Serif", 6.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.button3.Location = new System.Drawing.Point(271, 31); - this.button3.Name = "button3"; - this.button3.Size = new System.Drawing.Size(43, 20); - this.button3.TabIndex = 6; - this.button3.Text = "Studio"; - this.button3.UseVisualStyleBackColor = true; - this.button3.Click += new System.EventHandler(this.Button3Click_legacy); - // - // label25 - // - this.label25.Location = new System.Drawing.Point(55, 4); - this.label25.Name = "label25"; - this.label25.Size = new System.Drawing.Size(109, 14); - this.label25.TabIndex = 16; - this.label25.Text = "SELECTED CLIENT:"; - // - // label26 - // - this.label26.Location = new System.Drawing.Point(160, 4); - this.label26.Name = "label26"; - this.label26.Size = new System.Drawing.Size(245, 13); - this.label26.TabIndex = 17; - this.label26.Text = "2009E"; - // - // label27 - // - this.label27.Location = new System.Drawing.Point(55, 18); - this.label27.Name = "label27"; - this.label27.Size = new System.Drawing.Size(95, 12); - this.label27.TabIndex = 18; - this.label27.Text = "SELECTED MAP:"; - // - // label28 - // - this.label28.Font = new System.Drawing.Font("Microsoft Sans Serif", 6.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.label28.Location = new System.Drawing.Point(145, 18); - this.label28.Name = "label28"; - this.label28.Size = new System.Drawing.Size(260, 12); - this.label28.TabIndex = 19; - this.label28.Text = "Baseplate.rbxl"; - // - // label11 - // - this.label11.Font = new System.Drawing.Font("Microsoft Sans Serif", 6.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.label11.Location = new System.Drawing.Point(4, 51); - this.label11.Name = "label11"; - this.label11.Size = new System.Drawing.Size(47, 25); - this.label11.TabIndex = 50; - this.label11.Text = "v1.0"; - this.label11.TextAlign = System.Drawing.ContentAlignment.TopCenter; - // - // label12 - // - this.label12.Font = new System.Drawing.Font("Microsoft Sans Serif", 6.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.label12.Location = new System.Drawing.Point(223, 51); - this.label12.Name = "label12"; - this.label12.Size = new System.Drawing.Size(192, 21); - this.label12.TabIndex = 0; - this.label12.Text = "Novetus!"; - this.label12.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; - // - // label16 - // - this.label16.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D; - this.label16.Location = new System.Drawing.Point(54, 6); - this.label16.Name = "label16"; - this.label16.Size = new System.Drawing.Size(2, 65); - this.label16.TabIndex = 51; - // - // button20 - // - this.button20.Location = new System.Drawing.Point(0, 0); - this.button20.Name = "button20"; - this.button20.Size = new System.Drawing.Size(75, 23); - this.button20.TabIndex = 0; - // - // button27 - // - this.button27.Location = new System.Drawing.Point(0, 0); - this.button27.Name = "button27"; - this.button27.Size = new System.Drawing.Size(75, 23); - this.button27.TabIndex = 0; - // - // panel1 - // - this.panel1.Location = new System.Drawing.Point(0, 0); - this.panel1.Name = "panel1"; - this.panel1.Size = new System.Drawing.Size(200, 100); - this.panel1.TabIndex = 0; - // - // button33 - // - this.button33.Location = new System.Drawing.Point(0, 0); - this.button33.Name = "button33"; - this.button33.Size = new System.Drawing.Size(75, 23); - this.button33.TabIndex = 0; - // - // button32 - // - this.button32.Location = new System.Drawing.Point(0, 0); - this.button32.Name = "button32"; - this.button32.Size = new System.Drawing.Size(75, 23); - this.button32.TabIndex = 0; - // - // button31 - // - this.button31.Location = new System.Drawing.Point(0, 0); - this.button31.Name = "button31"; - this.button31.Size = new System.Drawing.Size(75, 23); - this.button31.TabIndex = 0; - // - // button30 - // - this.button30.Location = new System.Drawing.Point(0, 0); - this.button30.Name = "button30"; - this.button30.Size = new System.Drawing.Size(75, 23); - this.button30.TabIndex = 0; - // - // button29 - // - this.button29.Location = new System.Drawing.Point(0, 0); - this.button29.Name = "button29"; - this.button29.Size = new System.Drawing.Size(75, 23); - this.button29.TabIndex = 0; - // - // button28 - // - this.button28.Location = new System.Drawing.Point(0, 0); - this.button28.Name = "button28"; - this.button28.Size = new System.Drawing.Size(75, 23); - this.button28.TabIndex = 0; - // - // button34 - // - this.button34.Location = new System.Drawing.Point(0, 0); - this.button34.Name = "button34"; - this.button34.Size = new System.Drawing.Size(75, 23); - this.button34.TabIndex = 0; - // - // panel2 - // - this.panel2.Location = new System.Drawing.Point(0, 0); - this.panel2.Name = "panel2"; - this.panel2.Size = new System.Drawing.Size(200, 100); - this.panel2.TabIndex = 0; + this.tabControl1.Controls.Add(this.tabPage1); + this.tabControl1.Controls.Add(this.tabPage2); + this.tabControl1.Controls.Add(this.tabPage3); + this.tabControl1.Controls.Add(this.tabPage4); + this.tabControl1.Controls.Add(this.tabPage6); + this.tabControl1.Controls.Add(this.tabPage7); + this.tabControl1.Controls.Add(this.tabPage8); + this.tabControl1.Controls.Add(this.tabPage5); + this.tabControl1.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.tabControl1.Location = new System.Drawing.Point(2, 79); + this.tabControl1.Multiline = true; + this.tabControl1.Name = "tabControl1"; + this.tabControl1.SelectedIndex = 0; + this.tabControl1.ShowToolTips = true; + this.tabControl1.Size = new System.Drawing.Size(413, 284); + this.tabControl1.TabIndex = 1; + this.tabControl1.SelectedIndexChanged += new System.EventHandler(this.tabControl1_SelectedIndexChanged); // // tabPage1 // @@ -567,6 +348,7 @@ namespace NovetusLauncher // // tabPage2 // + this.tabPage2.Controls.Add(this.checkBox8); this.tabPage2.Controls.Add(this.label19); this.tabPage2.Controls.Add(this.textBox3); this.tabPage2.Controls.Add(this.label17); @@ -588,6 +370,17 @@ namespace NovetusLauncher this.tabPage2.ToolTipText = "Start a server for other players to play"; this.tabPage2.UseVisualStyleBackColor = true; // + // checkBox8 + // + this.checkBox8.AutoSize = true; + this.checkBox8.Location = new System.Drawing.Point(296, 182); + this.checkBox8.Name = "checkBox8"; + this.checkBox8.Size = new System.Drawing.Size(126, 30); + this.checkBox8.TabIndex = 61; + this.checkBox8.Text = "Toggle UDP\r\nHole Punching (WIP)"; + this.checkBox8.UseVisualStyleBackColor = true; + this.checkBox8.CheckedChanged += new System.EventHandler(this.checkBox8_CheckedChanged); + // // label19 // this.label19.AutoSize = true; @@ -624,9 +417,10 @@ namespace NovetusLauncher // // checkBox4 // - this.checkBox4.Location = new System.Drawing.Point(205, 187); + this.checkBox4.AutoSize = true; + this.checkBox4.Location = new System.Drawing.Point(204, 189); this.checkBox4.Name = "checkBox4"; - this.checkBox4.Size = new System.Drawing.Size(104, 17); + this.checkBox4.Size = new System.Drawing.Size(90, 17); this.checkBox4.TabIndex = 57; this.checkBox4.Text = "Toggle UPnP"; this.checkBox4.UseVisualStyleBackColor = true; @@ -1209,25 +1003,245 @@ namespace NovetusLauncher this.UAButton.UseVisualStyleBackColor = true; this.UAButton.Click += new System.EventHandler(this.Button21Click); // - // tabControl1 + // button25 // - this.tabControl1.Controls.Add(this.tabPage1); - this.tabControl1.Controls.Add(this.tabPage2); - this.tabControl1.Controls.Add(this.tabPage3); - this.tabControl1.Controls.Add(this.tabPage4); - this.tabControl1.Controls.Add(this.tabPage6); - this.tabControl1.Controls.Add(this.tabPage7); - this.tabControl1.Controls.Add(this.tabPage8); - this.tabControl1.Controls.Add(this.tabPage5); - this.tabControl1.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.tabControl1.Location = new System.Drawing.Point(2, 79); - this.tabControl1.Multiline = true; - this.tabControl1.Name = "tabControl1"; - this.tabControl1.SelectedIndex = 0; - this.tabControl1.ShowToolTips = true; - this.tabControl1.Size = new System.Drawing.Size(413, 284); - this.tabControl1.TabIndex = 1; - this.tabControl1.SelectedIndexChanged += new System.EventHandler(this.tabControl1_SelectedIndexChanged); + this.button25.Font = new System.Drawing.Font("Microsoft Sans Serif", 6.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.button25.Location = new System.Drawing.Point(315, 31); + this.button25.Name = "button25"; + this.button25.Size = new System.Drawing.Size(63, 20); + this.button25.TabIndex = 56; + this.button25.Text = "Install Mod"; + this.button25.UseVisualStyleBackColor = true; + this.button25.Click += new System.EventHandler(this.button25_Click); + // + // button21 + // + this.button21.Font = new System.Drawing.Font("Microsoft Sans Serif", 6.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.button21.Location = new System.Drawing.Point(380, 31); + this.button21.Name = "button21"; + this.button21.Size = new System.Drawing.Size(35, 20); + this.button21.TabIndex = 44; + this.button21.Text = "SDK"; + this.button21.UseVisualStyleBackColor = true; + this.button21.Click += new System.EventHandler(this.button34_Click); + // + // textBox5 + // + this.textBox5.Location = new System.Drawing.Point(95, 53); + this.textBox5.Multiline = true; + this.textBox5.Name = "textBox5"; + this.textBox5.Size = new System.Drawing.Size(71, 18); + this.textBox5.TabIndex = 20; + this.textBox5.Text = "0"; + this.textBox5.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; + this.textBox5.TextChanged += new System.EventHandler(this.TextBox5TextChanged); + // + // label15 + // + this.label15.Location = new System.Drawing.Point(55, 34); + this.label15.Name = "label15"; + this.label15.Size = new System.Drawing.Size(40, 16); + this.label15.TabIndex = 12; + this.label15.Text = "Name:"; + // + // label13 + // + this.label13.Location = new System.Drawing.Point(55, 55); + this.label13.Name = "label13"; + this.label13.Size = new System.Drawing.Size(34, 13); + this.label13.TabIndex = 7; + this.label13.Text = "ID:"; + // + // textBox2 + // + this.textBox2.Location = new System.Drawing.Point(95, 31); + this.textBox2.Name = "textBox2"; + this.textBox2.Size = new System.Drawing.Size(121, 20); + this.textBox2.TabIndex = 11; + this.textBox2.Text = "Player"; + this.textBox2.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; + this.textBox2.TextChanged += new System.EventHandler(this.TextBox2TextChanged); + // + // button4 + // + this.button4.Font = new System.Drawing.Font("Microsoft Sans Serif", 6.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.button4.Location = new System.Drawing.Point(169, 52); + this.button4.Name = "button4"; + this.button4.Size = new System.Drawing.Size(48, 20); + this.button4.TabIndex = 9; + this.button4.Text = "Regen"; + this.button4.UseVisualStyleBackColor = true; + this.button4.Click += new System.EventHandler(this.Button4Click); + // + // pictureBox2 + // + this.pictureBox2.BackgroundImage = ((System.Drawing.Image)(resources.GetObject("pictureBox2.BackgroundImage"))); + this.pictureBox2.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch; + this.pictureBox2.Location = new System.Drawing.Point(6, 12); + this.pictureBox2.Name = "pictureBox2"; + this.pictureBox2.Size = new System.Drawing.Size(43, 41); + this.pictureBox2.TabIndex = 7; + this.pictureBox2.TabStop = false; + // + // button8 + // + this.button8.Font = new System.Drawing.Font("Microsoft Sans Serif", 6.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.button8.Location = new System.Drawing.Point(223, 31); + this.button8.Name = "button8"; + this.button8.Size = new System.Drawing.Size(47, 20); + this.button8.TabIndex = 35; + this.button8.Text = "Avatar"; + this.button8.UseVisualStyleBackColor = true; + this.button8.Click += new System.EventHandler(this.Button8Click); + // + // button3 + // + this.button3.Font = new System.Drawing.Font("Microsoft Sans Serif", 6.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.button3.Location = new System.Drawing.Point(271, 31); + this.button3.Name = "button3"; + this.button3.Size = new System.Drawing.Size(43, 20); + this.button3.TabIndex = 6; + this.button3.Text = "Studio"; + this.button3.UseVisualStyleBackColor = true; + this.button3.Click += new System.EventHandler(this.Button3Click_legacy); + // + // label25 + // + this.label25.Location = new System.Drawing.Point(55, 4); + this.label25.Name = "label25"; + this.label25.Size = new System.Drawing.Size(109, 14); + this.label25.TabIndex = 16; + this.label25.Text = "SELECTED CLIENT:"; + // + // label26 + // + this.label26.Location = new System.Drawing.Point(160, 4); + this.label26.Name = "label26"; + this.label26.Size = new System.Drawing.Size(245, 13); + this.label26.TabIndex = 17; + this.label26.Text = "2009E"; + // + // label27 + // + this.label27.Location = new System.Drawing.Point(55, 18); + this.label27.Name = "label27"; + this.label27.Size = new System.Drawing.Size(95, 12); + this.label27.TabIndex = 18; + this.label27.Text = "SELECTED MAP:"; + // + // label28 + // + this.label28.Font = new System.Drawing.Font("Microsoft Sans Serif", 6.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.label28.Location = new System.Drawing.Point(145, 18); + this.label28.Name = "label28"; + this.label28.Size = new System.Drawing.Size(260, 12); + this.label28.TabIndex = 19; + this.label28.Text = "Baseplate.rbxl"; + // + // label11 + // + this.label11.Font = new System.Drawing.Font("Microsoft Sans Serif", 6.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.label11.Location = new System.Drawing.Point(4, 51); + this.label11.Name = "label11"; + this.label11.Size = new System.Drawing.Size(47, 25); + this.label11.TabIndex = 50; + this.label11.Text = "v1.0"; + this.label11.TextAlign = System.Drawing.ContentAlignment.TopCenter; + // + // label12 + // + this.label12.Font = new System.Drawing.Font("Microsoft Sans Serif", 6.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.label12.Location = new System.Drawing.Point(223, 51); + this.label12.Name = "label12"; + this.label12.Size = new System.Drawing.Size(192, 21); + this.label12.TabIndex = 0; + this.label12.Text = "Novetus!"; + this.label12.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; + // + // label16 + // + this.label16.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D; + this.label16.Location = new System.Drawing.Point(54, 6); + this.label16.Name = "label16"; + this.label16.Size = new System.Drawing.Size(2, 65); + this.label16.TabIndex = 51; + // + // button20 + // + this.button20.Location = new System.Drawing.Point(0, 0); + this.button20.Name = "button20"; + this.button20.Size = new System.Drawing.Size(75, 23); + this.button20.TabIndex = 0; + // + // button27 + // + this.button27.Location = new System.Drawing.Point(0, 0); + this.button27.Name = "button27"; + this.button27.Size = new System.Drawing.Size(75, 23); + this.button27.TabIndex = 0; + // + // panel1 + // + this.panel1.Location = new System.Drawing.Point(0, 0); + this.panel1.Name = "panel1"; + this.panel1.Size = new System.Drawing.Size(200, 100); + this.panel1.TabIndex = 0; + // + // button33 + // + this.button33.Location = new System.Drawing.Point(0, 0); + this.button33.Name = "button33"; + this.button33.Size = new System.Drawing.Size(75, 23); + this.button33.TabIndex = 0; + // + // button32 + // + this.button32.Location = new System.Drawing.Point(0, 0); + this.button32.Name = "button32"; + this.button32.Size = new System.Drawing.Size(75, 23); + this.button32.TabIndex = 0; + // + // button31 + // + this.button31.Location = new System.Drawing.Point(0, 0); + this.button31.Name = "button31"; + this.button31.Size = new System.Drawing.Size(75, 23); + this.button31.TabIndex = 0; + // + // button30 + // + this.button30.Location = new System.Drawing.Point(0, 0); + this.button30.Name = "button30"; + this.button30.Size = new System.Drawing.Size(75, 23); + this.button30.TabIndex = 0; + // + // button29 + // + this.button29.Location = new System.Drawing.Point(0, 0); + this.button29.Name = "button29"; + this.button29.Size = new System.Drawing.Size(75, 23); + this.button29.TabIndex = 0; + // + // button28 + // + this.button28.Location = new System.Drawing.Point(0, 0); + this.button28.Name = "button28"; + this.button28.Size = new System.Drawing.Size(75, 23); + this.button28.TabIndex = 0; + // + // button34 + // + this.button34.Location = new System.Drawing.Point(0, 0); + this.button34.Name = "button34"; + this.button34.Size = new System.Drawing.Size(75, 23); + this.button34.TabIndex = 0; + // + // panel2 + // + this.panel2.Location = new System.Drawing.Point(0, 0); + this.panel2.Name = "panel2"; + this.panel2.Size = new System.Drawing.Size(200, 100); + this.panel2.TabIndex = 0; // // label24 // @@ -1346,7 +1360,7 @@ namespace NovetusLauncher this.Text = "Novetus"; this.Closing += new System.ComponentModel.CancelEventHandler(this.MainFormClose); this.Load += new System.EventHandler(this.MainFormLoad); - ((System.ComponentModel.ISupportInitialize)(this.pictureBox2)).EndInit(); + this.tabControl1.ResumeLayout(false); this.tabPage1.ResumeLayout(false); this.tabPage1.PerformLayout(); ((System.ComponentModel.ISupportInitialize)(this.numericUpDown1)).EndInit(); @@ -1363,7 +1377,7 @@ namespace NovetusLauncher this.tabPage8.ResumeLayout(false); this.tabPage5.ResumeLayout(false); this.tabPage5.PerformLayout(); - this.tabControl1.ResumeLayout(false); + ((System.ComponentModel.ISupportInitialize)(this.pictureBox2)).EndInit(); this.ResumeLayout(false); this.PerformLayout(); @@ -1480,5 +1494,6 @@ namespace NovetusLauncher private System.Windows.Forms.ComboBox comboBox2; private System.Windows.Forms.Label label3; private System.Windows.Forms.Button button36; + private System.Windows.Forms.CheckBox checkBox8; } } diff --git a/NovetusLauncher/NovetusLauncher/MainForm/MainForm_legacy.cs b/NovetusLauncher/NovetusLauncher/MainForm/MainForm_legacy.cs index 106bccb..9dd866f 100644 --- a/NovetusLauncher/NovetusLauncher/MainForm/MainForm_legacy.cs +++ b/NovetusLauncher/NovetusLauncher/MainForm/MainForm_legacy.cs @@ -1531,19 +1531,21 @@ namespace NovetusLauncher { Process.Start("explorer.exe", GlobalVars.MapsDir.Replace(@"\\",@"\")); } - + void CheckBox4CheckedChanged(object sender, EventArgs e) { if (checkBox4.Checked == true) { GlobalVars.UPnP = true; + checkBox8.Checked = false; } else if (checkBox4.Checked == false) { GlobalVars.UPnP = false; + //checkBox8.Checked = GlobalVars.UDP; } } - + void CheckBox4Click(object sender, EventArgs e) { MessageBox.Show("Please restart the Novetus launcher for this option to take effect.","Novetus - UPnP", MessageBoxButtons.OK, MessageBoxIcon.Information); @@ -1790,5 +1792,11 @@ namespace NovetusLauncher WriteConfigValues(); Application.Restart(); } + + private void checkBox8_CheckedChanged(object sender, EventArgs e) + { + + + } } } diff --git a/NovetusLauncher/NovetusLauncher/MainForm/MainForm_legacy.resx b/NovetusLauncher/NovetusLauncher/MainForm/MainForm_legacy.resx index 2afb042..9aa1c53 100644 --- a/NovetusLauncher/NovetusLauncher/MainForm/MainForm_legacy.resx +++ b/NovetusLauncher/NovetusLauncher/MainForm/MainForm_legacy.resx @@ -117,6 +117,17 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + NOTE: +- If you have a problem where you can't see your character, REGENERATE YOUR PLAYER ID THEN REJOIN THE SERVER. +- If you tried to connect to the server and you get an error, REJOIN THE SERVER. +- To reset your character, type !!!reset into chat. +- Your tripcode will only be seen by you and the server host of any server you join. It is used to verify that you are a unique player. + + + + + @@ -19613,17 +19624,6 @@ aMoiAAAAAAAAAIymLAIAAAAAAADAaMoiAAAAAAAAAIymLAIAAAAAAADAaMoiAAAAAAAAAIymLAIAAAAA AADAaMoiAAAAAAAAAIymLAIAAAAAAADAaMoiAAAAAAAAAIymLAIAAAAAAADAaMoiAAAAAAAAAIxlc9X/ AxppXSXTqYivAAAAAElFTkSuQmCC - - - - NOTE: -- If you have a problem where you can't see your character, REGENERATE YOUR PLAYER ID THEN REJOIN THE SERVER. -- If you tried to connect to the server and you get an error, REJOIN THE SERVER. -- To reset your character, type !!!reset into chat. -- Your tripcode will only be seen by you and the server host of any server you join. It is used to verify that you are a unique player. - - - diff --git a/NovetusLauncher/NovetusLauncher/NovetusLauncher.csproj b/NovetusLauncher/NovetusLauncher/NovetusLauncher.csproj index 1b13445..bbb2658 100644 --- a/NovetusLauncher/NovetusLauncher/NovetusLauncher.csproj +++ b/NovetusLauncher/NovetusLauncher/NovetusLauncher.csproj @@ -76,6 +76,9 @@ ..\packages\DotNetZip.1.11.0\lib\net20\DotNetZip.dll True + + ..\packages\LiteNetLib.0.9.2.2\lib\net35\LiteNetLib.dll + ..\packages\Microsoft.Bcl.Async.1.0.168\lib\net40\Microsoft.Threading.Tasks.dll True diff --git a/NovetusLauncher/NovetusLauncher/packages.config b/NovetusLauncher/NovetusLauncher/packages.config index aabae54..d55d390 100644 --- a/NovetusLauncher/NovetusLauncher/packages.config +++ b/NovetusLauncher/NovetusLauncher/packages.config @@ -1,6 +1,7 @@  + diff --git a/NovetusLauncher/NovetusURI/NovetusURI.csproj b/NovetusLauncher/NovetusURI/NovetusURI.csproj index 35f3113..03eba05 100644 --- a/NovetusLauncher/NovetusURI/NovetusURI.csproj +++ b/NovetusLauncher/NovetusURI/NovetusURI.csproj @@ -44,6 +44,9 @@ ..\packages\DotNetZip.1.11.0\lib\net20\DotNetZip.dll True + + ..\packages\LiteNetLib.0.9.2.2\lib\net35\LiteNetLib.dll + ..\packages\Microsoft.Bcl.Async.1.0.168\lib\net40\Microsoft.Threading.Tasks.dll True diff --git a/NovetusLauncher/NovetusURI/packages.config b/NovetusLauncher/NovetusURI/packages.config index aabae54..d55d390 100644 --- a/NovetusLauncher/NovetusURI/packages.config +++ b/NovetusLauncher/NovetusURI/packages.config @@ -1,6 +1,7 @@  +