diff --git a/Novetus/NovetusCore/Classes/VCPPRedistInstallationDetector.cs b/Novetus/NovetusCore/Classes/VCPPRedistInstallationDetector.cs index 16c0cef..dd1a3c7 100644 --- a/Novetus/NovetusCore/Classes/VCPPRedistInstallationDetector.cs +++ b/Novetus/NovetusCore/Classes/VCPPRedistInstallationDetector.cs @@ -82,7 +82,7 @@ namespace Novetus.Core /// private static Dictionary _VCRedistToRedistKeysMap = new Dictionary() { - [VCPPRedist.VCPP2005] = new RedistInformation(RedistKeyLocation.Products, new[] { "b25099274a207264182f8181add555d0" }), + [VCPPRedist.VCPP2005] = new RedistInformation(RedistKeyLocation.Products, new[] { "b25099274a207264182f8181add555d0", "c1c4f01781cc94c4c8fb1542c0981a2a" }), [VCPPRedist.VCPP2008] = new RedistInformation(RedistKeyLocation.Products, new[] { "6E815EB96CCE9A53884E7857C57002F0" }), [VCPPRedist.VCPP2012] = new RedistInformation(RedistKeyLocation.Dependencies, new[] { "{33d1fd90-4274-48a1-9bc1-97e33d9c2d6f}", "{95716cce-fc71-413f-8ad5-56c2892d4b3a}" }) }; diff --git a/Novetus/NovetusCore/StorageAndFunctions/ClientManagement.cs b/Novetus/NovetusCore/StorageAndFunctions/ClientManagement.cs index def06a8..be14c28 100644 --- a/Novetus/NovetusCore/StorageAndFunctions/ClientManagement.cs +++ b/Novetus/NovetusCore/StorageAndFunctions/ClientManagement.cs @@ -1530,7 +1530,7 @@ namespace Novetus.Core case ScriptType.Studio: return "Studio"; case ScriptType.OutfitView: - return "3D Preview"; + return "Avatar 3D Preview"; default: return "N/A"; } diff --git a/Novetus/NovetusCore/StorageAndFunctions/SecurityFuncs.cs b/Novetus/NovetusCore/StorageAndFunctions/SecurityFuncs.cs index 8059a5e..3e3d9c2 100644 --- a/Novetus/NovetusCore/StorageAndFunctions/SecurityFuncs.cs +++ b/Novetus/NovetusCore/StorageAndFunctions/SecurityFuncs.cs @@ -142,7 +142,6 @@ namespace Novetus.Core SetWindowText(exe.MainWindowHandle, "Novetus Avatar 3D Preview " + GlobalVars.ProgramInformation.Version + " - " + clientname + " " - + ScriptFuncs.Generator.GetNameForType(type) + RandomStringTitle()); break; default: diff --git a/Novetus/NovetusLauncher/Forms/LauncherForm/LauncherFormShared.cs b/Novetus/NovetusLauncher/Forms/LauncherForm/LauncherFormShared.cs index 10feeee..45bc5d6 100644 --- a/Novetus/NovetusLauncher/Forms/LauncherForm/LauncherFormShared.cs +++ b/Novetus/NovetusLauncher/Forms/LauncherForm/LauncherFormShared.cs @@ -158,7 +158,7 @@ namespace NovetusLauncher string text = "Novetus has detected that the " + name + " are not installed." + "\n\nIt is recomended to download these dependencies from the Microsoft website." - + "\n\nInstalling these will prevent errors upon starting up a client, like 'side-by-side configuration' errors."; + + "Installing these will prevent errors upon starting up a client, like 'side-by-side configuration' errors."; MessageBox.Show(text, "Novetus - Dependency Warning", MessageBoxButtons.OK, MessageBoxIcon.Warning); } diff --git a/changelog.txt b/changelog.txt index 41d5ddc..ef6525d 100644 --- a/changelog.txt +++ b/changelog.txt @@ -1,3 +1,9 @@ +EDGE Snapshot v23.8731.25671.2 +Fixes: +- Improved the look of the 3D Preview on later clients. +- Fixed various issues related to the 3D Preview. +- Novetus now detects more VC++ 2005 redistributable installations. +---------------------------------------------------------------------------- EDGE Snapshot v23.8731.22692.1 Enhancements: - Play Solo now has its own dedicated server component, much like the original Roblox feature. This means scripts in Play Solo are far more accurate to how they're depicted in multiplayer sessions. diff --git a/scripts/game/2009L/CSMPFunctions.lua b/scripts/game/2009L/CSMPFunctions.lua index 6401058..49f240c 100644 --- a/scripts/game/2009L/CSMPFunctions.lua +++ b/scripts/game/2009L/CSMPFunctions.lua @@ -769,6 +769,13 @@ function CS3DView(UserID,PlayerName,Hat1ID,Hat2ID,Hat3ID,HeadColorID,TorsoColorI plr.Character.Animate:remove() plr.Character.Health:remove() plr.Character.Sound:remove() + plr.Character.RobloxTeam:remove() + + game.GuiRoot.RightPalette:remove() + game.GuiRoot.ChatMenuPanel:remove() + game.GuiRoot.HealthHud:remove() + game.GuiRoot.ScoreHud:remove() + game.GuiRoot.MainMenu:remove() local target = game.Workspace.Base.SpawnLocation local camera = game.Workspace.CurrentCamera diff --git a/scripts/game/2010L/CSMPFunctions.lua b/scripts/game/2010L/CSMPFunctions.lua index 79cc101..23c2026 100644 --- a/scripts/game/2010L/CSMPFunctions.lua +++ b/scripts/game/2010L/CSMPFunctions.lua @@ -776,6 +776,16 @@ function CS3DView(UserID,PlayerName,Hat1ID,Hat2ID,Hat3ID,HeadColorID,TorsoColorI InitalizeClientAppearance(plr,Hat1ID,Hat2ID,Hat3ID,HeadColorID,TorsoColorID,LeftArmColorID,RightArmColorID,LeftLegColorID,RightLegColorID,TShirtID,ShirtID,PantsID,FaceID,HeadID,ItemID,IconType) wait(0.79) LoadCharacterNew(newWaitForChild(plr,"Appearance"),plr.Character,false) + plr.Character.Animate:remove() + plr.Character.Health:remove() + plr.Character.Sound:remove() + plr.Character.RobloxTeam:remove() + + game.GuiRoot.RightPalette:remove() + game.GuiRoot.ChatMenuPanel:remove() + game.GuiRoot.HealthHud:remove() + game.GuiRoot.ScoreHud:remove() + game.GuiRoot.MainMenu:remove() local target = game.Workspace.Base.SpawnLocation local camera = game.Workspace.CurrentCamera @@ -797,8 +807,6 @@ function CS3DView(UserID,PlayerName,Hat1ID,Hat2ID,Hat3ID,HeadColorID,TorsoColorI end local human = plr.Character.Humanoid - - plr.Character.Animate:remove() human.WalkSpeed = 0 human.Jumping:connect(fixJump) diff --git a/scripts/launcher/3DView.rbxl b/scripts/launcher/3DView.rbxl index 55ec180..a33a768 100644 --- a/scripts/launcher/3DView.rbxl +++ b/scripts/launcher/3DView.rbxl @@ -465,18 +465,18 @@ null 0 - -9.99471855 - 31.509964 - -15.371006 - -0.930511177 - 0.310275495 - -0.194622949 - -0 - 0.531374097 - 0.847137332 - 0.366263509 - 0.788270772 - -0.494449526 + -11.1523056 + 31.4652519 + -14.8926888 + -0.867024481 + 0.420707047 + -0.266972423 + -1.4901163e-008 + 0.535803437 + 0.844342768 + 0.498265713 + 0.732065856 + -0.464554578 70 @@ -496,27 +496,13 @@ Camera - - - false - - Startup - for _, newtool in ipairs(game.Lighting.ClassicWeapons:GetChildren()) do - if newtool:IsA("Tool") then - copiedtool = newtool:Clone() - copiedtool.Parent = game.StarterPack - end -end - - - - + CurPlayerAnim none - + true true @@ -586,21 +572,971 @@ end - + StarterPack + + + true + true + + 0 + 0.400000006 + 0.5 + 1 + 0 + -0 + 0 + 0 + 1 + 0 + -1 + -0 + + ClassicPaintballGun + rbxasset://../../../shareddata/Textures/PaintballIcon.png + + + + + false + -0.5 + 0.5 + 0 + 0 + -0.5 + 0.5 + 0 + 0 + 194 + + -212.5 + 13.3999996 + -448.5 + -0 + 1 + -0 + -0 + 0 + -1 + -1 + 0 + -0 + + true + 0.5 + 0.300000012 + -0.5 + 0.5 + 0 + 0 + -0.5 + 0.5 + 0 + 0 + false + 256 + Handle + 0 + -0.5 + 0.5 + 0 + 0 + + 0 + 0 + 0 + + -0.5 + 0.5 + 0 + 0 + 0 + + 0 + 0 + 0 + + 0 + 1 + + 1 + 3 + 2 + + + + + 2 + 2 + rbxasset://../../../shareddata/Fonts/PaintballGun.mesh + 5 + Mesh + + 0 + 0 + 0 + + + 1 + 1 + 1 + + rbxasset://../../../shareddata/Textures/PaintballGunTex128.png + + 1 + 1 + 1 + + + + + + + + true + true + + -1 + -0.75 + 0.25 + 0 + 0 + 1 + 0 + 1 + -0 + -1 + 0 + -0 + + ClassicRPG + rbxasset://../../../shareddata/Textures/Rocket.png + + + + + false + -0.5 + 0.5 + 0 + 0 + -0.5 + 0.5 + 0 + 0 + 199 + + -205.5 + 12.7999992 + -449 + 4.71794515e-009 + 7.52472307e-010 + 1 + -7.17136983e-012 + 1 + 7.52472307e-010 + -1 + 7.17136983e-012 + -4.71794515e-009 + + true + 0.5 + 0.300000012 + -0.5 + 0.5 + 0 + 0 + -0.5 + 0.5 + 0 + 0 + false + 256 + Handle + 0.400000006 + -0.5 + 0.5 + 0 + 0 + + 0 + 0 + 0 + + -0.5 + 0.5 + 0 + 0 + 0 + + 0 + 0 + 0 + + 2 + 1 + + 4 + 0.800000012 + 1 + + + + + 2 + 2 + rbxasset://../../../shareddata/Fonts/rocketlauncher.mesh + 5 + Mesh + + 0 + 0 + 0 + + + 0.75 + 0.75 + 0.75 + + rbxasset://../../../shareddata/Textures/rocketlaunchertex.png + + 1 + 1 + 1 + + + + + + + + true + true + + -1 + -0.75 + 0.25 + 0 + 0 + 1 + 0 + 1 + -0 + -1 + 0 + -0 + + ClassicRPGHD + rbxasset://../../../shareddata/Textures/Rocket_hd.png + + + + + false + -0.5 + 0.5 + 0 + 0 + -0.5 + 0.5 + 0 + 0 + 199 + + -205.5 + 12.7999992 + -449 + 4.71794515e-009 + 7.52472307e-010 + 1 + -7.17136983e-012 + 1 + 7.52472307e-010 + -1 + 7.17136983e-012 + -4.71794515e-009 + + true + 0.5 + 0.300000012 + -0.5 + 0.5 + 0 + 0 + -0.5 + 0.5 + 0 + 0 + false + 256 + Handle + 0.400000006 + -0.5 + 0.5 + 0 + 0 + + 0 + 0 + 0 + + -0.5 + 0.5 + 0 + 0 + 0 + + 0 + 0 + 0 + + 2 + 1 + + 4 + 0.800000012 + 1 + + + + + 2 + 2 + rbxasset://../../../shareddata/Fonts/rocketlauncher_hd.mesh + 5 + Mesh + + 0 + 0 + 0 + + + 0.75 + 0.75 + 0.75 + + rbxasset://../../../shareddata/Textures/rocketlaunchertex.png + + 1 + 1 + 1 + + + + + + + + true + true + + 0 + -0.699999988 + 0 + 1 + 0 + 0 + 0 + 1 + 0 + 0 + 0 + 1 + + ClassicSlingshot + rbxasset://../../../shareddata/Textures/Slingshot.png + + + + + false + -0.5 + 0.5 + 0 + 0 + -0.5 + 0.5 + 4 + 0 + 194 + + -211 + 13.6000004 + -446.5 + 1 + 0 + 0 + 0 + 1 + 0 + 0 + 0 + 1 + + true + 0.5 + 0.300000012 + -0.5 + 0.5 + 0 + 0 + -0.5 + 0.5 + 0 + 0 + false + 256 + Handle + 0 + -0.5 + 0.5 + 0 + 0 + + 0 + 0 + 0 + + -0.5 + 0.5 + 3 + 0 + 0 + + 0 + 0 + 0 + + 1 + 1 + + 2 + 2.4000001 + 1 + + + + + 2 + 2 + rbxasset://../../../shareddata/Fonts/slingshot.mesh + 5 + Mesh + + 0 + 0 + 0 + + + 0.5 + 0.5 + 0.5 + + rbxasset://../../../shareddata/Textures/SlingshotTexture.png + + 1 + 1 + 1 + + + + + + + + true + true + + 0 + 0 + 0 + 1 + 0 + 0 + 0 + 1 + 0 + 0 + 0 + 1 + + ClassicSuperball + rbxasset://../../../shareddata/Textures/Superball.png + + + + + false + -0.5 + 0.5 + 0 + 0 + -0.5 + 0.5 + 0 + 0 + 21 + + -212 + 13.3999996 + -452 + -1.74406295e-010 + 7.98860711e-009 + -1 + -2.21916951e-009 + 1 + -7.98860711e-009 + 1 + -2.21916951e-009 + 1.74406295e-010 + + true + 1 + 0 + -0.5 + 0.5 + 0 + 0 + -0.5 + 0.5 + 0 + 0 + false + 256 + Handle + 0.200000003 + -0.5 + 0.5 + 0 + 0 + + 0 + 0 + 0 + + -0.5 + 0.5 + 0 + 0 + 0 + + 0 + 0 + 0 + + 0 + 0 + + 2 + 2 + 2 + + + + + + + true + true + + 0 + 0 + -1.5 + 0 + 0 + 1 + 1 + 0 + 0 + 0 + 1 + 0 + + ClassicSword + rbxasset://../../../shareddata/Textures/Sword128.png + + + + + false + -0.5 + 0.5 + 0 + 0 + -0.5 + 0.5 + 0 + 0 + 199 + + -212 + 12.7999992 + -444.5 + 0 + 0 + -1 + 0 + 1 + 0 + 1 + 0 + 0 + + true + 0.5 + 0.300000012 + -0.5 + 0.5 + 0 + 0 + -0.5 + 0.5 + 0 + 0 + false + 256 + Handle + 0.400000006 + -0.5 + 0.5 + 0 + 0 + + 0 + 0 + 0 + + -0.5 + 0.5 + 0 + 0 + 0 + + 0 + 0 + 0 + + 2 + 1 + + 1 + 0.800000012 + 4 + + + + + 2 + 2 + rbxasset://../../../shareddata/Fonts/sword.mesh + 5 + Mesh + + 0 + 0 + 0 + + + 1 + 1 + 1 + + rbxasset://../../../shareddata/Textures/SwordTexture.png + + 1 + 1 + 1 + + + + + + + false + + SwordScript + -------- OMG HAX +Tool = script.Parent + +function swordUp() + Tool.GripForward = Vector3.new(-1,0,0) + Tool.GripRight = Vector3.new(0,1,0) + Tool.GripUp = Vector3.new(0,0,1) +end + +function swordOut() + Tool.GripForward = Vector3.new(0,0,1) + Tool.GripRight = Vector3.new(0,-1,0) + Tool.GripUp = Vector3.new(-1,0,0) +end + +function onActivated() + if Tool.Lunged.Value == false then + swordOut() + Tool.Lunged.Value = true + else + swordUp() + Tool.Lunged.Value = false + end +end + +script.Parent.Activated:connect(onActivated) + + + + + Lunged + false + + + + + + true + true + + 0 + 0 + 0 + 1 + 0 + 0 + 0 + 0 + -1 + -0 + 1 + 0 + + ClassicTimebomb + rbxasset://../../../shareddata/Textures/Bomb.png + + + + + false + -0.5 + 0.5 + 0 + 0 + -0.5 + 0.5 + 0 + 0 + 194 + + -208 + 13.3999996 + -450 + -1 + -1.08416859e-010 + -2.25344743e-010 + 2.25344743e-010 + -1.76532541e-012 + 1 + 1.08416859e-010 + 1 + -1.76532541e-012 + + true + 0.5 + 0.300000012 + -0.5 + 0.5 + 0 + 0 + -0.5 + 0.5 + 0 + 0 + false + 256 + Handle + 0 + -0.5 + 0.5 + 0 + 0 + + 0 + 0 + 0 + + -0.5 + 0.5 + 0 + 0 + 0 + + 0 + 0 + 0 + + 0 + 0 + + 2 + 2 + 2 + + + + + 2 + 2 + rbxasset://../../../shareddata/Fonts/timebomb.mesh + 5 + Mesh + + 0 + 0 + 0 + + + 1 + 1 + 1 + + rbxasset://../../../shareddata/Textures/bombtex.png + + 1 + 1 + 1 + + + + + + + + true + true + + 0 + -1.29999995 + 0 + 1 + 0 + 0 + 0 + 1 + 0 + 0 + 0 + 1 + + ClassicTrowel + rbxasset://../../../shareddata/Textures/Wall.png + + + + + false + -0.5 + 0.5 + 2 + 0 + -0.5 + 0.5 + 4 + 0 + 5 + + -208.5 + 12.8999996 + -445.200012 + 1 + 0 + 0 + 0 + 0 + 1 + 0 + -1 + 0 + + true + 0.5 + 0.300000012 + -0.5 + 0.5 + 2 + 0 + -0.5 + 0.5 + 0 + 0 + false + 256 + Handle + 0 + -0.5 + 0.5 + 0 + 0 + + 0 + 0 + 0 + + -0.5 + 0.5 + 3 + 0 + 0 + + 0 + 0 + 0 + + 2 + 1 + + 1 + 4.4000001 + 1 + + + + + 2 + 2 + rbxasset://../../../shareddata/Fonts/trowel.mesh + 5 + Mesh + + 0 + 0 + 0 + + + 1 + 1 + 1 + + rbxasset://../../../shareddata/Textures/TrowelTexture.png + + 1 + 1 + 1 + + + + + - + StarterGui true - + 3DViewUI - + true false @@ -641,7 +1577,7 @@ end true 1 - + false @@ -660,7 +1596,7 @@ script.Parent.MouseButton1Down:connect(onClicked) - + true false @@ -701,7 +1637,7 @@ script.Parent.MouseButton1Down:connect(onClicked) true 1 - + false @@ -818,7 +1754,7 @@ script.Parent.MouseButton1Down:connect(onClicked) - + true false @@ -859,7 +1795,7 @@ script.Parent.MouseButton1Down:connect(onClicked) true 1 - + false @@ -919,7 +1855,7 @@ script.Parent.MouseButton1Down:connect(onClicked) - + true false @@ -960,7 +1896,7 @@ script.Parent.MouseButton1Down:connect(onClicked) true 1 - + false @@ -987,7 +1923,7 @@ script.Parent.MouseButton1Down:connect(onClicked) - + true false @@ -1028,7 +1964,7 @@ script.Parent.MouseButton1Down:connect(onClicked) true 1 - + false @@ -1074,7 +2010,7 @@ script.Parent.MouseButton1Down:connect(onClicked) - + true false @@ -1115,7 +2051,7 @@ script.Parent.MouseButton1Down:connect(onClicked) true 1 - + false @@ -1158,7 +2094,7 @@ script.Parent.MouseButton1Down:connect(onClicked) - + true false @@ -1199,7 +2135,7 @@ script.Parent.MouseButton1Down:connect(onClicked) true 1 - + false @@ -1251,7 +2187,7 @@ script.Parent.MouseButton1Down:connect(onClicked) - + true false @@ -1292,7 +2228,7 @@ script.Parent.MouseButton1Down:connect(onClicked) true 1 - + false @@ -1352,7 +2288,7 @@ script.Parent.MouseButton1Down:connect(onClicked) - + true false @@ -1393,7 +2329,7 @@ script.Parent.MouseButton1Down:connect(onClicked) true 1 - + false @@ -1443,7 +2379,7 @@ script.Parent.MouseButton1Down:connect(onClicked) - + true false @@ -1484,7 +2420,7 @@ script.Parent.MouseButton1Down:connect(onClicked) true 1 - + false @@ -1542,7 +2478,7 @@ script.Parent.MouseButton1Down:connect(onClicked) - + true false @@ -1583,7 +2519,7 @@ script.Parent.MouseButton1Down:connect(onClicked) true 1 - + false @@ -1618,7 +2554,7 @@ script.Parent.MouseButton1Down:connect(onClicked) - + true false @@ -1659,7 +2595,7 @@ script.Parent.MouseButton1Down:connect(onClicked) true 1 - + false @@ -1709,7 +2645,7 @@ script.Parent.MouseButton1Down:connect(onClicked) - + true false @@ -1750,7 +2686,7 @@ script.Parent.MouseButton1Down:connect(onClicked) true 1 - + false @@ -1767,7 +2703,7 @@ script.Parent.MouseButton1Down:connect(onClicked) - + true false @@ -1808,7 +2744,7 @@ script.Parent.MouseButton1Down:connect(onClicked) true 1 - + false @@ -1882,7 +2818,7 @@ script.Parent.MouseButton1Down:connect(onClicked) - + 0 10 @@ -1891,74 +2827,74 @@ script.Parent.MouseButton1Down:connect(onClicked) 1 - + CollectionService - + PhysicsService - + BadgeService - + Geometry - + RenderHooksService - + SocialService - + 1000 Debris - + Instance - + Instance - + CookiesService - + Teleport Service - + true Players - + Selection - + 4288453788 1 @@ -1972,7 +2908,7 @@ script.Parent.MouseButton1Down:connect(onClicked) 4291809236 14:00:00 - + false Sky @@ -1985,19 +2921,19 @@ script.Parent.MouseButton1Down:connect(onClicked) 3000 - + Hour 14 - + Minute 0 - + 0 @@ -2016,7 +2952,7 @@ script.Parent.MouseButton1Down:connect(onClicked) ClassicWeapons null - + true true @@ -2038,7 +2974,7 @@ script.Parent.MouseButton1Down:connect(onClicked) rbxasset://../../../shareddata/Textures/PaintballIcon.png - + false -0.5 @@ -2106,7 +3042,7 @@ script.Parent.MouseButton1Down:connect(onClicked) 2 - + 2 2 @@ -2133,7 +3069,7 @@ script.Parent.MouseButton1Down:connect(onClicked) - + true true @@ -2155,7 +3091,7 @@ script.Parent.MouseButton1Down:connect(onClicked) rbxasset://../../../shareddata/Textures/Slingshot.png - + false -0.5 @@ -2223,7 +3159,7 @@ script.Parent.MouseButton1Down:connect(onClicked) 1 - + 2 2 @@ -2250,7 +3186,7 @@ script.Parent.MouseButton1Down:connect(onClicked) - + true true @@ -2272,7 +3208,7 @@ script.Parent.MouseButton1Down:connect(onClicked) rbxasset://../../../shareddata/Textures/Superball.png - + false -0.5 @@ -2342,7 +3278,7 @@ script.Parent.MouseButton1Down:connect(onClicked) - + true true @@ -2364,7 +3300,7 @@ script.Parent.MouseButton1Down:connect(onClicked) rbxasset://../../../shareddata/Textures/Rocket.png - + false -0.5 @@ -2432,7 +3368,7 @@ script.Parent.MouseButton1Down:connect(onClicked) 1 - + 2 2 @@ -2459,7 +3395,7 @@ script.Parent.MouseButton1Down:connect(onClicked) - + true true @@ -2481,7 +3417,7 @@ script.Parent.MouseButton1Down:connect(onClicked) rbxasset://../../../shareddata/Textures/Sword128.png - + false -0.5 @@ -2549,7 +3485,7 @@ script.Parent.MouseButton1Down:connect(onClicked) 4 - + 2 2 @@ -2575,7 +3511,7 @@ script.Parent.MouseButton1Down:connect(onClicked) - + false @@ -2608,14 +3544,14 @@ end script.Parent.Activated:connect(onActivated) - + Lunged false - + true true @@ -2637,7 +3573,7 @@ script.Parent.Activated:connect(onActivated) rbxasset://../../../shareddata/Textures/Bomb.png - + false -0.5 @@ -2705,7 +3641,7 @@ script.Parent.Activated:connect(onActivated) 2 - + 2 2 @@ -2732,7 +3668,7 @@ script.Parent.Activated:connect(onActivated) - + true true @@ -2754,7 +3690,7 @@ script.Parent.Activated:connect(onActivated) rbxasset://../../../shareddata/Textures/Wall.png - + false -0.5 @@ -2822,7 +3758,7 @@ script.Parent.Activated:connect(onActivated) 1 - + 2 2 @@ -2849,7 +3785,7 @@ script.Parent.Activated:connect(onActivated) - + true true @@ -2871,7 +3807,7 @@ script.Parent.Activated:connect(onActivated) rbxasset://../../../shareddata/Textures/Rocket_hd.png - + false -0.5 @@ -2939,7 +3875,7 @@ script.Parent.Activated:connect(onActivated) 1 - + 2 2 @@ -2967,13 +3903,13 @@ script.Parent.Activated:connect(onActivated) - + Inventory 0 - + 0 @@ -2992,7 +3928,7 @@ script.Parent.Activated:connect(onActivated) SFOTHWeapons null - + true true @@ -3014,7 +3950,7 @@ script.Parent.Activated:connect(onActivated) - + false -0.5 @@ -3082,11 +4018,11 @@ script.Parent.Activated:connect(onActivated) 4 - + 2 2 - rbxasset://fonts/sword.mesh + rbxasset://../../../shareddata/Fonts/sword.mesh 5 Mesh @@ -3099,7 +4035,7 @@ script.Parent.Activated:connect(onActivated) 0.800000012 1 - rbxasset://textures/SwordTexture.png + rbxasset://../../../shareddata/textures/SwordTexture.png 0 0 @@ -3108,7 +4044,7 @@ script.Parent.Activated:connect(onActivated) - + false @@ -3141,14 +4077,14 @@ end script.Parent.Activated:connect(onActivated) - + Lunged false - + true true @@ -3170,7 +4106,7 @@ script.Parent.Activated:connect(onActivated) - + false -0.5 @@ -3238,11 +4174,11 @@ script.Parent.Activated:connect(onActivated) 6 - + 2 2 - rbxasset://fonts/sword.mesh + rbxasset://../../../shareddata/fonts/sword.mesh 5 Mesh @@ -3255,7 +4191,7 @@ script.Parent.Activated:connect(onActivated) 1.5 1.5 - rbxasset://textures/SwordTexture.png + rbxasset://../../../shareddata/textures/SwordTexture.png 0.5 0 @@ -3264,13 +4200,13 @@ script.Parent.Activated:connect(onActivated) - + Lunged false - + false @@ -3304,7 +4240,7 @@ script.Parent.Activated:connect(onActivated) - + true true @@ -3326,7 +4262,7 @@ script.Parent.Activated:connect(onActivated) - + false -0.5 @@ -3394,11 +4330,11 @@ script.Parent.Activated:connect(onActivated) 4 - + 2 2 - rbxasset://fonts/sword.mesh + rbxasset://../../../shareddata/fonts/sword.mesh 5 Mesh @@ -3420,13 +4356,13 @@ script.Parent.Activated:connect(onActivated) - + Lunged false - + false @@ -3460,7 +4396,7 @@ script.Parent.Activated:connect(onActivated) - + true true @@ -3482,7 +4418,7 @@ script.Parent.Activated:connect(onActivated) - + false -0.5 @@ -3550,11 +4486,11 @@ script.Parent.Activated:connect(onActivated) 2 - + 2 2 - rbxasset://fonts/sword.mesh + rbxasset://../../../shareddata/fonts/sword.mesh 5 Mesh @@ -3576,7 +4512,7 @@ script.Parent.Activated:connect(onActivated) - + false @@ -3609,14 +4545,14 @@ end script.Parent.Activated:connect(onActivated) - + Lunged false - + true true @@ -3638,7 +4574,7 @@ script.Parent.Activated:connect(onActivated) - + false -0.5 @@ -3706,11 +4642,11 @@ script.Parent.Activated:connect(onActivated) 4 - + 2 2 - rbxasset://fonts/sword.mesh + rbxasset://../../../shareddata/fonts/sword.mesh 5 Mesh @@ -3731,7 +4667,7 @@ script.Parent.Activated:connect(onActivated) - + true Sparkles @@ -3739,7 +4675,7 @@ script.Parent.Activated:connect(onActivated) - + false @@ -3772,14 +4708,14 @@ end script.Parent.Activated:connect(onActivated) - + Lunged false - + true true @@ -3801,7 +4737,7 @@ script.Parent.Activated:connect(onActivated) - + false -0.5 @@ -3869,11 +4805,11 @@ script.Parent.Activated:connect(onActivated) 6 - + 2 2 - rbxasset://fonts/sword.mesh + rbxasset://../../../shareddata/fonts/sword.mesh 5 Mesh @@ -3886,7 +4822,7 @@ script.Parent.Activated:connect(onActivated) 1.5 1.5 - rbxasset://textures/SwordTexture.png + rbxasset://../../../shareddata/textures/SwordTexture.png 0.300000012 1 @@ -3895,7 +4831,7 @@ script.Parent.Activated:connect(onActivated) - + false @@ -3928,14 +4864,14 @@ end script.Parent.Activated:connect(onActivated) - + Lunged false - + true true @@ -3957,7 +4893,7 @@ script.Parent.Activated:connect(onActivated) - + false -0.5 @@ -4025,11 +4961,11 @@ script.Parent.Activated:connect(onActivated) 2 - + 2 2 - rbxasset://fonts/sword.mesh + rbxasset://../../../shareddata/fonts/sword.mesh 5 Mesh @@ -4051,7 +4987,7 @@ script.Parent.Activated:connect(onActivated) - + false @@ -4084,14 +5020,14 @@ end script.Parent.Activated:connect(onActivated) - + Lunged false - + true true @@ -4113,7 +5049,7 @@ script.Parent.Activated:connect(onActivated) - + false -0.5 @@ -4181,11 +5117,11 @@ script.Parent.Activated:connect(onActivated) 5 - + 2 2 - rbxasset://fonts/sword.mesh + rbxasset://../../../shareddata/fonts/sword.mesh 5 Mesh @@ -4207,7 +5143,7 @@ script.Parent.Activated:connect(onActivated) - + false @@ -4240,7 +5176,7 @@ end script.Parent.Activated:connect(onActivated) - + Lunged false @@ -4248,7 +5184,7 @@ script.Parent.Activated:connect(onActivated) - + 0 @@ -4267,7 +5203,7 @@ script.Parent.Activated:connect(onActivated) ROTKBWeapons null - + true true @@ -4289,7 +5225,7 @@ script.Parent.Activated:connect(onActivated) rbxasset://../../../shareddata/RiseOfTheKillbots/textures/shotgun_icon.png - + false -0.5 @@ -4357,7 +5293,7 @@ script.Parent.Activated:connect(onActivated) 2 - + 2 2 @@ -4384,7 +5320,7 @@ script.Parent.Activated:connect(onActivated) - + true true @@ -4406,7 +5342,7 @@ script.Parent.Activated:connect(onActivated) rbxasset://../../../shareddata/RiseOfTheKillbots/textures/pistol_icon.png - + false -0.5 @@ -4474,7 +5410,7 @@ script.Parent.Activated:connect(onActivated) 1 - + 2 2 @@ -4502,13 +5438,13 @@ script.Parent.Activated:connect(onActivated) - + CameraType 0 - + 0 @@ -4527,7 +5463,7 @@ script.Parent.Activated:connect(onActivated) Gears null - + true true @@ -4549,7 +5485,7 @@ script.Parent.Activated:connect(onActivated) rbxasset://../../../shareddata/textures/BrigandsSword.png - + false -0.5 @@ -4617,7 +5553,7 @@ script.Parent.Activated:connect(onActivated) 4 - + 2 2 @@ -4643,13 +5579,13 @@ script.Parent.Activated:connect(onActivated) - + Lunged false - + false @@ -4683,7 +5619,7 @@ script.Parent.Activated:connect(onActivated) - + true true @@ -4705,7 +5641,7 @@ script.Parent.Activated:connect(onActivated) rbxasset://../../../shareddata/textures/Cheezburger.png - + false -0.5 @@ -4773,7 +5709,7 @@ script.Parent.Activated:connect(onActivated) 1 - + 2 2 @@ -4799,7 +5735,7 @@ script.Parent.Activated:connect(onActivated) - + false @@ -4834,14 +5770,14 @@ end script.Parent.Activated:connect(onActivated) - + Eat false - + true true @@ -4863,7 +5799,7 @@ script.Parent.Activated:connect(onActivated) rbxasset://../../../shareddata/textures/NinjaStar.png - + false -0.5 @@ -4931,7 +5867,7 @@ script.Parent.Activated:connect(onActivated) 1 - + 2 2 @@ -4958,7 +5894,7 @@ script.Parent.Activated:connect(onActivated) - + true true @@ -4980,7 +5916,7 @@ script.Parent.Activated:connect(onActivated) rbxasset://../../../shareddata/textures/Coil.png - + false -0.5 @@ -5048,7 +5984,7 @@ script.Parent.Activated:connect(onActivated) 2 - + 2 2 @@ -5075,7 +6011,7 @@ script.Parent.Activated:connect(onActivated) - + true true @@ -5097,7 +6033,7 @@ script.Parent.Activated:connect(onActivated) rbxasset://../../../shareddata/textures/BloxyCola.png - + false -0.5 @@ -5165,7 +6101,7 @@ script.Parent.Activated:connect(onActivated) 1 - + 2 2 @@ -5191,7 +6127,7 @@ script.Parent.Activated:connect(onActivated) - + false @@ -5226,14 +6162,14 @@ end script.Parent.Activated:connect(onActivated) - + Drink false - + true true @@ -5255,7 +6191,7 @@ script.Parent.Activated:connect(onActivated) rbxasset://../../../shareddata/textures/EnergySword.png - + false -0.5 @@ -5323,7 +6259,7 @@ script.Parent.Activated:connect(onActivated) 4 - + 2 2 @@ -5348,7 +6284,7 @@ script.Parent.Activated:connect(onActivated) - + true Sparkles @@ -5357,7 +6293,7 @@ script.Parent.Activated:connect(onActivated) - + true true @@ -5379,7 +6315,7 @@ script.Parent.Activated:connect(onActivated) rbxasset://../../../shareddata/textures/Banhammer.png - + false -0.5 @@ -5447,7 +6383,7 @@ script.Parent.Activated:connect(onActivated) 1 - + 2 2 @@ -5473,7 +6409,7 @@ script.Parent.Activated:connect(onActivated) - + false @@ -5661,32 +6597,32 @@ script.Parent.Deactivated:connect(onDeactivated) - + CurAnim homerun - + PlayAnim false - + AnimFrame 0 - + AnimSection 0 - + true true @@ -5708,7 +6644,7 @@ script.Parent.Deactivated:connect(onDeactivated) rbxasset://../../../shareddata/textures/Tripmine.png - + false -0.5 @@ -5776,7 +6712,7 @@ script.Parent.Deactivated:connect(onDeactivated) 2 - + 2 2 @@ -5803,7 +6739,7 @@ script.Parent.Deactivated:connect(onDeactivated) - + true true @@ -5825,7 +6761,7 @@ script.Parent.Deactivated:connect(onDeactivated) rbxasset://../../../shareddata/textures/Claw.png - + false -0.5 @@ -5893,7 +6829,7 @@ script.Parent.Deactivated:connect(onDeactivated) 2 - + 2 2 @@ -5920,7 +6856,7 @@ script.Parent.Deactivated:connect(onDeactivated) - + true true @@ -5942,7 +6878,7 @@ script.Parent.Deactivated:connect(onDeactivated) rbxasset://../../../shareddata/textures/LaserPistol.png - + false -0.5 @@ -6010,7 +6946,7 @@ script.Parent.Deactivated:connect(onDeactivated) 1 - + 2 2 @@ -6036,7 +6972,7 @@ script.Parent.Deactivated:connect(onDeactivated) - + false @@ -6069,7 +7005,7 @@ end script.Parent.Activated:connect(onActivated) - + Shoot false @@ -6078,7 +7014,7 @@ script.Parent.Activated:connect(onActivated) - + ChangeHistoryService diff --git a/scripts/launcher/info.ini b/scripts/launcher/info.ini index f30735a..64efae7 100644 --- a/scripts/launcher/info.ini +++ b/scripts/launcher/info.ini @@ -9,6 +9,6 @@ ExtendedVersionNumber=True //ExtendedVersionTemplate=%version% vX.23.%extended-revision% (%version-name%) //ExtendedVersionTemplate=%version% Snapshot v23.%build%.%revision%.%extended-revision% ExtendedVersionTemplate=EDGE Snapshot v23.%build%.%revision%.%extended-revision% -ExtendedVersionRevision=1 +ExtendedVersionRevision=2 InitialBootup=False IsLite=False