Skip to content

Commit

Permalink
Added TopBarShift setting
Browse files Browse the repository at this point in the history
Allows you to move hints and stuff back down to below the top bar, currently makes a "TopBar" gui that doesn't do/display anything.
  • Loading branch information
Sceleratis committed May 9, 2021
1 parent e143a5a commit 1e25c52
Show file tree
Hide file tree
Showing 4 changed files with 22 additions and 12 deletions.
3 changes: 3 additions & 0 deletions Loader/Config/Settings.lua
Original file line number Diff line number Diff line change
Expand Up @@ -214,6 +214,7 @@ local descs = {}
settings.MaxLogs = 5000 -- Maximum logs to save before deleting the oldest
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 notifs will appear from the top edge of the window, this is acheived by offsetting them by -35 into the transparent region where roblox buttons menu/chat/leaderstat buttons are. Set this to true if you don't want hints/notifs to appear in that region.

settings.AutoClean = false -- Will auto clean service.Workspace of things like hats and tools
settings.AutoCleanDelay = 60 -- Time between auto cleans
Expand Down Expand Up @@ -309,6 +310,7 @@ local descs = {}
descs.Notification = [[ Whether or not to show the "You're an admin" and "Updated" notifications ]]
descs.CodeExecution = [[ Enables the use of code execution in Adonis; Scripting related and a few other commands require this ]]
descs.SongHint = [[ Display a hint with the current song name and ID when a song is played via :music ]]
descs.TopBarHint = [[ By default hints and notifs will appear from the top edge of the window, this is acheived by offsetting them by -35 into the transparent region where roblox buttons menu/chat/leaderstat buttons are. Set this to true if you don't want hints/notifs to appear in that region. ]]

descs.AutoClean = [[ Will auto clean service.Workspace of things like hats and tools ]]
descs.AutoBackup = [[ Run a map backup command when the server starts, this usually can be false if the server is FE, which means exploits are mostly prevented to require :restoremap ]]
Expand Down Expand Up @@ -396,6 +398,7 @@ local descs = {}
"MaxLogs";
"Notification";
"SongHint";
"TopBarShift";
"";
"AutoClean";
"AutoCleanDelay";
Expand Down
22 changes: 11 additions & 11 deletions MainModule/Client/UI/Default/TopBar.rbxmx
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<Meta name="ExplicitAutoJoints">true</Meta>
<External>null</External>
<External>nil</External>
<Item class="ScreenGui" referent="RBX742561C0545F4502AF868EFE62490EEF">
<Item class="ScreenGui" referent="RBX29C85DAA21B94171981DFF82595B7465">
<Properties>
<BinaryString name="AttributesSerialize"></BinaryString>
<bool name="AutoLocalize">false</bool>
Expand All @@ -16,7 +16,7 @@
<BinaryString name="Tags"></BinaryString>
<token name="ZIndexBehavior">0</token>
</Properties>
<Item class="TextLabel" referent="RBX6DB08F076E4A45619819847844F16A1D">
<Item class="TextLabel" referent="RBX575C7E6986DF4593979BBD742E4F96CA">
<Properties>
<bool name="Active">false</bool>
<Vector2 name="AnchorPoint">
Expand Down Expand Up @@ -54,7 +54,7 @@
<XS>0</XS>
<XO>0</XO>
<YS>0</YS>
<YO>0</YO>
<YO>-35</YO>
</UDim2>
<bool name="RichText">false</bool>
<Ref name="RootLocalizationTable">null</Ref>
Expand Down Expand Up @@ -89,11 +89,11 @@
<bool name="TextWrapped">true</bool>
<token name="TextXAlignment">2</token>
<token name="TextYAlignment">1</token>
<bool name="Visible">true</bool>
<bool name="Visible">false</bool>
<int name="ZIndex">1</int>
</Properties>
</Item>
<Item class="Frame" referent="RBXB816145E4641409D82AF39ACA9572C3C">
<Item class="Frame" referent="RBXBDB09E614D17472899D1E234FF7EFEEE">
<Properties>
<bool name="Active">false</bool>
<Vector2 name="AnchorPoint">
Expand Down Expand Up @@ -148,19 +148,19 @@
<int name="ZIndex">3</int>
</Properties>
</Item>
<Item class="Folder" referent="RBX136D05355B414424AEC622E6E2A89905">
<Item class="Folder" referent="RBX2BFAAC20462A47FE9C77EFEB38001361">
<Properties>
<BinaryString name="AttributesSerialize"></BinaryString>
<string name="Name">Config</string>
<int64 name="SourceAssetId">-1</int64>
<BinaryString name="Tags"></BinaryString>
</Properties>
<Item class="ModuleScript" referent="RBXF6F922249BE84733870BAC811AB31A2E">
<Item class="ModuleScript" referent="RBXA3BE11C2B8F542CB8D60E2A0D85CA16A">
<Properties>
<BinaryString name="AttributesSerialize"></BinaryString>
<Content name="LinkedSource"><null></null></Content>
<string name="Name">Code</string>
<string name="ScriptGuid"></string>
<string name="ScriptGuid">{1F9FE329-5DF6-4125-B448-8F52B3CB078B}</string>
<ProtectedString name="Source"><![CDATA[client = nil
cPcall = nil
Pcall = nil
Expand Down Expand Up @@ -207,14 +207,14 @@ return function(data)
end
--]]

bar.Position=UDim2.new(0,0,0,-40)
--bar.Position=UDim2.new(0,0,0,-35)
gTable:Ready()
end]]></ProtectedString>
<int64 name="SourceAssetId">-1</int64>
<BinaryString name="Tags"></BinaryString>
</Properties>
</Item>
<Item class="BoolValue" referent="RBX414A292551D7457FBF25F7F5719B6794">
<Item class="BoolValue" referent="RBX618BE40DE84A41B0A1452A8E54714E46">
<Properties>
<BinaryString name="AttributesSerialize"></BinaryString>
<string name="Name">AllowMultiple</string>
Expand All @@ -223,7 +223,7 @@ end]]></ProtectedString>
<bool name="Value">false</bool>
</Properties>
</Item>
<Item class="BoolValue" referent="RBX7F58C43D511645E4B98F10D73D93B03D">
<Item class="BoolValue" referent="RBX0FF855DF6A624002984BB49520C53DF4">
<Properties>
<BinaryString name="AttributesSerialize"></BinaryString>
<string name="Name">CanKeepAlive</string>
Expand Down
4 changes: 4 additions & 0 deletions MainModule/Server/Core/Process.lua
Original file line number Diff line number Diff line change
Expand Up @@ -803,6 +803,10 @@ return function(Vargs)
Remote.MakeGui(p,"HelpButton")
end

