v242

* Fix missing $ * Update Functions.lua (#1326) * Added FPS Command (#1308) * Added FPS command * Added the command * Removed cPcall * Changed game:getservice() to service By: SuperCater Co-authored-by: Cater <[email protected]> * Update Debug_Specific.lua (#1337) * Revert regressions introduced in #1313 and #1308 (#1339) * Merge resetatmosphere to resetlighting (#1340) * Fix naming error in #1297 (#1341) * Updates :starterscript + 2 new related commands This adds a name argument to :starterscript and adds :starterscripts and :removestarterscript <name> * Fix naming error * Fixed :Jail bug not unjailing after set time (#1342) * Update Version to v242 * Update Changelog to v242 * Fix FPS gui (#1338) * Fix FPS gui * Update FPS.lua * Update FPS.lua * Update Admin.lua (#1343) * v242 changelog(2) * Make disabling linkedlists a loader flag (#1335) * Change linkedlist toggle * Removed linkedlist toggle from settings * Make disabling linkedlists a loader flag * Update Logs.lua * Improve bug report form (#1345) * Improve bug report form * Update Bug_Report.yml * Fix typo * Update Changelog version to v242 * Very Big Change (#1349) * Notify admins what rank they are upon joining (#1303) * Notify admins what rank they are upon joining * Use string interpolation * Update Process.lua --------- Co-authored-by: Dimenpsyonal <[email protected]> * Make givepoints an alias (#1334) * Add legacy aliases of player points * Remove legacy player poinst command * Update Variables.lua * Fix typo * Update Admin.lua * Fix typo * Fix typo * Update Core.lua * Finally fix script * Added in-game Script Editor (#1315) * Added remote commands * Update Remote.lua * Added ScriptEditor command * Added ScriptEditor UI module * Added ScriptEditor to variables * Fixed an error in logging * Update !playerinfo command - Get Render Resolution (#1287) * Update Profile.lua - Render Resolution * Update Functions.lua - Enable getting client render resolution Uses CurrentCamera.ViewportSize to get the resolution. * Add new additions: v242 Changelog --------- Co-authored-by: burger <[email protected]> Co-authored-by: kaiserandaxl <[email protected]> Co-authored-by: Cater <[email protected]> Co-authored-by: ccuser44 <[email protected]> Co-authored-by: EasternBloxxer <[email protected]> Co-authored-by: EasternBloxxer <[email protected]> Co-authored-by: Alistair Lau <[email protected]> Co-authored-by: Wilson Simanjuntak <[email protected]>
Epix-Incorporated · Jan 15, 2024 · c05bc09 · c05bc09
1 parent daba64f
commit c05bc09
Show file tree

Hide file tree

Showing 23 changed files with 1,100 additions and 86 deletions.
diff --git a/.github/ISSUE_TEMPLATE/Bug_Report.yml b/.github/ISSUE_TEMPLATE/Bug_Report.yml
@@ -19,6 +19,12 @@ body:
       default: 0
     validations:
       required: true
+  - type: input
+    id: loader-version
+    attributes:
+      label: Loader version
+      description: If your issue is related to loader/settings and you do not provide this we may not be able to solve your issue. Paste the value from `Adonis_Loader > Version > .Value` ![Version VALUE](https://media.discordapp.net/attachments/834826232565727282/1194191940640587836/image.png)
+      placeholder: Value of the version variable. "Latest" is invalid as unbeknownst you may not be using the latest loader for many reasons
   - type: dropdown
     id: segment
     attributes:
@@ -30,6 +36,7 @@ body:
         - Documentation
         - GitHub Repository
         - Anti-Exploit
+        - Trello
         - Other
     validations:
       required: true
@@ -45,5 +52,5 @@ body:
     id: logs
     attributes:
       label: Relevant log output
-      description: Please copy and paste any relevant log output, if any.
-      render: shell
+      description: Please copy and paste any relevant log output, if any. From studiologs/devconsole and/or `:scriptlogs`\&`:errorlogs`
+      render: shell
diff --git a/Loader/Version.model.json b/Loader/Version.model.json
@@ -1,6 +1,6 @@
 {
 	"ClassName": "NumberValue",
 	"Properties": {
-		"Value": 241
+		"Value": 242
 	}
 }
diff --git a/MainModule/Client/Core/Functions.lua b/MainModule/Client/Core/Functions.lua
@@ -1868,6 +1868,7 @@ return function(Vargs, GetEnv)
 			for _, p in props do
 				data[p] = service.UserInputService[p]
 			end
+			data["Resolution"] = workspace.CurrentCamera.ViewportSize.X.." x "..workspace.CurrentCamera.ViewportSize.Y
 			return data
 		end;
 	};

diff --git a/MainModule/Client/UI/Default/FPS.lua b/MainModule/Client/UI/Default/FPS.lua
@@ -0,0 +1,48 @@
+client,service = nil,nil
+
+return function(data,env)
+	if env then
+		setfenv(1, env)
+	end
+
+	local gfps = true
+	local gTable
+
+	--warn(math.floor(1/game:GetService("RunService").RenderStepped:Wait()))
+
+	local window = client.UI.Make("Window",{
+		Name  = "FPS";
+		Title = "FPS";
+		Icon = client.MatIcons.Leaderboard;
+		Size  = {150, 70};
+		Position = UDim2.new(0, 10, 1, -80);
+		AllowMultiple = false;
+		NoHide = true;
+		Walls = true;
+		SizeLocked = true;
+		CanKeepAlive = true;
+		OnClose = function()
+			gfps = false
+		end
+	})
+
+	if window then
+		local label = window:Add("TextLabel",{
+			Text = "...";
+			BackgroundTransparency = 1;
+			TextSize = 20;
+			Size = UDim2.new(1, 0, 1, 0);
+			Position = UDim2.new(0, 0, 0, 0);
+			--TextScaled = true;
+			--TextWrapped = true;
+		})
+
+		gTable = window.gTable
+		window:Ready()
+
+		repeat
+			label.Text = `Render: {math.round(1/service["RunService"].RenderStepped:Wait())} fps\nPhysics: {math.round(workspace:GetRealPhysicsFPS())} fps`
+			task.wait(1)
+		until not gfps or not gTable.Active
+	end
+end
diff --git a/MainModule/Client/UI/Default/Profile.lua b/MainModule/Client/UI/Default/Profile.lua
@@ -388,6 +388,7 @@ return function(data, env)
 			{"Mouse Delta Sensitivity", data.GameData.MouseDeltaSensitivity, "The scale of the delta (change) output of the user’s Mouse"},
 			{"Mouse Enabled", boolToStr(data.GameData.MouseEnabled), "Whether the user’s device has a mouse available"},
 			-- NEEDS REFRESHABILITY {"OnScreenKeyboardVisible", data.GameData.OnScreenKeyboardVisible, "Whether an on-screen keyboard is currently visible on the user’s screen"},
+			{"Render Resolution", data.GameData.Resolution, "The render resolution on user's current device. May not reflect real resolution on high-DPI devices."},
 			{"Touch Enabled", boolToStr(data.GameData.TouchEnabled), "Whether the user’s current device has a touch-screen available"},
 			{"VR Enabled", boolToStr(data.GameData.VREnabled), "Whether the user is using a virtual reality headset"},
 			{"Source Place ID", data.GameData.SourcePlaceId, "The ID of the place from which the player was teleported to this game, if applicable"},

diff --git a/MainModule/Client/UI/Default/ScriptEditor.lua b/MainModule/Client/UI/Default/ScriptEditor.lua
@@ -0,0 +1,86 @@
+client,service = nil,nil
+return function(data, env)
+	if env then
+		setfenv(1, env)
+	end
+
+	local Save = nil
+	local Run = nil
+
+	local window = client.UI.Make("Window",{
+		Title = `Editing - {data.Name}`;
+		Name = "CommandBox";
+		Icon = client.MatIcons.Code;
+		Size  = {500, 300};
+		MinSize = {300,250};
+		OnClose = function()
+			Save()
+		end,
+	})
+
+	local Frame: ScrollingFrame = window:Add("ScrollingFrame",{
+		Name = "Editor";
+		Size = UDim2.new(1, -10, 1, -10);
+		BackgroundTransparency = 1;
+	})
+
+	local Text: TextBox = Frame:Add("TextBox",{
+		Name = "Script";
+		Size = UDim2.new(1, -10, 1, -10);
+		Position = UDim2.new(0, 5, 0, 5);
+		BackgroundTransparency = 1;
+		Text = data.Script or [[print("Hello World")]];
+		PlaceholderText = "";
+		TextYAlignment = "Top";
+		TextXAlignment = "Left";
+		MultiLine = true;
+		ClearTextOnFocus = false;
+		Font = Enum.Font.Code;
+		TextSize = 16;
+	})
+
+	local SaveButton: TextButton = window:Add("TextButton",{
+		Name = "Save";
+		Text = "Save";
+		Size = UDim2.new(0, 40, 0, 20);
+		Position = UDim2.new(1, 0, 1, -25);
+		AnchorPoint = Vector2.new(1, 1);
+	})
+
+	local RunButton: TextButton = window:Add("TextButton",{
+		Name = "Run";
+		Text = "Run";
+		Size = UDim2.new(0, 40, 0, 20);
+		Position = UDim2.new(1, 0, 1, 0);
+		AnchorPoint = Vector2.new(1, 1);
+	})
+
+	Text:GetPropertyChangedSignal("TextBounds"):Connect(function()
+		Frame:ResizeCanvas(true,true)
+	end)
+
+	Save = function()
+		client.Remote.Send("SaveScript",{
+			Name = data.Name;
+			Text = Text.Text
+		})
+	end
+
+	Run = function()
+		client.Remote.Send("SaveScript",{
+			Name = data.Name;
+			Text = Text.Text
+		})
+		client.Remote.Send("RunScript",{data.Name})
+	end
+
+	SaveButton.MouseButton1Click:Connect(function()
+		Save()
+	end)
+
+	RunButton.MouseButton1Click:Connect(function()
+		Run()
+	end)
+
+	window:Ready()
+end