diff --git a/RBXLegacyLauncher/RBXLegacyLauncher/CharacterColors.Designer.cs b/RBXLegacyLauncher/RBXLegacyLauncher/CharacterColors.Designer.cs index a0080c7..5be782e 100644 --- a/RBXLegacyLauncher/RBXLegacyLauncher/CharacterColors.Designer.cs +++ b/RBXLegacyLauncher/RBXLegacyLauncher/CharacterColors.Designer.cs @@ -37,7 +37,6 @@ namespace RBXLegacyLauncher private void InitializeComponent() { System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(CharacterColors)); - this.button1 = new System.Windows.Forms.Button(); this.button2 = new System.Windows.Forms.Button(); this.button3 = new System.Windows.Forms.Button(); this.button4 = new System.Windows.Forms.Button(); @@ -79,18 +78,11 @@ namespace RBXLegacyLauncher this.label2 = new System.Windows.Forms.Label(); this.button40 = new System.Windows.Forms.Button(); this.button39 = new System.Windows.Forms.Button(); + this.button1 = new System.Windows.Forms.Button(); + this.button41 = new System.Windows.Forms.Button(); + this.button42 = new System.Windows.Forms.Button(); this.SuspendLayout(); // - // button1 - // - this.button1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(245)))), ((int)(((byte)(205)))), ((int)(((byte)(47))))); - this.button1.Location = new System.Drawing.Point(59, 12); - this.button1.Name = "button1"; - this.button1.Size = new System.Drawing.Size(47, 46); - this.button1.TabIndex = 0; - this.button1.UseVisualStyleBackColor = false; - this.button1.Click += new System.EventHandler(this.Button1Click); - // // button2 // this.button2.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(13)))), ((int)(((byte)(105)))), ((int)(((byte)(172))))); @@ -478,9 +470,9 @@ namespace RBXLegacyLauncher // // button40 // - this.button40.Location = new System.Drawing.Point(170, 187); + this.button40.Location = new System.Drawing.Point(304, 159); this.button40.Name = "button40"; - this.button40.Size = new System.Drawing.Size(265, 23); + this.button40.Size = new System.Drawing.Size(131, 23); this.button40.TabIndex = 41; this.button40.Text = "Reset Colors"; this.button40.UseVisualStyleBackColor = true; @@ -490,17 +482,47 @@ namespace RBXLegacyLauncher // this.button39.Location = new System.Drawing.Point(170, 159); this.button39.Name = "button39"; - this.button39.Size = new System.Drawing.Size(265, 23); + this.button39.Size = new System.Drawing.Size(131, 23); this.button39.TabIndex = 42; this.button39.Text = "Randomize Colors"; this.button39.UseVisualStyleBackColor = true; this.button39.Click += new System.EventHandler(this.Button39Click); // + // button1 + // + this.button1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(245)))), ((int)(((byte)(205)))), ((int)(((byte)(47))))); + this.button1.Location = new System.Drawing.Point(59, 12); + this.button1.Name = "button1"; + this.button1.Size = new System.Drawing.Size(47, 46); + this.button1.TabIndex = 0; + this.button1.UseVisualStyleBackColor = false; + this.button1.Click += new System.EventHandler(this.Button1Click); + // + // button41 + // + this.button41.Location = new System.Drawing.Point(170, 187); + this.button41.Name = "button41"; + this.button41.Size = new System.Drawing.Size(131, 23); + this.button41.TabIndex = 43; + this.button41.Text = "Change Part Shape"; + this.button41.UseVisualStyleBackColor = true; + // + // button42 + // + this.button42.Location = new System.Drawing.Point(304, 187); + this.button42.Name = "button42"; + this.button42.Size = new System.Drawing.Size(131, 23); + this.button42.TabIndex = 44; + this.button42.Text = "Change Face"; + this.button42.UseVisualStyleBackColor = true; + // // CharacterColors // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.ClientSize = new System.Drawing.Size(437, 222); + this.Controls.Add(this.button42); + this.Controls.Add(this.button41); this.Controls.Add(this.button39); this.Controls.Add(this.button40); this.Controls.Add(this.label2); @@ -543,7 +565,7 @@ namespace RBXLegacyLauncher this.Controls.Add(this.button3); this.Controls.Add(this.button2); this.Controls.Add(this.button1); - this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog; + this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow; this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon"))); this.MaximizeBox = false; this.Name = "CharacterColors"; @@ -551,6 +573,8 @@ namespace RBXLegacyLauncher this.Load += new System.EventHandler(this.CharacterColorsLoad); this.ResumeLayout(false); } + private System.Windows.Forms.Button button42; + private System.Windows.Forms.Button button41; private System.Windows.Forms.Button button39; private System.Windows.Forms.Button button40; private System.Windows.Forms.Label label2; diff --git a/RBXLegacyLauncher/RBXLegacyLauncher/CharacterCustomization.Designer.cs b/RBXLegacyLauncher/RBXLegacyLauncher/CharacterCustomization.Designer.cs index 4b6b99b..fe1250e 100644 --- a/RBXLegacyLauncher/RBXLegacyLauncher/CharacterCustomization.Designer.cs +++ b/RBXLegacyLauncher/RBXLegacyLauncher/CharacterCustomization.Designer.cs @@ -47,8 +47,6 @@ namespace RBXLegacyLauncher this.textBox1 = new System.Windows.Forms.TextBox(); this.textBox2 = new System.Windows.Forms.TextBox(); this.textBox3 = new System.Windows.Forms.TextBox(); - this.textBox4 = new System.Windows.Forms.TextBox(); - this.label4 = new System.Windows.Forms.Label(); this.label3 = new System.Windows.Forms.Label(); this.label2 = new System.Windows.Forms.Label(); this.label5 = new System.Windows.Forms.Label(); @@ -59,25 +57,25 @@ namespace RBXLegacyLauncher // this.button1.Location = new System.Drawing.Point(9, 12); this.button1.Name = "button1"; - this.button1.Size = new System.Drawing.Size(116, 36); + this.button1.Size = new System.Drawing.Size(72, 23); this.button1.TabIndex = 31; - this.button1.Text = "Body Colors"; + this.button1.Text = "Body"; this.button1.UseVisualStyleBackColor = true; this.button1.Click += new System.EventHandler(this.Button1Click); // // button2 // - this.button2.Location = new System.Drawing.Point(135, 12); + this.button2.Location = new System.Drawing.Point(87, 12); this.button2.Name = "button2"; - this.button2.Size = new System.Drawing.Size(116, 36); + this.button2.Size = new System.Drawing.Size(67, 23); this.button2.TabIndex = 32; - this.button2.Text = "Accessories"; + this.button2.Text = "Hats"; this.button2.UseVisualStyleBackColor = true; this.button2.Click += new System.EventHandler(this.Button2Click); // // radioButton1 // - this.radioButton1.Location = new System.Drawing.Point(29, 190); + this.radioButton1.Location = new System.Drawing.Point(16, 150); this.radioButton1.Name = "radioButton1"; this.radioButton1.Size = new System.Drawing.Size(40, 16); this.radioButton1.TabIndex = 34; @@ -87,7 +85,7 @@ namespace RBXLegacyLauncher // // radioButton2 // - this.radioButton2.Location = new System.Drawing.Point(75, 190); + this.radioButton2.Location = new System.Drawing.Point(16, 172); this.radioButton2.Name = "radioButton2"; this.radioButton2.Size = new System.Drawing.Size(50, 16); this.radioButton2.TabIndex = 35; @@ -97,7 +95,7 @@ namespace RBXLegacyLauncher // // radioButton3 // - this.radioButton3.Location = new System.Drawing.Point(124, 190); + this.radioButton3.Location = new System.Drawing.Point(87, 150); this.radioButton3.Name = "radioButton3"; this.radioButton3.Size = new System.Drawing.Size(50, 16); this.radioButton3.TabIndex = 36; @@ -108,7 +106,7 @@ namespace RBXLegacyLauncher // radioButton4 // this.radioButton4.Checked = true; - this.radioButton4.Location = new System.Drawing.Point(180, 190); + this.radioButton4.Location = new System.Drawing.Point(87, 172); this.radioButton4.Name = "radioButton4"; this.radioButton4.Size = new System.Drawing.Size(53, 16); this.radioButton4.TabIndex = 37; @@ -119,7 +117,7 @@ namespace RBXLegacyLauncher // // label1 // - this.label1.Location = new System.Drawing.Point(94, 170); + this.label1.Location = new System.Drawing.Point(51, 130); this.label1.Name = "label1"; this.label1.Size = new System.Drawing.Size(60, 17); this.label1.TabIndex = 38; @@ -127,51 +125,34 @@ namespace RBXLegacyLauncher // // textBox1 // - this.textBox1.Location = new System.Drawing.Point(71, 69); + this.textBox1.Location = new System.Drawing.Point(71, 56); this.textBox1.Name = "textBox1"; - this.textBox1.Size = new System.Drawing.Size(180, 20); + this.textBox1.Size = new System.Drawing.Size(87, 20); this.textBox1.TabIndex = 39; this.textBox1.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; this.textBox1.TextChanged += new System.EventHandler(this.TextBox1TextChanged); // // textBox2 // - this.textBox2.Location = new System.Drawing.Point(71, 95); + this.textBox2.Location = new System.Drawing.Point(71, 81); this.textBox2.Name = "textBox2"; - this.textBox2.Size = new System.Drawing.Size(180, 20); + this.textBox2.Size = new System.Drawing.Size(87, 20); this.textBox2.TabIndex = 40; this.textBox2.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; this.textBox2.TextChanged += new System.EventHandler(this.TextBox2TextChanged); // // textBox3 // - this.textBox3.Location = new System.Drawing.Point(71, 121); + this.textBox3.Location = new System.Drawing.Point(71, 107); this.textBox3.Name = "textBox3"; - this.textBox3.Size = new System.Drawing.Size(180, 20); + this.textBox3.Size = new System.Drawing.Size(87, 20); this.textBox3.TabIndex = 41; this.textBox3.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; this.textBox3.TextChanged += new System.EventHandler(this.TextBox3TextChanged); // - // textBox4 - // - this.textBox4.Location = new System.Drawing.Point(71, 147); - this.textBox4.Name = "textBox4"; - this.textBox4.Size = new System.Drawing.Size(180, 20); - this.textBox4.TabIndex = 42; - this.textBox4.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; - this.textBox4.TextChanged += new System.EventHandler(this.TextBox4TextChanged); - // - // label4 - // - this.label4.Location = new System.Drawing.Point(12, 147); - this.label4.Name = "label4"; - this.label4.Size = new System.Drawing.Size(49, 15); - this.label4.TabIndex = 46; - this.label4.Text = "Face ID"; - // // label3 // - this.label3.Location = new System.Drawing.Point(12, 124); + this.label3.Location = new System.Drawing.Point(16, 107); this.label3.Name = "label3"; this.label3.Size = new System.Drawing.Size(49, 15); this.label3.TabIndex = 45; @@ -179,7 +160,7 @@ namespace RBXLegacyLauncher // // label2 // - this.label2.Location = new System.Drawing.Point(12, 98); + this.label2.Location = new System.Drawing.Point(16, 84); this.label2.Name = "label2"; this.label2.Size = new System.Drawing.Size(42, 15); this.label2.TabIndex = 44; @@ -187,7 +168,7 @@ namespace RBXLegacyLauncher // // label5 // - this.label5.Location = new System.Drawing.Point(12, 72); + this.label5.Location = new System.Drawing.Point(12, 59); this.label5.Name = "label5"; this.label5.Size = new System.Drawing.Size(53, 15); this.label5.TabIndex = 43; @@ -195,9 +176,9 @@ namespace RBXLegacyLauncher // // label6 // - this.label6.Location = new System.Drawing.Point(9, 51); + this.label6.Location = new System.Drawing.Point(12, 38); this.label6.Name = "label6"; - this.label6.Size = new System.Drawing.Size(242, 15); + this.label6.Size = new System.Drawing.Size(125, 15); this.label6.TabIndex = 47; this.label6.Text = "Clothing"; this.label6.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; @@ -207,13 +188,11 @@ namespace RBXLegacyLauncher 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(263, 218); + this.ClientSize = new System.Drawing.Size(166, 201); this.Controls.Add(this.label6); - this.Controls.Add(this.label4); this.Controls.Add(this.label3); this.Controls.Add(this.label2); this.Controls.Add(this.label5); - this.Controls.Add(this.textBox4); this.Controls.Add(this.textBox3); this.Controls.Add(this.textBox2); this.Controls.Add(this.textBox1); @@ -224,7 +203,7 @@ namespace RBXLegacyLauncher this.Controls.Add(this.radioButton1); this.Controls.Add(this.button2); this.Controls.Add(this.button1); - this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedSingle; + this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow; this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon"))); this.MaximizeBox = false; this.Name = "CharacterCustomization"; @@ -237,8 +216,6 @@ namespace RBXLegacyLauncher private System.Windows.Forms.Label label5; private System.Windows.Forms.Label label2; private System.Windows.Forms.Label label3; - private System.Windows.Forms.Label label4; - private System.Windows.Forms.TextBox textBox4; private System.Windows.Forms.TextBox textBox3; private System.Windows.Forms.TextBox textBox2; private System.Windows.Forms.TextBox textBox1; diff --git a/RBXLegacyLauncher/RBXLegacyLauncher/CharacterCustomization_HatMenu.Designer.cs b/RBXLegacyLauncher/RBXLegacyLauncher/CharacterCustomization_HatMenu.Designer.cs index 4d751c5..ce34e1e 100644 --- a/RBXLegacyLauncher/RBXLegacyLauncher/CharacterCustomization_HatMenu.Designer.cs +++ b/RBXLegacyLauncher/RBXLegacyLauncher/CharacterCustomization_HatMenu.Designer.cs @@ -168,7 +168,7 @@ namespace RBXLegacyLauncher this.Controls.Add(this.listBox3); this.Controls.Add(this.listBox2); this.Controls.Add(this.listBox1); - this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedSingle; + this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow; this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon"))); this.Name = "CharacterCustomization_HatMenu"; this.Text = "Hats"; diff --git a/RBXLegacyLauncher/RBXLegacyLauncher/GlobalVars.cs b/RBXLegacyLauncher/RBXLegacyLauncher/GlobalVars.cs index 5498ff6..3354c31 100644 --- a/RBXLegacyLauncher/RBXLegacyLauncher/GlobalVars.cs +++ b/RBXLegacyLauncher/RBXLegacyLauncher/GlobalVars.cs @@ -54,7 +54,6 @@ public static int Custom_TShirt = 0; public static int Custom_Shirt = 0; public static int Custom_Pants = 0; - public static int Custom_Face = 0; public static string Custom_IconType = "NBC"; public static int HeadColorID = 24; public static int TorsoColorID = 23; @@ -62,6 +61,13 @@ public static int RightArmColorID = 24; public static int LeftLegColorID = 119; public static int RightLegColorID = 119; + public static string FaceID = "DefaultFace.rbxm"; + public static string HeadID = "DefaultHead.rbxm"; + public static string TorsoID = "DefaultTorso.rbxm"; + public static string LeftArmID = "DefaultLArm.rbxm"; + public static string RightArmID = "DefaultRArm.rbxm"; + public static string LeftLegID = "DefaultLLeg.rbxm"; + public static string RightLegID = "DefaultRLeg.rbxm"; public static string ColorMenu_HeadColor = "Color [A=255, R=245, G=205, B=47]"; public static string ColorMenu_TorsoColor = "Color [A=255, R=13, G=105, B=172]"; public static string ColorMenu_LeftArmColor = "Color [A=255, R=245, G=205, B=47]";