if Settings.TopBarShift then
Remote.MakeGui(p, "TopBar")
end

if Settings.CustomChat then
Remote.MakeGui(p,"Chat")
end
Expand Down
5 changes: 4 additions & 1 deletion MainModule/Server/Dependencies/DefaultSettings.lua
Original file line number Diff line number Diff line change
Expand Up @@ -147,7 +147,7 @@ local descs = {}

settings.Moderators = {} -- Mods; Format: {"Username"; "Username:UserId"; UserId; "Group:GroupId:GroupRank"; "Group:GroupId"; "Item:ItemID"; "GamePass:GamePassID";}
settings.Admins = {} -- Admins; Format: {"Username"; "Username:UserId"; UserId; "Group:GroupId:GroupRank"; "Group:GroupId"; "Item:ItemID"; "GamePass:GamePassID";}
settings.HeadAdmins = {} -- Head Admins; Format: {"Username"; "Username:UserId"; UserId; "Group:GroupId:GroupRank"; "Group:GroupId"; "Item:ItemID"; "GamePass:GamePassID";}
settings.HeadAdmins = {} -- Head Admins; Format: {"Username"; "Username:UserId"; UserId; "Group:GroupId:GroupRank"; "Group:GroupId"; "Item:ItemID"; "GamePass:GamePassID";}
settings.Creators = {} -- Place Owner; Format: {"Username"; "Username:UserId"; UserId; "Group:GroupId:GroupRank"; "Group:GroupId"; "Item:ItemID"; "GamePass:GamePassID";}
settings.Banned = {} -- List of people banned from the game Format: {"Username"; "Username:UserId"; UserId; "Group:GroupId:GroupRank"; "Group:GroupId"; "Item:ItemID"; "GamePass:GamePassID";}
settings.Muted = {} -- List of people muted Format: {"Username"; "Username:UserId"; UserId; "Group:GroupId:GroupRank"; "Group:GroupId"; "Item:ItemID"; "GamePass:GamePassID";}
Expand Down Expand Up @@ -214,6 +214,7 @@ local descs = {}
settings.MaxLogs = 5000 -- Maximum logs to save before deleting the oldest
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 notifs will appear from the top edge of the window, this is acheived by offsetting them by -35 into the transparent region where roblox buttons menu/chat/leaderstat buttons are. Set this to true if you don't want hints/notifs to appear in that region.

settings.AutoClean = false -- Will auto clean service.Workspace of things like hats and tools
settings.AutoCleanDelay = 60 -- Time between auto cleans
Expand Down Expand Up @@ -309,6 +310,7 @@ local descs = {}
descs.Notification = [[ Whether or not to show the "You're an admin" and "Updated" notifications ]]
descs.CodeExecution = [[ Enables the use of code execution in Adonis; Scripting related and a few other commands require this ]]
descs.SongHint = [[ Display a hint with the current song name and ID when a song is played via :music ]]
descs.TopBarHint = [[ By default hints and notifs will appear from the top edge of the window, this is acheived by offsetting them by -35 into the transparent region where roblox buttons menu/chat/leaderstat buttons are. Set this to true if you don't want hints/notifs to appear in that region. ]]

descs.AutoClean = [[ Will auto clean service.Workspace of things like hats and tools ]]
descs.AutoBackup = [[ Run a map backup command when the server starts, this usually can be false if the server is FE, which means exploits are mostly prevented to require :restoremap ]]
Expand Down Expand Up @@ -396,6 +398,7 @@ local descs = {}
"MaxLogs";
"Notification";
"SongHint";
"TopBarShift";
"";
"AutoClean";
"AutoCleanDelay";
Expand Down

0 comments on commit 1e25c52

Please sign in to comment.