From d9f044e333853f83c45d3ffe14a1d7560f90158f Mon Sep 17 00:00:00 2001 From: Quacky Date: Wed, 16 Aug 2017 18:18:59 -0500 Subject: [PATCH] start work on server prefs --- CSMPFunctions.lua | 17 +- .../RBXLegacyLauncher/GlobalVars.cs | 3 + .../RBXLegacyLauncher/MainForm.Designer.cs | 17 +- .../RBXLegacyLauncher/MainForm.cs | 2 +- .../RBXLegacyLauncher.csproj | 10 +- .../RBXLegacyLauncher/ServerInfo.Designer.cs | 54 --- .../RBXLegacyLauncher/ServerPrefs.Designer.cs | 405 ++++++++++++++++++ .../{ServerInfo.cs => ServerPrefs.cs} | 32 +- .../{ServerInfo.resx => ServerPrefs.resx} | 0 9 files changed, 452 insertions(+), 88 deletions(-) delete mode 100644 RBXLegacyLauncher/RBXLegacyLauncher/ServerInfo.Designer.cs create mode 100644 RBXLegacyLauncher/RBXLegacyLauncher/ServerPrefs.Designer.cs rename RBXLegacyLauncher/RBXLegacyLauncher/{ServerInfo.cs => ServerPrefs.cs} (72%) rename RBXLegacyLauncher/RBXLegacyLauncher/{ServerInfo.resx => ServerPrefs.resx} (100%) diff --git a/CSMPFunctions.lua b/CSMPFunctions.lua index c29487b..da5e4cd 100644 --- a/CSMPFunctions.lua +++ b/CSMPFunctions.lua @@ -559,7 +559,7 @@ function InitalizeClientAppearance(Player,Hat1ID,Hat2ID,Hat3ID,HeadColorID,Torso end end -function CSServer(Port,PlayerLimit) +function CSServer(Port,PlayerLimit,IsPersonalServer) if (rbxlegacyversion >= 8) then assert((type(Port)~="number" or tonumber(Port)~=nil or Port==nil),"CSRun Error: Port must be nil or a number.") local NetworkServer=game:GetService("NetworkServer") @@ -602,6 +602,11 @@ function CSServer(Port,PlayerLimit) game.Workspace:InsertContent("rbxasset://fonts/libraries.rbxm") pcall(function() game.Close:connect(function() NetworkServer:Stop() end) end) NetworkServer.IncommingConnection:connect(IncommingConnection) + -- perbsosnal sebrs! + if IsPersonalServer == true then + game:GetService("PersonalServerService") + pcall(function() game.IsPersonalServer(true) + end else Server = game:GetService("NetworkServer") RunService = game:GetService("RunService") @@ -932,18 +937,12 @@ function CSSolo(UserID,PlayerName,Hat1ID,Hat2ID,Hat3ID,HeadColorID,TorsoColorID, end if (rbxlegacyversion > 8) then - local function waitForChild(instance, name) - while not instance:FindFirstChild(name) do - instance.ChildAdded:wait() - end - end - waitForChild(game.StarterGui,"Menu") game.StarterGui.Menu.Workaround:remove() end end -function CS3DView(UserID,PlayerName,Hat1ID,Hat2ID,Hat3ID,HeadColorID,TorsoColorID,LeftArmColorID,RightArmColorID,LeftLegColorID,RightLegColorID,TShirtID,ShirtID,PantsID,FaceID,HeadID,TorsoID,RArmID,LArmID,RLegID,LLegID,IconType) +function CS3DView(UserID,PlayerName,Hat1ID,Hat2ID,Hat3ID,HeadColorID,TorsoColorID,LeftArmColorID,RightArmColorID,LeftLegColorID,RightLegColorID,TShirtID,ShirtID,PantsID,FaceID,HeadID,TorsoID,RArmID,LArmID,RLegID,LLegID,Gear1,Gear2,Gear3,IconType) rbxlegacyversion = 8 settings().Rendering.FrameRateManager = 2 game:GetService("RunService"):run() @@ -966,7 +965,7 @@ function CS3DView(UserID,PlayerName,Hat1ID,Hat2ID,Hat3ID,HeadColorID,TorsoColorI if plr.Character:FindFirstChild("Animate") then plr.Character.Animate:Remove() end - InitalizeClientAppearance(plr,Hat1ID,Hat2ID,Hat3ID,HeadColorID,TorsoColorID,LeftArmColorID,RightArmColorID,LeftLegColorID,RightLegColorID,TShirtID,ShirtID,PantsID,FaceID,HeadID,TorsoID,RArmID,LArmID,RLegID,LLegID) + InitalizeClientAppearance(plr,Hat1ID,Hat2ID,Hat3ID,HeadColorID,TorsoColorID,LeftArmColorID,RightArmColorID,LeftLegColorID,RightLegColorID,TShirtID,ShirtID,PantsID,FaceID,HeadID,TorsoID,RArmID,LArmID,RLegID,LLegID,Gear1,Gear2,Gear3) LoadCharacterNew(newWaitForChild(plr,"Appearance"),plr.Character,plr.Backpack) wait(1) game:GetService("NetworkClient") diff --git a/RBXLegacyLauncher/RBXLegacyLauncher/GlobalVars.cs b/RBXLegacyLauncher/RBXLegacyLauncher/GlobalVars.cs index 7f772ce..aa2fecd 100644 --- a/RBXLegacyLauncher/RBXLegacyLauncher/GlobalVars.cs +++ b/RBXLegacyLauncher/RBXLegacyLauncher/GlobalVars.cs @@ -18,6 +18,9 @@ public static int ServerPort = 53640; public static int DefaultRobloxPort = 53640; public static int PlayerLimit = 12; + public static int RespawnTime = 5; + public static bool IsPersonalServer = false; + public static bool upnp = true; // player settings public static int UserID = 0; public static string PlayerName = "Player"; diff --git a/RBXLegacyLauncher/RBXLegacyLauncher/MainForm.Designer.cs b/RBXLegacyLauncher/RBXLegacyLauncher/MainForm.Designer.cs index 308b56d..205cccb 100644 --- a/RBXLegacyLauncher/RBXLegacyLauncher/MainForm.Designer.cs +++ b/RBXLegacyLauncher/RBXLegacyLauncher/MainForm.Designer.cs @@ -39,7 +39,6 @@ this.label29 = new System.Windows.Forms.Label(); this.label40 = new System.Windows.Forms.Label(); this.button20 = new System.Windows.Forms.Button(); - this.label32 = new System.Windows.Forms.Label(); this.label20 = new System.Windows.Forms.Label(); this.label19 = new System.Windows.Forms.Label(); this.button2 = new System.Windows.Forms.Button(); @@ -312,7 +311,6 @@ this.tabPage2.Controls.Add(this.label29); this.tabPage2.Controls.Add(this.label40); this.tabPage2.Controls.Add(this.button20); - this.tabPage2.Controls.Add(this.label32); this.tabPage2.Controls.Add(this.label20); this.tabPage2.Controls.Add(this.label19); this.tabPage2.Controls.Add(this.button2); @@ -379,22 +377,10 @@ this.button20.Name = "button20"; this.button20.Size = new System.Drawing.Size(97, 51); this.button20.TabIndex = 21; - this.button20.Text = "SERVER INFORMATION"; + this.button20.Text = "SERVER PREFERENCES"; this.button20.UseVisualStyleBackColor = true; this.button20.Click += new System.EventHandler(this.Button20Click); // - // label32 - // - this.label32.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.label32.ForeColor = System.Drawing.Color.Red; - this.label32.Location = new System.Drawing.Point(12, 177); - this.label32.Name = "label32"; - this.label32.Size = new System.Drawing.Size(378, 47); - this.label32.TabIndex = 19; - this.label32.Text = "NOTE: Be sure you have port forwarded the server\'s port before you start a public" + - " server. This port can be found and changed in the OPTIONS tab."; - this.label32.TextAlign = System.Drawing.ContentAlignment.TopCenter; - // // label20 // this.label20.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right))); @@ -1080,7 +1066,6 @@ private System.Windows.Forms.TextBox textBox5; private System.Windows.Forms.TextBox textBox4; private System.Windows.Forms.Label label35; - private System.Windows.Forms.Label label32; private System.Windows.Forms.Label label30; private System.Windows.Forms.Label label28; private System.Windows.Forms.Label label27; diff --git a/RBXLegacyLauncher/RBXLegacyLauncher/MainForm.cs b/RBXLegacyLauncher/RBXLegacyLauncher/MainForm.cs index 844aa4d..1f9071c 100644 --- a/RBXLegacyLauncher/RBXLegacyLauncher/MainForm.cs +++ b/RBXLegacyLauncher/RBXLegacyLauncher/MainForm.cs @@ -530,7 +530,7 @@ namespace RBXLegacyLauncher void Button20Click(object sender, EventArgs e) { - ServerInfo infopanel = new ServerInfo(); + ServerInfo infopanel = new ServerPrefs(); infopanel.Show(); } diff --git a/RBXLegacyLauncher/RBXLegacyLauncher/RBXLegacyLauncher.csproj b/RBXLegacyLauncher/RBXLegacyLauncher/RBXLegacyLauncher.csproj index 8e90031..1d5488c 100644 --- a/RBXLegacyLauncher/RBXLegacyLauncher/RBXLegacyLauncher.csproj +++ b/RBXLegacyLauncher/RBXLegacyLauncher/RBXLegacyLauncher.csproj @@ -80,9 +80,9 @@ SDKForm.cs - - - ServerInfo.cs + + + ServerPrefs.cs @@ -112,8 +112,8 @@ SDKForm.cs - - ServerInfo.cs + + ServerPrefs.cs diff --git a/RBXLegacyLauncher/RBXLegacyLauncher/ServerInfo.Designer.cs b/RBXLegacyLauncher/RBXLegacyLauncher/ServerInfo.Designer.cs deleted file mode 100644 index 6bad3fb..0000000 --- a/RBXLegacyLauncher/RBXLegacyLauncher/ServerInfo.Designer.cs +++ /dev/null @@ -1,54 +0,0 @@ -namespace RBXLegacyLauncher -{ - partial class ServerInfo - { - private System.ComponentModel.IContainer components = null; - /// true if managed resources should be disposed; otherwise, false. - protected override void Dispose(bool disposing) - { - if (disposing) { - if (components != null) { - components.Dispose(); - } - } - base.Dispose(disposing); - } - private void InitializeComponent() - { - System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(ServerInfo)); - this.textBox1 = new System.Windows.Forms.TextBox(); - this.SuspendLayout(); - // - // textBox1 - // - this.textBox1.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) - | System.Windows.Forms.AnchorStyles.Left) - | System.Windows.Forms.AnchorStyles.Right))); - this.textBox1.BackColor = System.Drawing.SystemColors.ControlLightLight; - this.textBox1.BorderStyle = System.Windows.Forms.BorderStyle.None; - this.textBox1.Location = new System.Drawing.Point(2, 3); - this.textBox1.Multiline = true; - this.textBox1.Name = "textBox1"; - this.textBox1.ReadOnly = true; - this.textBox1.Size = new System.Drawing.Size(501, 256); - this.textBox1.TabIndex = 0; - // - // ServerInfo - // - this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); - this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.AutoScroll = true; - this.BackColor = System.Drawing.SystemColors.ControlLightLight; - this.ClientSize = new System.Drawing.Size(504, 262); - this.Controls.Add(this.textBox1); - this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon"))); - this.MinimumSize = new System.Drawing.Size(520, 300); - this.Name = "ServerInfo"; - this.Text = "Server Info"; - this.Load += new System.EventHandler(this.ServerInfoLoad); - this.ResumeLayout(false); - this.PerformLayout(); - } - private System.Windows.Forms.TextBox textBox1; - } -} diff --git a/RBXLegacyLauncher/RBXLegacyLauncher/ServerPrefs.Designer.cs b/RBXLegacyLauncher/RBXLegacyLauncher/ServerPrefs.Designer.cs new file mode 100644 index 0000000..f0352a8 --- /dev/null +++ b/RBXLegacyLauncher/RBXLegacyLauncher/ServerPrefs.Designer.cs @@ -0,0 +1,405 @@ +namespace RBXLegacyLauncher +{ + partial class ServerPrefs + { + private System.ComponentModel.IContainer components = null; + /// true if managed resources should be disposed; otherwise, false. + protected override void Dispose(bool disposing) + { + if (disposing) { + if (components != null) { + components.Dispose(); + } + } + base.Dispose(disposing); + } + private void InitializeComponent() + { + System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(ServerPrefs)); + this.textBox1 = new System.Windows.Forms.TextBox(); + this.tabControl1 = new System.Windows.Forms.TabControl(); + this.tabPage1 = new System.Windows.Forms.TabPage(); + this.checkBox11 = new System.Windows.Forms.CheckBox(); + this.checkBox10 = new System.Windows.Forms.CheckBox(); + this.label45 = new System.Windows.Forms.Label(); + this.textBox7 = new System.Windows.Forms.TextBox(); + this.textBox3 = new System.Windows.Forms.TextBox(); + this.label29 = new System.Windows.Forms.Label(); + this.label3 = new System.Windows.Forms.Label(); + this.label2 = new System.Windows.Forms.Label(); + this.comboBox1 = new System.Windows.Forms.ComboBox(); + this.label1 = new System.Windows.Forms.Label(); + this.checkBox7 = new System.Windows.Forms.CheckBox(); + this.checkBox8 = new System.Windows.Forms.CheckBox(); + this.checkBox9 = new System.Windows.Forms.CheckBox(); + this.checkBox4 = new System.Windows.Forms.CheckBox(); + this.checkBox5 = new System.Windows.Forms.CheckBox(); + this.checkBox6 = new System.Windows.Forms.CheckBox(); + this.checkBox3 = new System.Windows.Forms.CheckBox(); + this.checkBox2 = new System.Windows.Forms.CheckBox(); + this.checkBox1 = new System.Windows.Forms.CheckBox(); + this.radioButton2 = new System.Windows.Forms.RadioButton(); + this.radioButton1 = new System.Windows.Forms.RadioButton(); + this.tabPage2 = new System.Windows.Forms.TabPage(); + this.label4 = new System.Windows.Forms.Label(); + this.textBox2 = new System.Windows.Forms.TextBox(); + this.tabControl1.SuspendLayout(); + this.tabPage1.SuspendLayout(); + this.tabPage2.SuspendLayout(); + this.SuspendLayout(); + // + // textBox1 + // + this.textBox1.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) + | System.Windows.Forms.AnchorStyles.Left) + | System.Windows.Forms.AnchorStyles.Right))); + this.textBox1.BackColor = System.Drawing.SystemColors.ControlLightLight; + this.textBox1.BorderStyle = System.Windows.Forms.BorderStyle.None; + this.textBox1.Location = new System.Drawing.Point(6, 6); + this.textBox1.Multiline = true; + this.textBox1.Name = "textBox1"; + this.textBox1.ReadOnly = true; + this.textBox1.Size = new System.Drawing.Size(473, 215); + this.textBox1.TabIndex = 0; + this.textBox1.TextChanged += new System.EventHandler(this.TextBox1TextChanged); + // + // tabControl1 + // + this.tabControl1.Controls.Add(this.tabPage1); + this.tabControl1.Controls.Add(this.tabPage2); + this.tabControl1.Location = new System.Drawing.Point(12, 12); + this.tabControl1.Name = "tabControl1"; + this.tabControl1.SelectedIndex = 0; + this.tabControl1.Size = new System.Drawing.Size(490, 247); + this.tabControl1.TabIndex = 1; + // + // tabPage1 + // + this.tabPage1.Controls.Add(this.textBox2); + this.tabPage1.Controls.Add(this.label4); + this.tabPage1.Controls.Add(this.checkBox11); + this.tabPage1.Controls.Add(this.checkBox10); + this.tabPage1.Controls.Add(this.label45); + this.tabPage1.Controls.Add(this.textBox7); + this.tabPage1.Controls.Add(this.textBox3); + this.tabPage1.Controls.Add(this.label29); + this.tabPage1.Controls.Add(this.label3); + this.tabPage1.Controls.Add(this.label2); + this.tabPage1.Controls.Add(this.comboBox1); + this.tabPage1.Controls.Add(this.label1); + this.tabPage1.Controls.Add(this.checkBox7); + this.tabPage1.Controls.Add(this.checkBox8); + this.tabPage1.Controls.Add(this.checkBox9); + this.tabPage1.Controls.Add(this.checkBox4); + this.tabPage1.Controls.Add(this.checkBox5); + this.tabPage1.Controls.Add(this.checkBox6); + this.tabPage1.Controls.Add(this.checkBox3); + this.tabPage1.Controls.Add(this.checkBox2); + this.tabPage1.Controls.Add(this.checkBox1); + this.tabPage1.Controls.Add(this.radioButton2); + this.tabPage1.Controls.Add(this.radioButton1); + this.tabPage1.Location = new System.Drawing.Point(4, 22); + this.tabPage1.Name = "tabPage1"; + this.tabPage1.Padding = new System.Windows.Forms.Padding(3); + this.tabPage1.Size = new System.Drawing.Size(482, 221); + this.tabPage1.TabIndex = 0; + this.tabPage1.Text = "PREFERENCES"; + this.tabPage1.UseVisualStyleBackColor = true; + this.tabPage1.Click += new System.EventHandler(this.TabPage1Click); + // + // checkBox11 + // + this.checkBox11.Checked = true; + this.checkBox11.CheckState = System.Windows.Forms.CheckState.Checked; + this.checkBox11.Enabled = false; + this.checkBox11.Location = new System.Drawing.Point(237, 204); + this.checkBox11.Name = "checkBox11"; + this.checkBox11.Size = new System.Drawing.Size(202, 17); + this.checkBox11.TabIndex = 51; + this.checkBox11.Text = "Enable UPnP (Universal Plug n\' Play)"; + this.checkBox11.UseVisualStyleBackColor = true; + // + // checkBox10 + // + this.checkBox10.Enabled = false; + this.checkBox10.Location = new System.Drawing.Point(237, 186); + this.checkBox10.Name = "checkBox10"; + this.checkBox10.Size = new System.Drawing.Size(175, 17); + this.checkBox10.TabIndex = 50; + this.checkBox10.Text = "Personal Building Server (PBS)"; + this.checkBox10.UseVisualStyleBackColor = true; + // + // label45 + // + this.label45.Location = new System.Drawing.Point(235, 65); + this.label45.Name = "label45"; + this.label45.Size = new System.Drawing.Size(26, 18); + this.label45.TabIndex = 49; + this.label45.Text = "Port"; + this.label45.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; + // + // textBox7 + // + this.textBox7.Location = new System.Drawing.Point(238, 84); + this.textBox7.Name = "textBox7"; + this.textBox7.Size = new System.Drawing.Size(237, 20); + this.textBox7.TabIndex = 48; + this.textBox7.Text = "53640"; + this.textBox7.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; + // + // textBox3 + // + this.textBox3.Location = new System.Drawing.Point(238, 125); + this.textBox3.Name = "textBox3"; + this.textBox3.Size = new System.Drawing.Size(237, 20); + this.textBox3.TabIndex = 47; + this.textBox3.Text = "12"; + this.textBox3.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; + // + // label29 + // + this.label29.Location = new System.Drawing.Point(230, 105); + this.label29.Name = "label29"; + this.label29.Size = new System.Drawing.Size(69, 18); + this.label29.TabIndex = 46; + this.label29.Text = "Player Limit"; + this.label29.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; + // + // label3 + // + this.label3.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.label3.Location = new System.Drawing.Point(236, 28); + this.label3.Name = "label3"; + this.label3.Size = new System.Drawing.Size(56, 14); + this.label3.TabIndex = 14; + this.label3.Text = "Chat Type"; + // + // label2 + // + this.label2.Font = new System.Drawing.Font("Microsoft Sans Serif", 10.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.label2.Location = new System.Drawing.Point(235, 3); + this.label2.Name = "label2"; + this.label2.Size = new System.Drawing.Size(89, 21); + this.label2.TabIndex = 13; + this.label2.Text = "General"; + // + // comboBox1 + // + this.comboBox1.FormattingEnabled = true; + this.comboBox1.Items.AddRange(new object[] { + "Classic", + "Bubble", + "Both"}); + this.comboBox1.Location = new System.Drawing.Point(238, 43); + this.comboBox1.Name = "comboBox1"; + this.comboBox1.Size = new System.Drawing.Size(238, 21); + this.comboBox1.TabIndex = 12; + // + // label1 + // + this.label1.Font = new System.Drawing.Font("Microsoft Sans Serif", 10.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.label1.Location = new System.Drawing.Point(6, 3); + this.label1.Name = "label1"; + this.label1.Size = new System.Drawing.Size(141, 21); + this.label1.TabIndex = 11; + this.label1.Text = "Allowed Gear Types"; + // + // checkBox7 + // + this.checkBox7.Enabled = false; + this.checkBox7.Location = new System.Drawing.Point(160, 102); + this.checkBox7.Name = "checkBox7"; + this.checkBox7.Size = new System.Drawing.Size(104, 17); + this.checkBox7.TabIndex = 10; + this.checkBox7.Text = "Building"; + this.checkBox7.UseVisualStyleBackColor = true; + // + // checkBox8 + // + this.checkBox8.Enabled = false; + this.checkBox8.Location = new System.Drawing.Point(160, 84); + this.checkBox8.Name = "checkBox8"; + this.checkBox8.Size = new System.Drawing.Size(104, 17); + this.checkBox8.TabIndex = 9; + this.checkBox8.Text = "Musical"; + this.checkBox8.UseVisualStyleBackColor = true; + // + // checkBox9 + // + this.checkBox9.Enabled = false; + this.checkBox9.Location = new System.Drawing.Point(160, 66); + this.checkBox9.Name = "checkBox9"; + this.checkBox9.Size = new System.Drawing.Size(104, 17); + this.checkBox9.TabIndex = 8; + this.checkBox9.Text = "Ranged"; + this.checkBox9.UseVisualStyleBackColor = true; + // + // checkBox4 + // + this.checkBox4.Enabled = false; + this.checkBox4.Location = new System.Drawing.Point(84, 102); + this.checkBox4.Name = "checkBox4"; + this.checkBox4.Size = new System.Drawing.Size(104, 17); + this.checkBox4.TabIndex = 7; + this.checkBox4.Text = "Transport"; + this.checkBox4.UseVisualStyleBackColor = true; + // + // checkBox5 + // + this.checkBox5.Enabled = false; + this.checkBox5.Location = new System.Drawing.Point(84, 84); + this.checkBox5.Name = "checkBox5"; + this.checkBox5.Size = new System.Drawing.Size(104, 17); + this.checkBox5.TabIndex = 6; + this.checkBox5.Text = "Explosives"; + this.checkBox5.UseVisualStyleBackColor = true; + // + // checkBox6 + // + this.checkBox6.Enabled = false; + this.checkBox6.Location = new System.Drawing.Point(84, 66); + this.checkBox6.Name = "checkBox6"; + this.checkBox6.Size = new System.Drawing.Size(104, 17); + this.checkBox6.TabIndex = 5; + this.checkBox6.Text = "Power ups"; + this.checkBox6.UseVisualStyleBackColor = true; + // + // checkBox3 + // + this.checkBox3.Enabled = false; + this.checkBox3.Location = new System.Drawing.Point(8, 102); + this.checkBox3.Name = "checkBox3"; + this.checkBox3.Size = new System.Drawing.Size(104, 17); + this.checkBox3.TabIndex = 4; + this.checkBox3.Text = "Social"; + this.checkBox3.UseVisualStyleBackColor = true; + // + // checkBox2 + // + this.checkBox2.Enabled = false; + this.checkBox2.Location = new System.Drawing.Point(8, 84); + this.checkBox2.Name = "checkBox2"; + this.checkBox2.Size = new System.Drawing.Size(104, 17); + this.checkBox2.TabIndex = 3; + this.checkBox2.Text = "Navigation"; + this.checkBox2.UseVisualStyleBackColor = true; + // + // checkBox1 + // + this.checkBox1.Enabled = false; + this.checkBox1.Location = new System.Drawing.Point(8, 66); + this.checkBox1.Name = "checkBox1"; + this.checkBox1.Size = new System.Drawing.Size(104, 17); + this.checkBox1.TabIndex = 2; + this.checkBox1.Text = "Melee"; + this.checkBox1.UseVisualStyleBackColor = true; + // + // radioButton2 + // + this.radioButton2.Location = new System.Drawing.Point(8, 44); + this.radioButton2.Name = "radioButton2"; + this.radioButton2.Size = new System.Drawing.Size(104, 16); + this.radioButton2.TabIndex = 1; + this.radioButton2.Text = "Custom"; + this.radioButton2.UseVisualStyleBackColor = true; + // + // radioButton1 + // + this.radioButton1.Checked = true; + this.radioButton1.Location = new System.Drawing.Point(8, 23); + this.radioButton1.Name = "radioButton1"; + this.radioButton1.Size = new System.Drawing.Size(104, 24); + this.radioButton1.TabIndex = 0; + this.radioButton1.TabStop = true; + this.radioButton1.Text = "All"; + this.radioButton1.UseVisualStyleBackColor = true; + // + // tabPage2 + // + this.tabPage2.Controls.Add(this.textBox1); + this.tabPage2.Location = new System.Drawing.Point(4, 22); + this.tabPage2.Name = "tabPage2"; + this.tabPage2.Padding = new System.Windows.Forms.Padding(3); + this.tabPage2.Size = new System.Drawing.Size(482, 221); + this.tabPage2.TabIndex = 1; + this.tabPage2.Text = "INFORMATION"; + this.tabPage2.UseVisualStyleBackColor = true; + // + // label4 + // + this.label4.Location = new System.Drawing.Point(226, 146); + this.label4.Name = "label4"; + this.label4.Size = new System.Drawing.Size(94, 18); + this.label4.TabIndex = 52; + this.label4.Text = "Respawn Time"; + this.label4.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; + // + // textBox2 + // + this.textBox2.Location = new System.Drawing.Point(237, 164); + this.textBox2.Name = "textBox2"; + this.textBox2.Size = new System.Drawing.Size(237, 20); + this.textBox2.TabIndex = 53; + this.textBox2.Text = "5"; + this.textBox2.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; + // + // ServerPrefs + // + this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.AutoScroll = true; + this.BackColor = System.Drawing.SystemColors.ControlLightLight; + this.ClientSize = new System.Drawing.Size(514, 271); + this.Controls.Add(this.tabControl1); + this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow; + this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon"))); + this.MinimumSize = new System.Drawing.Size(520, 300); + this.Name = "ServerPrefs"; + this.Text = "Server Preferences"; + this.Load += new System.EventHandler(this.ServerInfoLoad); + this.tabControl1.ResumeLayout(false); + this.tabPage1.ResumeLayout(false); + this.tabPage1.PerformLayout(); + this.tabPage2.ResumeLayout(false); + this.tabPage2.PerformLayout(); + this.ResumeLayout(false); + } + private System.Windows.Forms.Label label4; + private System.Windows.Forms.TextBox textBox2; + private System.Windows.Forms.Label label29; + private System.Windows.Forms.TextBox textBox3; + private System.Windows.Forms.TextBox textBox7; + private System.Windows.Forms.Label label45; + private System.Windows.Forms.CheckBox checkBox10; + private System.Windows.Forms.CheckBox checkBox11; + private System.Windows.Forms.Label label1; + private System.Windows.Forms.ComboBox comboBox1; + private System.Windows.Forms.Label label2; + private System.Windows.Forms.Label label3; + private System.Windows.Forms.RadioButton radioButton1; + private System.Windows.Forms.RadioButton radioButton2; + private System.Windows.Forms.CheckBox checkBox1; + private System.Windows.Forms.CheckBox checkBox2; + private System.Windows.Forms.CheckBox checkBox3; + private System.Windows.Forms.CheckBox checkBox6; + private System.Windows.Forms.CheckBox checkBox5; + private System.Windows.Forms.CheckBox checkBox4; + private System.Windows.Forms.CheckBox checkBox9; + private System.Windows.Forms.CheckBox checkBox8; + private System.Windows.Forms.CheckBox checkBox7; + private System.Windows.Forms.TabPage tabPage2; + private System.Windows.Forms.TabPage tabPage1; + private System.Windows.Forms.TabControl tabControl1; + private System.Windows.Forms.TextBox textBox1; + + void TextBox1TextChanged(object sender, System.EventArgs e) + { + + } + + void TabPage1Click(object sender, System.EventArgs e) + { + + } + } +} diff --git a/RBXLegacyLauncher/RBXLegacyLauncher/ServerInfo.cs b/RBXLegacyLauncher/RBXLegacyLauncher/ServerPrefs.cs similarity index 72% rename from RBXLegacyLauncher/RBXLegacyLauncher/ServerInfo.cs rename to RBXLegacyLauncher/RBXLegacyLauncher/ServerPrefs.cs index 98f615e..6cc958a 100644 --- a/RBXLegacyLauncher/RBXLegacyLauncher/ServerInfo.cs +++ b/RBXLegacyLauncher/RBXLegacyLauncher/ServerPrefs.cs @@ -5,14 +5,14 @@ using System.Net; namespace RBXLegacyLauncher { - public partial class ServerInfo : Form + public partial class ServerPrefs : Form { - public ServerInfo() + public ServerPrefs() { InitializeComponent(); } - void ServerInfoLoad(object sender, EventArgs e) + void ServerPrefsLoad(object sender, EventArgs e) { textBox1.AppendText("Client: " + GlobalVars.SelectedClient); textBox1.AppendText(Environment.NewLine); @@ -64,5 +64,31 @@ namespace RBXLegacyLauncher return ipAddress; } + + void RadioButton1CheckedChanged(object sender, EventArgs e) + { + checkBox1.Enabled = false; + checkBox2.Enabled = false; + checkBox3.Enabled = false; + checkBox4.Enabled = false; + checkBox5.Enabled = false; + checkBox6.Enabled = false; + checkBox7.Enabled = false; + checkBox8.Enabled = false; + checkBox9.Enabled = false; + } + + void RadioButton2CheckedChanged(object sender, EventArgs e) + { + checkBox1.Enabled = true; + checkBox2.Enabled = true; + checkBox3.Enabled = true; + checkBox4.Enabled = true; + checkBox5.Enabled = true; + checkBox6.Enabled = true; + checkBox7.Enabled = true; + checkBox8.Enabled = true; + checkBox9.Enabled = true; + } } } diff --git a/RBXLegacyLauncher/RBXLegacyLauncher/ServerInfo.resx b/RBXLegacyLauncher/RBXLegacyLauncher/ServerPrefs.resx similarity index 100% rename from RBXLegacyLauncher/RBXLegacyLauncher/ServerInfo.resx rename to RBXLegacyLauncher/RBXLegacyLauncher/ServerPrefs.resx