diff --git a/CSMPFunctions.lua b/CSMPFunctions.lua index 4334204..4f99350 100644 --- a/CSMPFunctions.lua +++ b/CSMPFunctions.lua @@ -725,7 +725,16 @@ function CSConnect(UserID,ServerIP,ServerPort,PlayerName,Hat1ID,Hat2ID,Hat3ID,He client.ConnectionRejected:connect(rejected) client.ConnectionFailed:connect(failed) client:Connect(ServerIP,ServerPort, 0, 20) - end) + if (rbxlegacyversion == 1) then + game.GuiRoot.MainMenu["Toolbox"]:Remove() + game.GuiRoot.MainMenu["Edit Mode"]:Remove() + game.GuiRoot.ChatHud:Remove() + game.GuiRoot.RightPalette.ReportAbuse:Remove() + elseif (rbxlegacyversion == 2) then + game.GuiRoot.ChatHud:Remove() + game.GuiRoot.RightPalette.ReportAbuse:Remove() + end + end) if not suc then local x = Instance.new("Message") @@ -790,7 +799,13 @@ 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) - --We are using a late 2009 client + -- Fake us using 2011. + rbxlegacyversion = 7 + --We are using a late 2009 client. + settings().Rendering.FrameRateManager = 2 + settings().Network.DataSendRate = 30 + settings().Network.PhysicsSendRate = 20 + settings().Network.ReceiveRate = 60 game:GetService("RunService"):run() local plr = game.Players:CreateLocalPlayer(UserID) plr.Name = PlayerName @@ -798,10 +813,15 @@ function CS3DView(UserID,PlayerName,Hat1ID,Hat2ID,Hat3ID,HeadColorID,TorsoColorI pcall(function() plr:SetUnder13(false) end) pcall(function() plr:SetAccountAge(365) end) plr.CharacterAppearance=0 + game.GuiRoot.MainMenu:Remove() + game.GuiRoot.ScoreHud:Remove() + game.GuiRoot.ChatHud:Remove() + game.GuiRoot.RightPalette.ReportAbuse:Remove() + game.GuiRoot.ChatMenuPanel:Remove() InitalizeClientAppearance(plr,Hat1ID,Hat2ID,Hat3ID,HeadColorID,TorsoColorID,LeftArmColorID,RightArmColorID,LeftLegColorID,RightLegColorID,TShirtID,ShirtID,PantsID,FaceID,HeadID,TorsoID,RArmID,LArmID,RLegID,LLegID) - LoadCharacterNew3DView(newWaitForChild(plr,"Appearance"),plr.Character) + LoadCharacterNew(newWaitForChild(plr,"Appearance"),plr.Character) + wait(1) game:GetService("NetworkClient") - game:GetService("ScriptContext").ScriptsDisabled = true end _G.SetRBXLegacyVersion=SetRBXLegacyVersion diff --git a/RBXLegacyLauncher/RBXLegacyLauncher/CharacterCustomization.Designer.cs b/RBXLegacyLauncher/RBXLegacyLauncher/CharacterCustomization.Designer.cs index 49d09e4..ff0bc62 100644 --- a/RBXLegacyLauncher/RBXLegacyLauncher/CharacterCustomization.Designer.cs +++ b/RBXLegacyLauncher/RBXLegacyLauncher/CharacterCustomization.Designer.cs @@ -115,6 +115,7 @@ namespace RBXLegacyLauncher this.label3 = new System.Windows.Forms.Label(); this.label2 = new System.Windows.Forms.Label(); this.textBox2 = new System.Windows.Forms.TextBox(); + this.button4 = new System.Windows.Forms.Button(); this.tabControl1.SuspendLayout(); this.tabPage1.SuspendLayout(); this.tabControl2.SuspendLayout(); @@ -962,12 +963,23 @@ namespace RBXLegacyLauncher this.textBox2.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; this.textBox2.TextChanged += new System.EventHandler(this.TextBox2TextChanged); // + // button4 + // + this.button4.Location = new System.Drawing.Point(200, 288); + this.button4.Name = "button4"; + this.button4.Size = new System.Drawing.Size(75, 23); + this.button4.TabIndex = 49; + this.button4.Text = "3D Preview"; + this.button4.UseVisualStyleBackColor = true; + this.button4.Click += new System.EventHandler(this.Button4Click); + // // CharacterCustomization // 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(473, 293); + this.ClientSize = new System.Drawing.Size(473, 314); + this.Controls.Add(this.button4); this.Controls.Add(this.tabControl1); this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow; this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon"))); @@ -991,6 +1003,7 @@ namespace RBXLegacyLauncher this.tabPage4.PerformLayout(); this.ResumeLayout(false); } + private System.Windows.Forms.Button button4; private System.Windows.Forms.ListBox listBox5; private System.Windows.Forms.PictureBox pictureBox5; private System.Windows.Forms.ListBox listBox4; diff --git a/RBXLegacyLauncher/RBXLegacyLauncher/CharacterCustomization.cs b/RBXLegacyLauncher/RBXLegacyLauncher/CharacterCustomization.cs index daf34a0..01794b1 100644 --- a/RBXLegacyLauncher/RBXLegacyLauncher/CharacterCustomization.cs +++ b/RBXLegacyLauncher/RBXLegacyLauncher/CharacterCustomization.cs @@ -7,9 +7,12 @@ * To change this template use Tools | Options | Coding | Edit Standard Headers. */ using System; +using System.Collections.Generic; using System.Drawing; using System.Windows.Forms; using System.IO; +using System.Diagnostics; +using System.Threading; using System.Reflection; using System.Security.Cryptography; using System.Text; @@ -1272,5 +1275,46 @@ namespace RBXLegacyLauncher } } } + + void Button4Click(object sender, EventArgs e) + { + LauncherFuncs.WriteConfigValues("config.txt"); + Start3DView(); + } + + void Start3DView() + { + string mapfile = Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location) + "\\charcustom\\3DView\\content\\fonts\\3DView.rbxl"; + string rbxexe = Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location) + "\\charcustom\\3DView\\3DView.exe"; + string quote = "\""; + string args = ""; + string HatIDOffline1 = GlobalVars.Custom_Hat1ID_Offline; + string HatIDOffline2 = GlobalVars.Custom_Hat2ID_Offline; + string HatIDOffline3 = GlobalVars.Custom_Hat3ID_Offline; + if (GlobalVars.UsesPlayerName == true && GlobalVars.UsesID == true) + { + args = quote + mapfile + "\" -script \"dofile('" + GlobalVars.DefaultScript + "'); _G.CS3DView(" + GlobalVars.UserID + ",'" + GlobalVars.PlayerName + "','" + HatIDOffline1 + "','" + HatIDOffline2 + "','" + HatIDOffline3 + "'," + GlobalVars.HeadColorID + "," + GlobalVars.TorsoColorID + "," + GlobalVars.LeftArmColorID + "," + GlobalVars.RightArmColorID + "," + GlobalVars.LeftLegColorID + "," + GlobalVars.RightLegColorID + ",'" + GlobalVars.Custom_TShirt + "','" + GlobalVars.Custom_Shirt + "','" + GlobalVars.Custom_Pants + "','" + GlobalVars.FaceID + "','" + GlobalVars.HeadID + "','" + GlobalVars.TorsoID + "','" + GlobalVars.RightArmID + "','" + GlobalVars.LeftArmID + "','" + GlobalVars.RightLegID + "','" + GlobalVars.LeftLegID + "','" + GlobalVars.Custom_IconType + "');" + quote; + } + else if (GlobalVars.UsesPlayerName == false && GlobalVars.UsesID == true) + { + args = quote + mapfile + "\" -script \"dofile('" + GlobalVars.DefaultScript + "'); _G.CS3DView(" + GlobalVars.UserID + ",'Player','" + HatIDOffline1 + "','" + HatIDOffline2 + "','" + HatIDOffline3 + "'," + GlobalVars.HeadColorID + "," + GlobalVars.TorsoColorID + "," + GlobalVars.LeftArmColorID + "," + GlobalVars.RightArmColorID + "," + GlobalVars.LeftLegColorID + "," + GlobalVars.RightLegColorID + ",'" + GlobalVars.Custom_TShirt + "','" + GlobalVars.Custom_Shirt + "','" + GlobalVars.Custom_Pants + "','" + GlobalVars.FaceID + "','" + GlobalVars.HeadID + "','" + GlobalVars.TorsoID + "','" + GlobalVars.RightArmID + "','" + GlobalVars.LeftArmID + "','" + GlobalVars.RightLegID + "','" + GlobalVars.LeftLegID + "','" + GlobalVars.Custom_IconType + "');" + quote; + } + else if (GlobalVars.UsesPlayerName == true && GlobalVars.UsesID == false) + { + args = quote + mapfile + "\" -script \"dofile('" + GlobalVars.DefaultScript + "'); _G.CS3DView(0,'" + GlobalVars.PlayerName + "','" + HatIDOffline1 + "','" + HatIDOffline2 + "','" + HatIDOffline3 + "'," + GlobalVars.HeadColorID + "," + GlobalVars.TorsoColorID + "," + GlobalVars.LeftArmColorID + "," + GlobalVars.RightArmColorID + "," + GlobalVars.LeftLegColorID + "," + GlobalVars.RightLegColorID + ",'" + GlobalVars.Custom_TShirt + "','" + GlobalVars.Custom_Shirt + "','" + GlobalVars.Custom_Pants + "','" + GlobalVars.FaceID + "','" + GlobalVars.HeadID + "','" + GlobalVars.TorsoID + "','" + GlobalVars.RightArmID + "','" + GlobalVars.LeftArmID + "','" + GlobalVars.RightLegID + "','" + GlobalVars.LeftLegID + "','" + GlobalVars.Custom_IconType + "');" + quote; + } + else if (GlobalVars.UsesPlayerName == false && GlobalVars.UsesID == false ) + { + args = quote + mapfile + "\" -script \"dofile('" + GlobalVars.DefaultScript + "'); _G.CS3DView(0,'Player','" + HatIDOffline1 + "','" + HatIDOffline2 + "','" + HatIDOffline3 + "'," + GlobalVars.HeadColorID + "," + GlobalVars.TorsoColorID + "," + GlobalVars.LeftArmColorID + "," + GlobalVars.RightArmColorID + "," + GlobalVars.LeftLegColorID + "," + GlobalVars.RightLegColorID + ",'" + GlobalVars.Custom_TShirt + "','" + GlobalVars.Custom_Shirt + "','" + GlobalVars.Custom_Pants + "','" + GlobalVars.FaceID + "','" + GlobalVars.HeadID + "','" + GlobalVars.TorsoID + "','" + GlobalVars.RightArmID + "','" + GlobalVars.LeftArmID + "','" + GlobalVars.RightLegID + "','" + GlobalVars.LeftLegID + "','" + GlobalVars.Custom_IconType + "');" + quote; + } + try + { + Process.Start(rbxexe, args); + } + catch (Exception ex) + { + DialogResult result2 = MessageBox.Show("Failed to launch RBXLegacy. (Error: " + ex.Message + ")","RBXLegacy Launcher - Error", MessageBoxButtons.OK, MessageBoxIcon.Error); + } + } } } diff --git a/RBXLegacyLauncher/RBXLegacyLauncher/CharacterCustomization.resx b/RBXLegacyLauncher/RBXLegacyLauncher/CharacterCustomization.resx index 5927ec1..c77d8f8 100644 --- a/RBXLegacyLauncher/RBXLegacyLauncher/CharacterCustomization.resx +++ b/RBXLegacyLauncher/RBXLegacyLauncher/CharacterCustomization.resx @@ -121,7 +121,7 @@ iVBORw0KGgoAAAANSUhEUgAAAaQAAAGkCAYAAAB+TFE1AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAADsEAAA7BAbiRa+0AACBHSURBVHhe7d0Lc9RG2obh7///sPXuJgRztGEhB+wAjrEB + YQUAAAAJcEhZcwAADsAAAA7AAWrWiQkAACBHSURBVHhe7d0Lc9RG2obh7///sPXuJgRztGEhB+wAjrEB 29hgG+arWzVNTRwhtWZG0iv1fVV1hXg0OrRU/YxO3f+3kCQpAANJkhSCgSRJCsFAkiSFYCBJkkIwkCRJ IRhIkqQQDCRJUggGkiQpBANJkhSCgSRJCsFAkiSFYCBJkkIwkCRJIRhIkqQQDCRJUggGkiQpBANJkhSC gSRJCsFAkiSFYCBJkkIwkCRJIRhIkqQQDCRJUggGkiQpBANJkhSCgSRJCsFAkiSFYCBJkkIwkCRJIRhI @@ -265,7 +265,7 @@ iVBORw0KGgoAAAANSUhEUgAAAaQAAAGkCAYAAAB+TFE1AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAADr0AAA69AUf7kK0AACBHSURBVHhe7d0Lc9RG2obh7///sPXuJgRztGEhB+wAjrEB + YQUAAAAJcEhZcwAADrwAAA68AZW8ckkAACBHSURBVHhe7d0Lc9RG2obh7///sPXuJgRztGEhB+wAjrEB 29hgG+arWzVNTRwhtWZG0iv1fVV1hXg0OrRU/YxO3f+3kCQpAANJkhSCgSRJCsFAkiSFYCBJkkIwkCRJ IRhIkqQQDCRJUggGkiQpBANJkhSCgSRJCsFAkiSFYCBJkkIwkCRJIRhIkqQQDCRJUggGkiQpBANJkhSC gSRJCsFAkiSFYCBJkkIwkCRJIRhIkqQQDCRJUggGkiQpBANJkhSCgSRJCsFAkiSFYCBJkkIwkCRJIRhI @@ -409,7 +409,7 @@ iVBORw0KGgoAAAANSUhEUgAAAaQAAAGkCAYAAAB+TFE1AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAADr0AAA69AUf7kK0AACBHSURBVHhe7d0Lc9RG2obh7///sPXuJgRztGEhB+wAjrEB + YQUAAAAJcEhZcwAADrwAAA68AZW8ckkAACBHSURBVHhe7d0Lc9RG2obh7///sPXuJgRztGEhB+wAjrEB 29hgG+arWzVNTRwhtWZG0iv1fVV1hXg0OrRU/YxO3f+3kCQpAANJkhSCgSRJCsFAkiSFYCBJkkIwkCRJ IRhIkqQQDCRJUggGkiQpBANJkhSCgSRJCsFAkiSFYCBJkkIwkCRJIRhIkqQQDCRJUggGkiQpBANJkhSC gSRJCsFAkiSFYCBJkkIwkCRJIRhIkqQQDCRJUggGkiQpBANJkhSCgSRJCsFAkiSFYCBJkkIwkCRJIRhI @@ -553,7 +553,7 @@ iVBORw0KGgoAAAANSUhEUgAAAaQAAAGkCAYAAAB+TFE1AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAADr0AAA69AUf7kK0AACBHSURBVHhe7d0Lc9RG2obh7///sPXuJgRztGEhB+wAjrEB + YQUAAAAJcEhZcwAADrwAAA68AZW8ckkAACBHSURBVHhe7d0Lc9RG2obh7///sPXuJgRztGEhB+wAjrEB 29hgG+arWzVNTRwhtWZG0iv1fVV1hXg0OrRU/YxO3f+3kCQpAANJkhSCgSRJCsFAkiSFYCBJkkIwkCRJ IRhIkqQQDCRJUggGkiQpBANJkhSCgSRJCsFAkiSFYCBJkkIwkCRJIRhIkqQQDCRJUggGkiQpBANJkhSC gSRJCsFAkiSFYCBJkkIwkCRJIRhIkqQQDCRJUggGkiQpBANJkhSCgSRJCsFAkiSFYCBJkkIwkCRJIRhI @@ -697,7 +697,7 @@ iVBORw0KGgoAAAANSUhEUgAAAaQAAAGkCAYAAAB+TFE1AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAADr0AAA69AUf7kK0AACBHSURBVHhe7d0Lc9RG2obh7///sPXuJgRztGEhB+wAjrEB + YQUAAAAJcEhZcwAADrwAAA68AZW8ckkAACBHSURBVHhe7d0Lc9RG2obh7///sPXuJgRztGEhB+wAjrEB 29hgG+arWzVNTRwhtWZG0iv1fVV1hXg0OrRU/YxO3f+3kCQpAANJkhSCgSRJCsFAkiSFYCBJkkIwkCRJ IRhIkqQQDCRJUggGkiQpBANJkhSCgSRJCsFAkiSFYCBJkkIwkCRJIRhIkqQQDCRJUggGkiQpBANJkhSC gSRJCsFAkiSFYCBJkkIwkCRJIRhIkqQQDCRJUggGkiQpBANJkhSCgSRJCsFAkiSFYCBJkkIwkCRJIRhI