Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
63 commits
Select commit Hold shift + click to select a range
8124150
Partially revert PR-1673 due to unhandled error
GalacticInspired Dec 30, 2024
66d8d26
Update Changelog v261.3
Dimenpsyonal Dec 30, 2024
2de2a12
Merge pull request #1807 from GalacticInspired/trello-fix-temp
Dimenpsyonal Dec 30, 2024
66fdb87
Fixed TextBox capability warning (#1812)
fxeP1 Jan 3, 2025
d71b97a
Fix indexing nil tab (#1800)
kaiserandaxl Jan 3, 2025
71b6336
Fix BrickColor typo inside sing command (#1811)
fxeP1 Jan 3, 2025
8e557b3
Add override for TShirt Asset Type (#1799)
kaiserandaxl Jan 3, 2025
5f18af7
v262 prelim changelog
Dimenpsyonal Jan 3, 2025
463e105
Fix non-extant log logging
Dimenpsyonal Jan 4, 2025
80754b1
Fix ServerNewDex not logging correctly (#1814)
NoobBucket Jan 4, 2025
f16549c
Update Changelog.luau
Dimenpsyonal Jan 4, 2025
2616b83
Fix :oddliest (#1775)
WalkerOfBacon Jan 8, 2025
1e2c360
Convert test case to nightly mode (#1669)
ccuser44 Jan 8, 2025
ca5d04f
Update urgent messages module on publish (#1697)
ccuser44 Jan 8, 2025
3193498
Update Roblox StandardLib before lint (#1764)
ccuser44 Jan 8, 2025
b78a5e4
Use JIT for Visualizer and Slider and use optimization level 2 for Vi…
ccuser44 Jan 8, 2025
cf15da5
add !sit command (#1776)
TheSkout001 Jan 8, 2025
03e233d
Add a way to define cameras in settings (#1777)
WalkerOfBacon Jan 8, 2025
082769e
Allow team names with spaced to be created via :teams (#1778)
WalkerOfBacon Jan 8, 2025
2998ebf
Add R15 support for :dog (#1781)
WalkerOfBacon Jan 8, 2025
88bcd0f
[Core.luau] Add task.wait workaround for loading large data in Studio…
wilsontulus Jan 8, 2025
a8ffdd1
New "clear" sub-command on "whitelist" for easy whitelist clearing (#…
GalacticInspired Jan 8, 2025
e1c0bcc
Update Changelog.luau
Dimenpsyonal Jan 8, 2025
258b376
Fix quotation
Dimenpsyonal Jan 8, 2025
3f21e39
Attempt to fix unbanning on changed player names (#1819)
fxeP1 Jan 9, 2025
071e148
Update Changelog.luau
Dimenpsyonal Jan 9, 2025
7aceaaf
Fixed friends tab on the !profile command. (#1821)
convxors Jan 10, 2025
74cff73
Revert "add !sit command (#1776)" (#1820)
Dimenpsyonal Jan 10, 2025
f93b711
Update Changelog.luau
Dimenpsyonal Jan 10, 2025
3608b08
Fix :pchat glitching (#1809)
WalkerOfBacon Jan 11, 2025
c367391
Use standardized naming for build files that respects gitignore (#1817)
ccuser44 Jan 11, 2025
4aff151
Update TextField PlaceholderColor3 (#1806)
ImFirstPlace Jan 11, 2025
c6a2884
Update the Licence Date (#1815)
Jgard12521 Jan 11, 2025
0cf0aa0
Fix debounce for antiexploit notifications (#1783)
Speeder323 Jan 11, 2025
559683d
Set argument range limits on :lowres (#1823)
Expertcoderz Jan 11, 2025
5ef191a
Update Changelog.luau
Dimenpsyonal Jan 11, 2025
07c77c4
Github Username Changed (#1825)
convxors Jan 12, 2025
250d0a3
GitHub Username Changed (#1826)
btt-t Jan 12, 2025
0f20c27
Update SECURITY.md to match CoasterTeam's message (#1810)
ProjectHSI Jan 12, 2025
1d89bf4
Update Changelog.luau
Dimenpsyonal Jan 12, 2025
303fec8
Clamp #num selector to max players
Expertcoderz Jan 13, 2025
fda83d8
Load plugins asynchronously (#1822)
Expertcoderz Jan 13, 2025
f4176fa
Update Changelog.luau
Dimenpsyonal Jan 13, 2025
3c13b22
Update Version.model to 263
Dimenpsyonal Jan 13, 2025
f65cdf2
Change default prefix
Dimenpsyonal Jan 13, 2025
675e023
Change prefix
Dimenpsyonal Jan 13, 2025
6161534
Change prefix
Dimenpsyonal Jan 13, 2025
b95a500
Remove default theme
Dimenpsyonal Jan 14, 2025
79fdfc7
Readd Default theme
Dimenpsyonal Jan 14, 2025
f72db19
Move DefaultTheme down
Dimenpsyonal Jan 14, 2025
0502926
Move defaulttheme down
Dimenpsyonal Jan 14, 2025
34d6774
Convert more models out of XML (#1831)
ccuser44 Jan 17, 2025
6a735fc
Prevent creating a team with the same name (#1836)
WalkerOfBacon Jan 22, 2025
85d985b
Update :watchcam description (#1835)
Z3phrz Jan 22, 2025
acbff4a
Show command aliases in :commands (#1833)
WalkerOfBacon Jan 22, 2025
ee457e8
Disable visualizer when window is minimized (#1832)
ccuser44 Jan 22, 2025
0435a94
Update Changelog.luau
Dimenpsyonal Jan 22, 2025
ba62ee2
Update time
Dimenpsyonal Jan 22, 2025
e57a962
fix spelling errors/etc. in comments (#1730)
hallowxd Jan 23, 2025
b5b2831
Merge pull request #1829 from Dimenpsyonal/master
Dimenpsyonal Jan 27, 2025
4225863
Add multiple prefix support and adds ; as a prefix. (#1841)
SuperCater Jan 27, 2025
6d1c959
rtezrhfgshfsd
GalacticInspired Jan 28, 2025
e419bb2
Merge branch 'master' into juzgkhtfvgzufjktjvhgk
GalacticInspired Jan 28, 2025
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions .github/alerts.deploy.project.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"name": "MainModule",
"tree": {
"$path": "../MainModule/Server/Dependencies/__URGENT_MESSAGES.luau"
}
}
23 changes: 18 additions & 5 deletions .github/workflows/publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -67,11 +67,14 @@ jobs:
path: ${{ steps.naming.outputs.output_name }}.rbxm

- name: Build Loader
run: rojo build -o loader.rbxm .github/loader.deploy.project.json
run: rojo build -o Adonis_Loader.rbxm .github/loader.deploy.project.json

- name: Build MainModule
run: rojo build -o module.rbxm .github/module.deploy.project.json

run: rojo build -o Adonis_MainModule.rbxm .github/module.deploy.project.json

- name: Build Alerts Module
run: rojo build -o Adonis_AlertsModule.rbxm .github/alerts.deploy.project.json

- name: Send Standalone Release to Discord channel
uses: tsickert/discord-webhook@v6.0.0
with:
Expand All @@ -84,7 +87,7 @@ jobs:
url: "${{ secrets.PUBURL2 }}/?assetId=${{ secrets.LOADER_ID }}"
method: "POST"
contentType: "multipart/form-data"
files: '{ "file": "loader.rbxm" }'
files: '{ "file": "Adonis_Loader.rbxm" }'
customHeaders: '{ "upload-secret": "${{ secrets.PUBURL2_SECRET }}" }'
timeout: 10000

Expand All @@ -94,6 +97,16 @@ jobs:
url: "${{ secrets.PUBURL2 }}/?assetId=${{ secrets.MODULE_ID }}"
method: "POST"
contentType: "multipart/form-data"
files: '{ "file": "module.rbxm" }'
files: '{ "file": "Adonis_MainModule.rbxm" }'
customHeaders: '{ "upload-secret": "${{ secrets.PUBURL2_SECRET }}" }'
timeout: 10000

- name: Publish Alerts Module
uses: fjogeleit/http-request-action@v1.16.1
with:
url: "${{ secrets.PUBURL2 }}/?assetId=${{ secrets.ALERTS_MODULE_ID }}"
method: "POST"
contentType: "multipart/form-data"
files: '{ "file": "Adonis_AlertsModule.rbxm" }'
customHeaders: '{ "upload-secret": "${{ secrets.PUBURL2_SECRET }}" }'
timeout: 10000
2 changes: 1 addition & 1 deletion CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ There is a very clear/obvious difference between unavoidably complex code and in

## Q: Is there a style guide for writing code?

**A:** Not really, but we would normally try to follow the format of the other existing code in the module we are editing, as well as the [Roblox Lua Style Guide](https://roblox.github.io/lua-style-guide/) where applicable. Also, be sure to use US English spellings for both code variable names and user-facing text.
**A:** Not really, but we would normally try to follow the format of the other existing code in the module we are editing, as well as the [Roblox Luau Style Guide](https://roblox.github.io/lua-style-guide/) where applicable. Also, be sure to use US English spellings for both code variable names and user-facing text.

## Q: What are some things I should watch out for when submitting my changes?

Expand Down
2 changes: 1 addition & 1 deletion LICENSE.luau
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

MIT License

Copyright (c) 2016-2024 Sceleratis (https://github.com/Sceleratis), Epix Incorporated, and the Adonis Community.
Copyright (c) 2016-2025 Sceleratis (https://github.com/Sceleratis), Epix Incorporated, and the Adonis Community.

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
Expand Down
2 changes: 1 addition & 1 deletion LICENSE.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
MIT License

Copyright (c) 2016-2024 Sceleratis (https://github.com/Sceleratis), Epix Incorporated, and the Adonis Community.
Copyright (c) 2016-2025 Sceleratis (https://github.com/Sceleratis), Epix Incorporated, and the Adonis Community.

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
Expand Down
2 changes: 1 addition & 1 deletion Loader/Config/API.luau
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
--[[
If you're learning how to create in Adonis, the wiki may be of help.
The wiki contains informationa about the Adonis API and how to use it;
The wiki contains information about the Adonis API and how to use it;
as well as information about settings and how to use Adonis.

It can be viewed here:
Expand Down
125 changes: 68 additions & 57 deletions Loader/Config/Settings.luau

Large diffs are not rendered by default.

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": 261
"Value": 263
}
}
8 changes: 5 additions & 3 deletions MainModule/Client/Client.luau
Original file line number Diff line number Diff line change
Expand Up @@ -218,7 +218,7 @@ do
task.wait(1)
service.Player:Kick(info)
end)

if not isStudio then
spawn(pcall, function()
task.wait(5)
Expand Down Expand Up @@ -575,7 +575,7 @@ return service.NewProxy({
for i, line in ipairs(client.Changelog) do
client.FormattedChangelog[i] = applyColour(line)
end

--// Setup MatIcons
do
local MaterialIcons = oldReq(service_UnWrap(client.Shared.MatIcons))
Expand Down Expand Up @@ -752,7 +752,9 @@ return service.NewProxy({
continue
end

LoadModule(module, false, { script = module, cPcall = client.cPcall }) --noenv
task.defer(LoadModule, module, false, { --noenv
script = module, cPcall = client.cPcall
})
end

--// We need to do some stuff *after* plugins are loaded (in case we need to be able to account for stuff they may have changed before doing something, such as determining the max length of remote commands)
Expand Down
4 changes: 2 additions & 2 deletions MainModule/Client/Core/Process.luau
Original file line number Diff line number Diff line change
Expand Up @@ -169,7 +169,7 @@ return function(Vargs, GetEnv)
end

local textbox = service.UserInputService:GetFocusedTextBox()
if textbox then
if textbox and service.CheckProperty(textbox, "ReleaseFocus") then
textbox:ReleaseFocus()
end

Expand All @@ -179,7 +179,7 @@ return function(Vargs, GetEnv)
HandleTextChatCommands = function()
local data = Remote.Get("PlayerData")
local adminLevel, isDonor = data.AdminLevel, data.isDonor

if service.TextChatService and service.TextChatService.ChatVersion == Enum.ChatVersion.TextChatService then
local function onCommandAdded(command)
if not command:IsA("TextChatCommand") then
Expand Down
2 changes: 1 addition & 1 deletion MainModule/Client/UI/BasicAdmin/Message.rbxmx
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<Properties>
<BinaryString name="AttributesSerialize"></BinaryString>
<bool name="AutoLocalize">false</bool>
<SecurityCapabilities name="Capabilities">0</SecurityCapabilities>
<SecurityCapabilities name="Capabilities">0</SecurityCapabilities>dgxzhjgfhjfhgjhdjgfzjdhg
<bool name="ClipToDeviceSafeArea">true</bool>
<bool name="DefinesCapabilities">false</bool>
<int name="DisplayOrder">0</int>
Expand Down
1 change: 1 addition & 0 deletions MainModule/Client/UI/Default/Music/Slider.luau
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
--!native
--------------------------------------------------------------------------------------------
-------------------------------------- Slider Module ---------------------------------------
-- [Adonis Maintainer]: P3tray
Expand Down
2 changes: 2 additions & 0 deletions MainModule/Client/UI/Default/Music/Visualizer.luau
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
--!native
--!optimize 2
local RunService = game:GetService("RunService")

local module = {}
Expand Down
9 changes: 8 additions & 1 deletion MainModule/Client/UI/Default/Music/init.luau
Original file line number Diff line number Diff line change
Expand Up @@ -205,7 +205,14 @@ return function(data, env)
Position = UDim2.new(0, 10, 1, -410);
OnClose = function()
doOnClose()
end
end,
OnMinimized = function(opened)
if opened and not visualiser.Sound then
visualiser:LinkToSound(audioLib:GetSound())
elseif not opened and visualiser.Sound then
visualiser:UnlinkFromSound()
end
end,
})

-- The controls frame at the bottom of the window
Expand Down
3 changes: 1 addition & 2 deletions MainModule/Client/UI/Default/PrivateChat.luau
Original file line number Diff line number Diff line change
Expand Up @@ -321,7 +321,7 @@ return function(data, env)
Parent = chatlog;
FillDirection = "Vertical";
HorizontalAlignment = "Left";
VerticalAlignment = "Bottom";
VerticalAlignment = "Top";
SortOrder = "LayoutOrder";
})

Expand Down Expand Up @@ -358,7 +358,6 @@ return function(data, env)
local p = vargs[1]
local message = vargs[2]
if newMessage then
print('sdf')
newMessage({
PlayerName = p.Name;
PlayerDisplayName = p.DisplayName;
Expand Down
33 changes: 22 additions & 11 deletions MainModule/Client/UI/Default/Profile.luau
Original file line number Diff line number Diff line change
Expand Up @@ -162,29 +162,40 @@ return function(data, env)
window:Ready()

do --// Friends Tab
local function pagesToTable(pages)
local items = {}
while true do
table.insert(items, pages:GetCurrentPage())
if pages.IsFinished then
break
end
pages:AdvanceToNextPageAsync()
end
return items
end
local function iterPageItems(pages)
local contents = pagesToTable(pages)
local pagenum = 1
local lastpagenum = #contents
return coroutine.wrap(function()
local pagenum = 1
while true do
for _, item in ipairs(pages:GetCurrentPage()) do
while pagenum <= lastpagenum do
for _, item in ipairs(contents[pagenum]) do
coroutine.yield(item, pagenum)
end
if pages.IsFinished then
break
end
pages:AdvanceToNextPageAsync()

pagenum += 1
end
end)
end

local LOCATION_TYPE = {"Mobile Website", "Mobile InGame", "Webpage", "Studio", "InGame", "Xbox", "Team Create"}
local LOCATION_TYPE = {"Mobile Website", "Mobile In-Game", "Webpage", "Studio", "In-Game", "Xbox", "Team Create"}
local ACTIVITY_COLOR_CODES = {
["Mobile Website"] = Color3.fromRGB(50, 140, 231);
["Mobile InGame"] = Color3.fromRGB(55, 200, 55);
["Mobile In-Game"] = Color3.fromRGB(55, 200, 55);
["Webpage"] = Color3.fromRGB(50, 140, 231);
["Studio"] = Color3.fromRGB(231, 112, 0);
["InGame"] = Color3.fromRGB(55, 200, 55);
["In-Game"] = Color3.fromRGB(55, 200, 55);
["Xbox"] = Color3.fromRGB(127, 0, 127);
["Team Create"] = Color3.fromRGB(231, 112, 0);
}
Expand All @@ -210,7 +221,7 @@ return function(data, env)
Routine(function()
for item, pageNo in iterPageItems(friendPages) do
table.insert(sortedFriends, item.Username)
local userId = item.id
local userId = item.Id
local activity = onlineFriends[userId]
friendInfoRef[item.Username] = {
id = userId;
Expand Down Expand Up @@ -467,4 +478,4 @@ return function(data, env)
else
gametab:Disable()
end
end
end
5 changes: 1 addition & 4 deletions MainModule/Client/UI/Default/Teams.luau
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ return function(data, env)
self.Active = false
self.AutoButtonColor = false
self.Text = "..."
client.Remote.Send("ProcessCommand", string.format("%snewteam%s%s%s%s", data.CmdPrefix, data.CmdSplitKey, teamName.Text, data.CmdSplitKey, teamColor.Text));
client.Remote.Send("ProcessCommand", string.format("%snewteam%s%s%s%s", data.CmdPrefix, data.CmdSplitKey, `"{teamName.Text}"`, data.CmdSplitKey, teamColor.Text));
teamName.Text = ""
teamColor.Text = ""
wait(1.2)
Expand All @@ -98,9 +98,6 @@ return function(data, env)
end;
})

teamName:GetPropertyChangedSignal("Text"):Connect(function()
teamName.Text = string.gsub(teamName.Text, data.CmdSplitKey, "")
end)
teamColor:GetPropertyChangedSignal("Text"):Connect(function()
teamColor.TextColor3 = BrickColor.new(teamColor.Text).Color
--teamColor.TextColor3 = `{BrickColor.new(teamColor.Text:sub(1, 1):upper()}{teamColor.Text:sub(2):lower()).Color}` -- unfortunately we have BrickColors with names like "New Yeller"
Expand Down
3 changes: 2 additions & 1 deletion MainModule/Client/UI/Default/UserPanel.luau
Original file line number Diff line number Diff line change
Expand Up @@ -497,7 +497,8 @@ return function(data, env)
chatMod = Remote.Get("Setting",{"Prefix","SpecialPrefix","BatchKey","AnyPrefix","DonorCommands","DonorCapes"})
settingsData = Remote.Get("AllSettings")
Variables.Aliases = playerData.Aliases or {}
commandPrefix = chatMod.Prefix
commandPrefix = if type(chatMod.Prefix) == "table" then chatMod.Prefix[1] else chatMod.Prefix


for _, v in loadingIcons do
v:Destroy()
Expand Down
Loading
Loading