Skip to content

Commit

Permalink
Push v252 master to release (#1441)
Browse files Browse the repository at this point in the history
* v252 changelog

* Update version to v252

* Add Dangerous as command option

* Add Dangerous to command t.bool

* Disable R15 dog

* Make Output functions actually work

* Add colon

* Add output title

* Add output title

* Update output titles

* Made ping readout show in ms (#1420)

Before it would always show 0, this remedy's that

Also sunk in a little grammar fix

* Update Changelog

* Add Dangerous command option (#1418)

* Add WarnDangerousCommand to defaultsettings

* Add WarnDangerousCommand to settings

* Add Dangerous as command option

* Fix !rejoin regarding max player server count (#1415)

* Disable !rejoin when player count is equal or greater than max server players

This is to patch a bug inside roblox where players can have way too many players in it.

* Update DefaultSettings.lua

1/2

* Update DefaultSettings.lua

1.5/2

* Update settings.lua

1.75/2

* Implement setting to disable rejoin at max players

2/2

* Add DisableRejoinAtMaxPlayers to Order and Descs

* Add DisableRejoinAtMaxPlayers to order and descs

---------

Co-authored-by: Dimenpsyonal <[email protected]>

* Update Changelog

* Lazy load userpanel (#1407)

* Lazy load userpanel

* Update UserPanel.lua

* Fix missing variable

* Optimise code

* Fix invalid properties

* Fix hardcoded prefix

* Only get variables if there is a window

* Re-add hardcoded prefix

---------

Co-authored-by: Dimenpsyonal <[email protected]>

* Update Changelog v252

* Update Functions output

* Update ScriptEditor output

* Delete MainModule/Server/Plugins/ServerNewDex.rbxmx

* Update newdex

Remove capitalisation from commands and add :newdex as a command

* Update changelog

* Add title to WindowsXP output

* Turn richtext on for windowsXP

* Add

* Add additional Output features to Steampunk

* Add additonal Output features to Rounded

* Add additional output functions to Aero

* Add additional output functions to Unity

* Update Changelog

* Disable singer by default

* Keybinds input fix (#1422)

* Keybinds input fix

Fixes issue where after selecting a key it would still continuously wait for keys to be input.

* Small Old logs fix

Should check if it's a string instead of any other type.

* Update Changelog

* Add Setting "ChatCreateRobloxCommands" to configure whether or not one wants Roblox Chat Commands to be generated (#1423)

* Add "ChatCreateRobloxCommands"

* Add "ChatCreateRobloxCommands"

* Setting "ChatCreateRobloxCommands" to determine whether or not to create Roblox Chat Commands

* Add a setting to determine whether or not to create Roblox Chat Commands

* Update Changelog

* Add FastLoadUserpanel to variables

* Add FastLoad Userpanel to client settings

* Add default value if var is blank

* Fix typo

* Option to disable FastLoad

* Update logic

* Silence playerdata error

* Silence errors

* Update Changelog

* Change meta files from Disabled to Enabled (#1424)

* Update enabled to disabled

* Swap around layout

* Update Changelog

* Fix text being editable in lists (#1425)

* Update Changelog

* Make dangerous commands prompt before being executed. (#1426)

* Add mark as dangerous functionality

* Fix linter issue

* Add WarnDangerousCommand setting

* Add dangerous tags to commands.

* Move dangerous command warning from `Admin.RunCommandAsPlayer` to `Process.Command`

* Fix linter errors.

* Whoops, haven't seen that one.

* Remove dangerous checks from direct ban related commands.

* Bug fixes.

Co-authored-by: fxeP1 <[email protected]>

---------

Co-authored-by: fxeP1 <[email protected]>

* Update description of `:nil` command. (#1427)

* Deprecate :nil

* Update Admins.lua

* Update Changelog

* Update Changelog, include contributors

* Move the sword command into fun commands. (#1428)

* Revert "Fix text being editable in lists (#1425)" (#1432)

This reverts commit 99ff7e0.

* Update Changelog.

* Update Changelog

* Read HttpEnabled directly

* Fix :unfly command not working when SignalBehavior is set to Deferred (#1436)

* Update Changelog

* Remove fastload setting and change loading from ugly text to responsive and beatiful icon (#1434)

* Remove `fastloaduserpanel`

* Remove `fastloaduserpanel`

* Remove `fastloaduserpanel`

* Change loading from text to icon

* Fix typo

* Fix rejoin, again, now another command. (#1438)

* Untrack fix for specific players (#1440)

Resolves issue where missing `_` would prevent the "untrack" command from properly removing the tracking instance.

* Use :GetNetworkPing() accurately (#1439)

* Update Changelog.lua

* Fix title logic

* Fix title logic

* Update title logic

* Update title logic

* Update title logic

* Update title logic

* Update Changelog date and time

* Update Anti_Cheat.lua

---------

Co-authored-by: Drew Bokman <[email protected]>
Co-authored-by: Radiant <[email protected]>
Co-authored-by: ccuser44 <[email protected]>
Co-authored-by: fxe <[email protected]>
Co-authored-by: karl-police <[email protected]>
Co-authored-by: kaiserandaxl <[email protected]>
Co-authored-by: fxeP1 <[email protected]>
Co-authored-by: joritochip <[email protected]>
Co-authored-by: Clown <[email protected]>
Co-authored-by: Coasterteam <[email protected]>
  • Loading branch information
11 people authored Mar 11, 2024
1 parent 7f9a62c commit 96cfdd7
Show file tree
Hide file tree
Showing 49 changed files with 413 additions and 305 deletions.
30 changes: 20 additions & 10 deletions Loader/Config/Settings.lua
Original file line number Diff line number Diff line change
Expand Up @@ -277,28 +277,31 @@ settings.CommandCooldowns = {
settings.FunCommands = true -- Are fun commands enabled?
settings.PlayerCommands = true -- Are player-level utility commands enabled?
settings.AgeRestrictedCommands = true -- Are age-locked commands enabled?
settings.WarnDangerousCommand = false -- Do dangerous commands ask for confirmation?
settings.CommandFeedback = false -- Should players be notified when commands with non-obvious effects are run on them?
settings.CrossServerCommands = true -- Are commands which affect more than one server enabled?
settings.ChatCommands = true -- If false you will not be able to run commands via the chat; Instead, you MUST use the console or you will be unable to run commands
settings.CreatorPowers = true -- Gives me creator-level admin; This is strictly used for debugging; I can't debug without full access to the script
settings.CodeExecution = true -- Enables the use of code execution in Adonis; Scripting related (such as :s) and a few other commands require this
settings.SilentCommandDenials = false -- If true, there will be no differences between the error messages shown when a user enters an invalid command and when they have insufficient permissions for the command
settings.OverrideChatCallbacks = true -- If the TextChatService ShouldDeliverCallbacks of all channels are overridden by Adonis on load. Required for slowmode. Mutes use a CanSend method to mute when this is set to false.
settings.ChatCreateRobloxCommands = true -- Whether "/" commands for Roblox should get created in new Chat

settings.BanMessage = "Banned" -- Message shown to banned users upon kick
settings.LockMessage = "Not Whitelisted" -- Message shown to people when they are kicked while the game is :slocked
settings.SystemTitle = "System Message" -- Title to display in :sm and :bc

settings.MaxLogs = 5000 -- Maximum logs to save before deleting the oldest
settings.SaveCommandLogs = true -- If command logs are saved to the datastores
settings.Notification = true -- Whether or not to show the "You're an admin" and "Updated" notifications
settings.SongHint = true -- Display a hint with the current song name and ID when a song is played via :music
settings.TopBarShift = false -- By default hints and notifications will appear from the top edge of the window. Set this to true if you don't want hints/notifications to appear in that region.
settings.Messages = {} -- A list of notification messages to show HeadAdmins and above on join
settings.AutoClean = false -- Will auto clean workspace of things like hats and tools
settings.AutoCleanDelay = 60 -- Time between auto cleans
settings.AutoBackup = false -- Run :backupmap automatically when the server starts. To restore the map, run :restoremap
settings.ReJail = false -- If true then when a player rejoins they'll go back into jail. Or if the moderator leaves everybody gets unjailed
settings.MaxLogs = 5000 -- Maximum logs to save before deleting the oldest
settings.SaveCommandLogs = true -- If command logs are saved to the datastores
settings.Notification = true -- Whether or not to show the "You're an admin" and "Updated" notifications
settings.SongHint = true -- Display a hint with the current song name and ID when a song is played via :music
settings.TopBarShift = false -- By default hints and notifications will appear from the top edge of the window. Set this to true if you don't want hints/notifications to appear in that region.
settings.Messages = {} -- A list of notification messages to show HeadAdmins and above on join
settings.AutoClean = false -- Will auto clean workspace of things like hats and tools
settings.AutoCleanDelay = 60 -- Time between auto cleans
settings.AutoBackup = false -- Run :backupmap automatically when the server starts. To restore the map, run :restoremap
settings.ReJail = false -- If true then when a player rejoins they'll go back into jail. Or if the moderator leaves everybody gets unjailed
settings.DisableRejoinAtMaxPlayers = false -- If true, disables rejoin when max players is reached to avoid an exploit that allows more players than the max amount.

settings.Console = true -- Whether the command console is enabled
settings.Console_AdminsOnly = false -- If true, only admins will be able to access the console
Expand Down Expand Up @@ -450,11 +453,13 @@ descs.Allowed_API_Calls = [[ Allowed calls ]]
descs.FunCommands = [[ Are fun commands enabled? ]]
descs.PlayerCommands = [[ Are players commands enabled? ]]
descs.AgeRestrictedCommands = [[ Are age-restricted commands enabled? ]]
descs.WarnDangerousCommand = [[ Do dangerous commands ask for confirmation before executing?]]
descs.CommandFeedback = [[ Should players be notified when commands with non-obvious effects are run on them? ]]
descs.CrossServerCommands = [[ Are commands which affect more than one server enabled? ]]
descs.ChatCommands = [[ If false you will not be able to run commands via the chat; Instead, you MUST use the console or you will be unable to run commands ]]
descs.SilentCommandDenials = [[ If true, there will be no differences between the error messages shown when a user enters an invalid command and when they have insufficient permissions for the command ]]
descs.OverrideChatCallbacks = [[ If the TextChatService ShouldDeliverCallbacks of all channels are overridden by Adonis on load. Required for muting ]]
descs.ChatCreateRobloxCommands = [[ Whether "/" commands for Roblox should get created in new Chat ]]


descs.BanMessage = [[ Message shown to banned users ]]
Expand All @@ -469,6 +474,7 @@ descs.CodeExecution = [[ Enables the use of code execution in Adonis; Scripting
descs.SongHint = [[ Display a hint with the current song name and ID when a song is played via :music ]]
descs.TopBarShift = [[ By default hints and notifs will appear from the top edge of the window. Set this to true if you don't want hints/notifications to appear in that region. ]]
descs.ReJail = [[ If true then when a player rejoins they'll go back into jail. Or if the moderator leaves everybody gets unjailed ]]
descs.DisableRejoinAtMaxPlayers = [[ If true, disables rejoin when max players is reached to avoid an exploit that allows more players than the max amount. ]]

descs.Messages = [[ A list of notification messages to show HeadAdmins and above on join ]]

Expand Down Expand Up @@ -592,13 +598,16 @@ order = {
" ";
"FunCommands";
"PlayerCommands";
"AgeRestrictedCommands";
"WarnDangerousCommand";
"CommandFeedback";
"CrossServerCommands";
"ChatCommands";
"CreatorPowers";
"";
"SilentCommandDenials";
"OverrideChatCallbacks";
"ChatCreateRobloxCommands";
" ";
"BanMessage";
"LockMessage";
Expand All @@ -610,6 +619,7 @@ order = {
"SongHint";
"TopBarShift";
"ReJail";
"DisableRejoinAtMaxPlayers";
"";
"AutoClean";
"AutoCleanDelay";
Expand Down
2 changes: 1 addition & 1 deletion Loader/Loader/Loader.server.lua
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ else
ModuleID = 7510592873; --// https://www.roblox.com/library/7510592873/Adonis-MainModule
LoaderID = 7510622625; --// https://www.roblox.com/library/7510622625/Adonis-Loader-Sceleratis-Davey-Bones-Epix

--// Note: The nightly module is updated frequently with ever commit merged to the master branch on the Adonis repo.
--// Note: The nightly module is updated frequently with every commit merged to the master branch on the Adonis repo.
--// It is prone to breaking, unstable, untested, and should not be used for anything other than testing/feature preview.
NightlyMode = false; --// If true, uses the nightly module instead of the current release module.
NightlyModuleID = 8612978896; --// https://www.roblox.com/library/8612978896/Nightlies-Adonis-MainModule
Expand Down
2 changes: 1 addition & 1 deletion Loader/Version.model.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"ClassName": "NumberValue",
"Properties": {
"Value": 251
"Value": 252
}
}
3 changes: 2 additions & 1 deletion MainModule/Client/Plugins/Anti_Cheat.lua
Original file line number Diff line number Diff line change
Expand Up @@ -337,7 +337,7 @@ return function(Vargs)
tempDecal.Texture = "rbxasset://textures/face.png" -- Its a local asset and it's probably likely to never get removed, so it will never fail to load, unless the users PC is corrupted
local coreUrls = getCoreUrls()

if not (service.GuiService.MenuIsOpen or service.ContentProvider.RequestQueueSize >= 50 or Player:GetNetworkPing() >= 750) then
if not (service.GuiService.MenuIsOpen or service.ContentProvider.RequestQueueSize >= 50 or Player:GetNetworkPing() * 1000 >= 750) then
rawContentProvider.PreloadAsync(rawContentProvider, {tempDecal, tempDecal, tempDecal, service.UnWrap(service.CoreGui), tempDecal}, function(url, status)
if url == "rbxasset://textures/face.png" and status == Enum.AssetFetchStatus.Success then
activated = true
Expand Down Expand Up @@ -540,6 +540,7 @@ return function(Vargs)
if
not string.find(string.lower(Message), "failed to load", 1, true) and
not string.find(string.lower(Message), "meshcontentprovider failed to process", 1, true) and
not string.find(string.lower(Message), "unknown 'active' animation:", 1, true) and
(string.match(string.lower(Message), string.lower(v)) or string.match(Message, v))
then
return true
Expand Down
13 changes: 10 additions & 3 deletions MainModule/Client/UI/Aero/Output.rbxmx
Original file line number Diff line number Diff line change
Expand Up @@ -232,7 +232,7 @@
<YS>0</YS>
<YO>4</YO>
</UDim2>
<bool name="RichText">false</bool>
<bool name="RichText">true</bool>
<Ref name="RootLocalizationTable">null</Ref>
<float name="Rotation">0</float>
<bool name="Selectable">false</bool>
Expand Down Expand Up @@ -314,6 +314,7 @@ return function(data, env)
local t1 = main.Title
local t2 = main.Message
local msg = data.Message
local title = data.Title
local color = data.Color

local found = client.UI.Get("Output")
Expand All @@ -325,8 +326,14 @@ return function(data, env)
end
end
end

t2.Text = msg
if title then
t2.Text = `<b>{title}</b>: {msg}`
else
t2.Text = msg
end
if color then
t2.TextColor3 = color
end

task.spawn(function()
local sound = Instance.new("Sound",service.LocalContainer())
Expand Down
2 changes: 1 addition & 1 deletion MainModule/Client/UI/Aero/Window.rbxmx
Original file line number Diff line number Diff line change
Expand Up @@ -2769,7 +2769,7 @@ return function(data, env)
api:SetSpecial("Refresh", DoRefresh)
api:SetSpecial("AddTitleButton", function(ignore, data) if type(ignore) == "table" and not data then data = ignore end return addTitleButton(data) end)
api:SetSpecial("Ready", function() if onReady then onReady() end gTable.Ready() BringToFront() end)
api:SetSpecial("BindEvent", function(ignore, ...) Event(...) end)
api:SetSpecial("BindEvent", function(ignore, ...) return Event(...) end)
api:SetSpecial("Hide", function(ignore, hide) doHide(hide) end)
api:SetSpecial("SetTitle", function(ignore, newTitle) Titlef.Text = newTitle end)
api:SetSpecial("SetPosition", function(ignore, newPos) setPosition(newPos) end)
Expand Down
34 changes: 22 additions & 12 deletions MainModule/Client/UI/Default/Output.rbxmx
Original file line number Diff line number Diff line change
Expand Up @@ -197,7 +197,7 @@
<YS>0</YS>
<YO>4</YO>
</UDim2>
<bool name="RichText">false</bool>
<bool name="RichText">true</bool>
<Ref name="RootLocalizationTable">null</Ref>
<float name="Rotation">0</float>
<bool name="Selectable">false</bool>
Expand Down Expand Up @@ -261,30 +261,40 @@ return function(data, env)
setfenv(1, env)
end

local playergui = service.PlayerGui
local localplayer = service.Players.LocalPlayer
local playerGui = service.PlayerGui
local localPlayer = service.Players.LocalPlayer
local scr = client.UI.Prepare(script.Parent.Parent)
local main = scr.Main
local t1 = main.Title
local t2 = main.Message
local msg = data.Message
local color = data.Color
local titleLabel = main.Title
local messageLabel = main.Message
local messageData = data.Message
local titleData = data.Title or ""
local colorIn = data.Color

local formattedMessage
if titleData then
formattedMessage = `<b>{titleData}</b>: {messageData}`
else
formattedMessage = messageData
end

local found = client.UI.Get("Output")
if found then
for i,v in pairs(found) do
for _,v in pairs(found) do
local p = v.Object
if p and p.Parent then
p.Main.Position = UDim2.new(0, 0, 0.35, p.Main.Position.Y.Offset+50)
end
end
end

t2.Text = msg
t2.Font = "Arial"
--t2.Position = UDim2.new(0, 0, 0.35, 0)
messageLabel.Text = formattedMessage
messageLabel.Font = Enum.Font.SourceSans
if data.Color then
messageLabel.TextColor3 = data.Color
end
gTable.Ready()
wait(5)
task.wait(5)
gTable.Destroy()
end]]></ProtectedString>
<int64 name="SourceAssetId">-1</int64>
Expand Down
2 changes: 1 addition & 1 deletion MainModule/Client/UI/Default/PerfStats.lua
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ return function(data, env)
"Render: %.1f fps\nPhysics: %.1f fps\nPing: %d ms",
1 / service["RunService"].RenderStepped:Wait(),
workspace:GetRealPhysicsFPS(),
service.Players.LocalPlayer:GetNetworkPing()
service.Players.LocalPlayer:GetNetworkPing() * 1000
)
task.wait(1)
until not gfps or not gTable.Active
Expand Down
53 changes: 42 additions & 11 deletions MainModule/Client/UI/Default/UserPanel.lua
Original file line number Diff line number Diff line change
Expand Up @@ -334,13 +334,9 @@ return function(data, env)
end
end

if window then
local playerData = Remote.Get("PlayerData")
local chatMod = Remote.Get("Setting",{"Prefix","SpecialPrefix","BatchKey","AnyPrefix","DonorCommands","DonorCapes"})
local settingsData = Remote.Get("AllSettings")

Variables.Aliases = playerData.Aliases or {}

if window then
local commandPrefix = ":"
local playerData, chatMod, settingsData
local tabFrame = window:Add("TabFrame", {
Size = UDim2.new(1, -10, 1, -10);
Position = UDim2.new(0, 5, 0, 5);
Expand Down Expand Up @@ -404,7 +400,7 @@ return function(data, env)
BackgroundTransparency = 0.5;
Events = {
MouseButton1Down = function()
Remote.Send("ProcessCommand", `{chatMod.Prefix}cmds`)
Remote.Send("ProcessCommand", `{commandPrefix}cmds`)
end
}
})
Expand Down Expand Up @@ -474,13 +470,47 @@ return function(data, env)

end

local LOAD_ICON = {
BackgroundTransparency = 1;
Size = UDim2.new(0, 14, 0, 14);
Position = UDim2.new(0.5, 0, 0.5, 0);
AnchorPoint = Vector2.new(0.5, 0.5);
Image = "rbxassetid://69395121";
ImageTransparency = 0.1;
ZIndex = 10;
}

local loadingIcons = {donorTab:Add("ImageLabel", LOAD_ICON), keyTab:Add("ImageLabel", LOAD_ICON), aliasTab:Add("ImageLabel", LOAD_ICON), clientTab:Add("ImageLabel", LOAD_ICON), gameTab:Add("ImageLabel", LOAD_ICON)}
gTable = window.gTable
window:Ready()

task.spawn(function()
local start = os.clock()

while loadingIcons[1].Parent do
for _, v in loadingIcons do
v.Rotation = -(os.clock() - start)/(1/60)*10
end
task.wait(1/60)
end
end)

playerData = Remote.Get("PlayerData")
chatMod = Remote.Get("Setting",{"Prefix","SpecialPrefix","BatchKey","AnyPrefix","DonorCommands","DonorCapes"})
settingsData = Remote.Get("AllSettings")
Variables.Aliases = playerData.Aliases or {}
commandPrefix = chatMod.Prefix

for _, v in loadingIcons do
v:Destroy()
end

--// Donor Tab
do
local donorData = playerData.Donor
local donorData = playerData.Donor
local currentMaterial = donorData and donorData.Cape.Material
local currentTexture = donorData and donorData.Cape.Image
local currentColor = donorData and donorData.Cape.Color
local currentTexture = donorData and donorData.Cape.Image
local currentColor = donorData and donorData.Cape.Color

if type(currentColor) == "table" then
currentColor = Color3.new(unpack(currentColor, 1, 3))
Expand Down Expand Up @@ -979,6 +1009,7 @@ return function(data, env)
Variables.WaitingForBind = false
if keyInputHandler then
keyInputHandler:Disconnect()
keyInputHandler = nil
end
end
end
Expand Down
6 changes: 3 additions & 3 deletions MainModule/Client/UI/Default/Window.rbxmx
Original file line number Diff line number Diff line change
Expand Up @@ -2033,13 +2033,13 @@ return function(data, env)
Drag.Position = UDim2.new(0.5, -Drag.AbsoluteSize.X/2, 0.5, -Main.AbsoluteSize.Y/2)
end
end

function setMinSize(Table)
if Table and typeof(Table) == "table" then
MinSize = Table
end
end

function setMaxSize(Table)
if Table and typeof(Table) == "table" then
MaxSize = Table
Expand Down Expand Up @@ -2497,7 +2497,7 @@ return function(data, env)
api:SetSpecial("Refresh", DoRefresh)
api:SetSpecial("AddTitleButton", function(ignore, data) if type(ignore) == "table" and not data then data = ignore end return addTitleButton(data) end)
api:SetSpecial("Ready", function() if onReady then onReady() end gTable.Ready() BringToFront() end)
api:SetSpecial("BindEvent", function(ignore, ...) Event(...) end)
api:SetSpecial("BindEvent", function(ignore, ...) return Event(...) end)
api:SetSpecial("Hide", function(ignore, hide) doHide(hide) end)
api:SetSpecial("SetTitle", function(ignore, newTitle) Titlef.Text = newTitle end)
api:SetSpecial("SetPosition", function(ignore, newPos) setPosition(newPos) end)
Expand Down
13 changes: 9 additions & 4 deletions MainModule/Client/UI/Rounded/Output.rbxmx
Original file line number Diff line number Diff line change
Expand Up @@ -422,6 +422,7 @@ return function(data, env)
local t1 = main.Title
local t2 = main.Message
local msg = data.Message
local title = data.Title
local color = data.Color
--[[
local found = client.UI.Get("Output")
Expand All @@ -433,9 +434,13 @@ return function(data, env)
end
end
end--]]

t2.Text = msg
t2.Font = "Arial"
local formattedMessage = msg
if title then formattedMessage = `<b>{title}</b>: {msg}` end
t2.Text = formattedMessage
t2.Font = "SourceSans"
if color then
t2.TextColor3 = color
end
--t2.Position = UDim2.new(0, 0, 0.35, 0)
gTable.Ready()
wait(5)
Expand Down Expand Up @@ -469,4 +474,4 @@ end]]></ProtectedString>
</Item>
</Item>
</Item>
</roblox>
</roblox>
Loading

0 comments on commit 96cfdd7

Please sign in to comment.