diff --git a/CSMPFunctions.lua b/CSMPFunctions.lua index 57b8d1d..3172645 100644 --- a/CSMPFunctions.lua +++ b/CSMPFunctions.lua @@ -95,13 +95,13 @@ function SetRBXLegacyVersion(Version) resize() end)) wait() -- intalizing - game.GuiRoot.ScoreHud:Remove() -- no legacy scorehud, allow for the new one + game.GuiRoot.ScoreHud:Remove() elseif (rbxlegacyversion == 9) then -- Delta Omega settings().Rendering.FrameRateManager = 2 pcall(function() game:GetService("ScriptContext").ScriptsDisabled = false end) pcall(function() settings().Diagnostics:LegacyScriptMode() end) wait() -- intalizing - game.GuiRoot.ScoreHud:Remove() -- no legacy scorehud, allow for the new one + game.GuiRoot.ScoreHud:Remove() elseif (rbxlegacyversion == 10) then -- Omega settings().Rendering.FrameRateManager = 2 pcall(function() game:GetService("ScriptContext").ScriptsDisabled = false end) @@ -235,12 +235,12 @@ function LoadCharacterNew(playerApp,newChar) elseif (customtype.Value == 8) then if (rbxlegacyversion > 7) then pcall(function() - local newPart = game.Workspace:InsertContent("rbxasset://../../../charcustom/bodies/"..newVal.MeshIndex.Value.."/"..newVal.Value) + local newPart = game.Workspace:InsertContent("rbxasset://../../../charcustom/bodies/"..meshindex.Value.."/"..newVal.Value) if newPart[1] then if newPart[1].className == "SpecialMesh" then newWaitForChild(newVal,"MeshIndex") local meshindex = newVal:FindFirstChild("MeshIndex") - newPart[1].Parent = charparts[newVal.MeshIndex.Value] + newPart[1].Parent = charparts[meshindex.Value] else newPart[1]:remove() end @@ -799,7 +799,7 @@ function CSSolo(UserID,PlayerName,Hat1ID,Hat2ID,Hat3ID,HeadColorID,TorsoColorID, 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) - rbxlegacyversion = 7 + rbxlegacyversion = 8 settings().Rendering.FrameRateManager = 2 game:GetService("RunService"):run() local plr = game.Players:CreateLocalPlayer(UserID) diff --git a/RBXLegacyLauncher/RBXLegacyLauncher/MainForm.Designer.cs b/RBXLegacyLauncher/RBXLegacyLauncher/MainForm.Designer.cs index c731001..0f6b485 100644 --- a/RBXLegacyLauncher/RBXLegacyLauncher/MainForm.Designer.cs +++ b/RBXLegacyLauncher/RBXLegacyLauncher/MainForm.Designer.cs @@ -59,7 +59,6 @@ namespace RBXLegacyLauncher this.label29 = new System.Windows.Forms.Label(); this.label40 = new System.Windows.Forms.Label(); this.button20 = new System.Windows.Forms.Button(); - this.button18 = 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(); @@ -92,6 +91,7 @@ namespace RBXLegacyLauncher this.tabPage8 = new System.Windows.Forms.TabPage(); this.richTextBox2 = new System.Windows.Forms.RichTextBox(); this.tabPage4 = new System.Windows.Forms.TabPage(); + this.label2 = new System.Windows.Forms.Label(); this.label11 = new System.Windows.Forms.Label(); this.label10 = new System.Windows.Forms.Label(); this.label9 = new System.Windows.Forms.Label(); @@ -118,7 +118,6 @@ namespace RBXLegacyLauncher this.label27 = new System.Windows.Forms.Label(); this.label28 = new System.Windows.Forms.Label(); this.textBox5 = new System.Windows.Forms.TextBox(); - this.label2 = new System.Windows.Forms.Label(); ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).BeginInit(); this.tabControl1.SuspendLayout(); this.tabPage1.SuspendLayout(); @@ -320,7 +319,6 @@ namespace RBXLegacyLauncher this.tabPage2.Controls.Add(this.label29); this.tabPage2.Controls.Add(this.label40); this.tabPage2.Controls.Add(this.button20); - this.tabPage2.Controls.Add(this.button18); this.tabPage2.Controls.Add(this.label32); this.tabPage2.Controls.Add(this.label20); this.tabPage2.Controls.Add(this.label19); @@ -392,16 +390,6 @@ namespace RBXLegacyLauncher this.button20.UseVisualStyleBackColor = true; this.button20.Click += new System.EventHandler(this.Button20Click); // - // button18 - // - this.button18.Location = new System.Drawing.Point(144, 229); - this.button18.Name = "button18"; - this.button18.Size = new System.Drawing.Size(126, 51); - this.button18.TabIndex = 20; - this.button18.Text = "START SERVER IN NOGRAPHICS MODE"; - this.button18.UseVisualStyleBackColor = true; - this.button18.Click += new System.EventHandler(this.Button18Click); - // // label32 // this.label32.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); @@ -436,9 +424,9 @@ namespace RBXLegacyLauncher // this.button2.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left) | System.Windows.Forms.AnchorStyles.Right))); - this.button2.Location = new System.Drawing.Point(12, 229); + this.button2.Location = new System.Drawing.Point(6, 229); this.button2.Name = "button2"; - this.button2.Size = new System.Drawing.Size(126, 51); + this.button2.Size = new System.Drawing.Size(268, 51); this.button2.TabIndex = 2; this.button2.Text = "START SERVER"; this.button2.UseVisualStyleBackColor = true; @@ -749,6 +737,15 @@ namespace RBXLegacyLauncher this.tabPage4.ToolTipText = "About RBXLegacy"; this.tabPage4.UseVisualStyleBackColor = true; // + // label2 + // + this.label2.Location = new System.Drawing.Point(43, 265); + this.label2.Name = "label2"; + this.label2.Size = new System.Drawing.Size(322, 16); + this.label2.TabIndex = 7; + this.label2.Text = "RBXLegacy is: Bitl, Carrot, iago, winsupermario1234, and CPunch."; + this.label2.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; + // // label11 // this.label11.Location = new System.Drawing.Point(206, 73); @@ -996,15 +993,6 @@ namespace RBXLegacyLauncher this.textBox5.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; this.textBox5.TextChanged += new System.EventHandler(this.TextBox5TextChanged); // - // label2 - // - this.label2.Location = new System.Drawing.Point(43, 265); - this.label2.Name = "label2"; - this.label2.Size = new System.Drawing.Size(322, 16); - this.label2.TabIndex = 7; - this.label2.Text = "RBXLegacy is: Bitl, Carrot, iago, winsupermario1234, and CPunch."; - this.label2.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; - // // MainForm // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); @@ -1070,7 +1058,6 @@ namespace RBXLegacyLauncher private System.Windows.Forms.TabPage tabPage7; private System.Windows.Forms.Button button20; private System.Windows.Forms.Button button19; - private System.Windows.Forms.Button button18; private System.Windows.Forms.Button button16; private System.Windows.Forms.Button button17; private System.Windows.Forms.Button button12; diff --git a/RBXLegacyLauncher/RBXLegacyLauncher/MainForm.cs b/RBXLegacyLauncher/RBXLegacyLauncher/MainForm.cs index 90f55ea..8e820cb 100644 --- a/RBXLegacyLauncher/RBXLegacyLauncher/MainForm.cs +++ b/RBXLegacyLauncher/RBXLegacyLauncher/MainForm.cs @@ -522,17 +522,6 @@ namespace RBXLegacyLauncher listBox4.Items.AddRange(lines_ports); } - void Button18Click(object sender, EventArgs e) - { - WriteConfigValues(); - StartServerNo3D(); - - if (GlobalVars.CloseOnLaunch == true) - { - this.WindowState = FormWindowState.Minimized; - } - } - void Button19Click(object sender, EventArgs e) { DialogResult result = MessageBox.Show("Note: If the health bar or scoreboard don't appear, just reset your character. If your character does not move or your character lags after the client window is loaded, just open the server window then minimize it.","RBXLegacy Launcher - Play Solo", MessageBoxButtons.OK, MessageBoxIcon.Information);