Skip to content

Commit 3431dc9

Browse files
authored
Release v275
2 parents 9c3c2df + 1bcac69 commit 3431dc9

File tree

14 files changed

+52
-47
lines changed

14 files changed

+52
-47
lines changed

CONTRIBUTING.md

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,14 @@
66

77
Adonis is an ever-expanding, frequently updated, and sometimes complex system.
88
To keep Adonis functional and somewhat readable rather than a tangled mess, this document sets out the policies governing contributions to consider before submitting a pull request:
9+
(A very abridged version is available [here](https://github.com/Epix-Incorporated/Adonis/blob/master/.github/pull_request_template.md))
910

1011
## 1. Governance
1112

1213
- Pull requests (PRs) are reviewed and approved by [@Sceleratis](https://github.com/Sceleratis) or any of the appointed community maintainers:
13-
[@Coasterteam](https://github.com/Coasterteam), [@joritochip](https://github.com/joritochip), [@Expertcoderz](https://github.com/Expertcoderz), and [@Dimenpsyonal](https://github.com/Dimenpsyonal).
14+
[@Coasterteam](https://github.com/Coasterteam), [@joritochip](https://github.com/joritochip), [@Expertcoderz](https://github.com/Expertcoderz), [@Dimenpsyonal](https://github.com/Dimenpsyonal), and [@GalacticInspired](https://github.com/GalacticInspired).
1415
- Maintainers may edit PR titles, descriptions, and labels for ease of classification.
15-
- Community members are allowed and encouraged to comment on, review, and provide feedback on PRs, but final approval rests with maintainers.
16+
- Community members are allowed and encouraged to comment on, review, and provide feedback on PRs, though final approval rests with maintainers.
1617

1718
## 2. Scope of Contributions
1819

@@ -60,17 +61,17 @@ To keep Adonis functional and somewhat readable rather than a tangled mess, this
6061
## 5. Changelog Policy
6162

6263
- The changelog is the record of all notable changes.
63-
- Each release of Adonis is documented within the changelog Adonis uses two forms of releases:
64+
- Each release of Adonis is documented within the changelog. Adonis uses two forms of releases:
6465
- Full releases: most PRs are released in full releases.
6566
- Patch releases: denoted by adding a decimal version. Maintainers may choose to include your PR in a patch release if it is related to a non-trivial and/or uncommon bug.
6667
- Releases are delineated by:
6768
* the version number,
68-
* the ISO 8601 date (YYYY–MM–DD) and the time in UTC,
69-
* and the name of the maintainer responsible for that release (in old cases the changelog author(s))
69+
* the ISO 8601 date (YYYY–MM–DD) and the time (usually in UTC, some old releases in EST),
70+
* and the name of the maintainer responsible for that release.
7071
- The version number uses decimal versioning (e.g. v1.2 is an older version than v1.12), older releases use semantic versioning.
7172
- Entries should be concise, in the present tense, and reference Adonis commands by their usage name (e.g. `:somecommand`).
7273
- Maintainers will base the changelog entry off the title of your PR and may copyedit it for clarity.
73-
- Maintainers may edit or reorganize entries before release publication.
74+
- Maintainers may edit or reorganise entries before release publication.
7475

7576
## 6. Branching and Version Control
7677

@@ -106,7 +107,7 @@ To keep Adonis functional and somewhat readable rather than a tangled mess, this
106107

107108
- Accepted contributors may request the "GitHub Contributor" role in the [Discord server](https://discord.com/invite/H5RvTP3) and the "Contributors" rank in the [Roblox group](https://www.roblox.com/groups/886423).
108109
- To request recognition, post your GitHub, Discord, and Roblox usernames in the [discussion thread](https://github.com/Epix-Incorporated/Adonis/discussions/433).
109-
- Recognition is **not** granted for non-code contributions (e.g. .github changes, typo fixes).
110+
- Recognition is **not** granted for non-code contributions (e.g. .github changes, typo fixes), a maintainer will usually let you know if this is the case.
110111

111112
## 11. Communication
112113

LICENSE.luau

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
33
MIT License
44
5-
Copyright (c) 2016-2025 Sceleratis (https://github.com/Sceleratis), Epix Incorporated, and the Adonis Community.
5+
Copyright (c) 2016-2026 Sceleratis (https://github.com/Sceleratis), Epix Incorporated, and the Adonis Community.
66
77
Permission is hereby granted, free of charge, to any person obtaining a copy
88
of this software and associated documentation files (the "Software"), to deal

LICENSE.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
MIT License
22

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

55
Permission is hereby granted, free of charge, to any person obtaining a copy
66
of this software and associated documentation files (the "Software"), to deal

Loader/Config/Settings.luau

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -285,7 +285,6 @@ settings.WarnDangerousCommand = false -- Do dangerous commands ask for confirma
285285
settings.CommandFeedback = false -- Should players be notified when commands with non-obvious effects are run on them?
286286
settings.CrossServerCommands = true -- Are commands which affect more than one server enabled?
287287
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
288-
settings.CreatorPowers = true -- Gives me creator-level admin; This is strictly used for debugging; I can't debug without full access to the script
289288
settings.CodeExecution = false -- Enables the use of code execution in Adonis. Scripting related (such as :s) and a few other commands require this
290289
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
291290
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.
@@ -467,7 +466,6 @@ descs.BanMessage = [[ Message shown to banned users ]]
467466
descs.LockMessage = [[ Message shown to people when they are kicked while the game is :slocked ]]
468467
descs.SystemTitle = [[ Title to display in :sm ]]
469468

470-
descs.CreatorPowers = [[ Gives me creator-level admin; This is strictly used for debugging; I can't debug without access to the script and specific owner commands ]]
471469
descs.MaxLogs = [[ Maximum logs to save before deleting the oldest; Too high can lag the game ]]
472470
descs.SaveCommandLogs = [[ If command logs are saved to the datastores ]]
473471
descs.Notification = [[ Whether or not to show the "You're an admin" and "Updated" notifications ]]
@@ -576,7 +574,6 @@ order = {
576574
"CommandFeedback";
577575
"CrossServerCommands";
578576
"ChatCommands";
579-
"CreatorPowers";
580577
"";
581578
"SilentCommandDenials";
582579
"OverrideChatCallbacks";

Loader/Version.model.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"ClassName": "NumberValue",
33
"Properties": {
4-
"Value": 274
4+
"Value": 275
55
}
66
}

MainModule/Client/UI/Default/Console.rbxmx

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -731,10 +731,15 @@ return function(data, env)
731731
local tabWhiteSpace = " "
732732
if string.sub(text.Text, string.len(text.Text)) == tabWhiteSpace then
733733
if autoList:FindFirstChild("Entry 0") then
734-
local args = string.split(text.Text, splitKey) -- Get command args
735-
local textWithoutLastArg = string.sub(text.Text, 1, string.len(text.Text) - string.len(args[#args])) -- Remove the last arg
734+
local args = string.split(text.Text, splitKey)
735+
args[#args] = nil
736+
local textWithoutLastArg = table.concat(args, splitKey)
736737

737-
text.Text = `{textWithoutLastArg}{autoList["Entry 0"].Text} ` -- Combine the text witout the last arg and the player name
738+
if textWithoutLastArg ~= "" then
739+
textWithoutLastArg ..= splitKey
740+
end
741+
742+
text.Text = textWithoutLastArg .. autoList["Entry 0"].Text .. " "
738743
elseif scroll:FindFirstChild("Entry 0") then
739744
text.Text = string.split(scroll["Entry 0"].Text, "<")[1]
740745
end

MainModule/Client/UI/Default/Profile.luau

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -207,15 +207,17 @@ return function(data, env)
207207
local friendCount = 0
208208
local onlineCount = 0
209209

210-
for _, user in data.OnlineFriends do
211-
onlineFriends[user.VisitorId] = {
212-
lastOnline = DateTime.fromIsoDate(user.LastOnline),
213-
isOnline = user.IsOnline,
214-
lastLocation = user.LastLocation,
215-
placeId = user.PlaceId,
216-
jobId = user.GameId,
217-
locationType = LOCATION_TYPE[user.LocationType and user.LocationType + 1]
218-
}
210+
if type(data.OnlineFriends) == "table" then
211+
for _, user in pairs(data.OnlineFriends) do
212+
onlineFriends[user.VisitorId] = {
213+
lastOnline = DateTime.fromIsoDate(user.LastOnline),
214+
isOnline = user.IsOnline,
215+
lastLocation = user.LastLocation,
216+
placeId = user.PlaceId,
217+
jobId = user.GameId,
218+
locationType = LOCATION_TYPE[user.LocationType and user.LocationType + 1]
219+
}
220+
end
219221
end
220222

221223
Routine(function()
@@ -478,4 +480,4 @@ return function(data, env)
478480
else
479481
gametab:Disable()
480482
end
481-
end
483+
end

MainModule/Server/Commands/Moderators.luau

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ return function(Vargs, env)
3838

3939
ESP = {
4040
Prefix = Settings.Prefix;
41-
Commands = {"esp"};
41+
Commands = {"esp", "xray"};
4242
Args = {"target (optional)", "brickcolor (optional)"};
4343
Filter = true;
4444
Description = "Allows you to see <target> (or all humanoids if no target is supplied) through walls";
@@ -62,7 +62,7 @@ return function(Vargs, env)
6262

6363
UnESP = {
6464
Prefix = Settings.Prefix;
65-
Commands = {"unesp"};
65+
Commands = {"unesp", "unxray"};
6666
Args = {};
6767
Filter = true;
6868
Description = "Removes ESP";
@@ -7498,7 +7498,7 @@ return function(Vargs, env)
74987498
if UserId then
74997499
local success, samePlace, errorMessage, placeId, jobId = pcall(service.TeleportService.GetPlayerPlaceInstanceAsync, service.TeleportService, UserId)
75007500
if success then
7501-
assert(samePlace, "You're already in this server")
7501+
assert(not samePlace, "You're already in this server")
75027502
if placeId and jobId then
75037503
service.TeleportService:TeleportAsync(placeId, {plr}, service.New("TeleportOptions", {
75047504
ServerInstanceId = jobId

MainModule/Server/Core/Admin.luau

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -745,12 +745,6 @@ return function(Vargs, GetEnv)
745745

746746
IsPlaceOwner = function(p)
747747
if type(p) == "userdata" and p:IsA("Player") then
748-
--// These are my accounts; Lately I've been using my game dev account(698712377) more so I'm adding it so I can debug without having to sign out and back in (it's really a pain)
749-
--// Disable CreatorPowers in settings if you don't trust me. It's not like I lose or gain anything either way. Just re-enable it BEFORE telling me there's an issue with the script so I can go to your place and test it.
750-
if Settings.CreatorPowers and table.find({1237666, 76328606, 698712377}, p.UserId) then
751-
return true
752-
end
753-
754748
if tonumber(CreatorId) and p.UserId == CreatorId then
755749
return true
756750
end

MainModule/Server/Core/Core.luau

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -177,7 +177,6 @@ return function(Vargs, GetEnv)
177177
Ranks = true;
178178
Commands = true;
179179

180-
CreatorPowers = true;
181180
CodeExecution = true;
182181
PlayerDataKeyBlacklist = true;
183182

0 commit comments

Comments
 (0)