Skip to content

Commit

Permalink
version-0612d81d72a8479f
Browse files Browse the repository at this point in the history
  • Loading branch information
Roblox-Client-Tracker committed Feb 1, 2018
1 parent 42ffa7a commit fa5a3d2
Show file tree
Hide file tree
Showing 31 changed files with 689 additions and 379 deletions.
43 changes: 24 additions & 19 deletions API_Dump.txt
Expand Up @@ -50,6 +50,8 @@ Class Accoutrement : Instance
Class Accessory : Accoutrement
Class Hat : Accoutrement [deprecated]
Class AdService : Instance [notCreatable]
Function void AdService:ShowVideoAd() [deprecated]
Event AdService.VideoAdClosed(bool adShown) [deprecated]
Class AdvancedDragger : Instance
Class AnalyticsService : Instance [notCreatable]
Function void AnalyticsService:ReportCounter(string counterName, int amount = 1) [RobloxScriptSecurity]
Expand Down Expand Up @@ -149,6 +151,7 @@ Class Beam : Instance
Property bool Beam.Enabled
Property bool Beam.FaceCamera
Property float Beam.LightEmission
Property float Beam.LightInfluence
Property int Beam.Segments
Property Content Beam.Texture
Property float Beam.TextureLength
Expand Down Expand Up @@ -313,8 +316,8 @@ Class Chat : Instance [notCreatable]
Function void Chat:Chat(Instance partOrCharacter, string message, ChatColor color = Blue)
Function void Chat:ChatLocal(Instance partOrCharacter, string message, ChatColor color = Blue) [RobloxScriptSecurity]
Function bool Chat:GetShouldUseLuaChat() [RobloxScriptSecurity]
YieldFunction bool Chat:CanUserChatAsync(int userId)
YieldFunction bool Chat:CanUsersChatAsync(int userIdFrom, int userIdTo)
YieldFunction bool Chat:CanUserChatAsync(int64 userId)
YieldFunction bool Chat:CanUsersChatAsync(int64 userIdFrom, int64 userIdTo)
YieldFunction string Chat:FilterStringAsync(string stringToFilter, Instance playerFrom, Instance playerTo)
YieldFunction string Chat:FilterStringForBroadcast(string stringToFilter, Instance playerFrom)
YieldFunction string Chat:FilterStringForPlayerAsync(string stringToFilter, Instance playerToFilterFor) [deprecated]
Expand Down Expand Up @@ -1799,7 +1802,7 @@ Class Player : Instance
Property bool Player.CanLoadCharacterAppearance
Property Object Player.Character
Property string Player.CharacterAppearance [notbrowsable] [deprecated]
Property int Player.CharacterAppearanceId
Property int64 Player.CharacterAppearanceId
Property ChatMode Player.ChatMode [readonly] [RobloxScriptSecurity]
Property int Player.DataComplexity [deprecated] [readonly]
Property int Player.DataComplexityLimit [deprecated] [LocalUserSecurity]
Expand All @@ -1811,7 +1814,7 @@ Class Player : Instance
Property DevTouchCameraMovementMode Player.DevTouchCameraMode
Property DevTouchMovementMode Player.DevTouchMovementMode
Property string Player.DisplayName [RobloxScriptSecurity]
Property int Player.FollowUserId [readonly]
Property int64 Player.FollowUserId [readonly]
Property bool Player.Guest [readonly] [RobloxScriptSecurity]
Property float Player.HealthDisplayDistance
Property float Player.MaximumSimulationRadius [LocalUserSecurity]
Expand All @@ -1826,9 +1829,9 @@ Class Player : Instance
Property BrickColor Player.TeamColor
Property bool Player.Teleported [hidden] [readonly] [RobloxScriptSecurity]
Property bool Player.TeleportedIn [RobloxScriptSecurity]
Property int Player.UserId
Property int64 Player.UserId
Property string Player.VRDevice [RobloxScriptSecurity]
Property int Player.userId [deprecated]
Property int64 Player.userId [deprecated]
Function void Player:ClearCharacterAppearance()
Function float Player:DistanceFromCharacter(Vector3 point)
Function FriendStatus Player:GetFriendStatus(Instance player) [RobloxScriptSecurity]
Expand Down Expand Up @@ -1868,15 +1871,15 @@ Class Player : Instance
Function void Player:saveNumber(string key, double value) [deprecated]
Function void Player:saveString(string key, string value) [deprecated]
YieldFunction Array Player:GetFriendsOnline(int maxFriends = 200)
YieldFunction int Player:GetRankInGroup(int groupId)
YieldFunction string Player:GetRoleInGroup(int groupId)
YieldFunction bool Player:IsBestFriendsWith(int userId) [deprecated]
YieldFunction bool Player:IsFriendsWith(int userId)
YieldFunction bool Player:IsInGroup(int groupId)
YieldFunction int Player:GetRankInGroup(int64 groupId)
YieldFunction string Player:GetRoleInGroup(int64 groupId)
YieldFunction bool Player:IsBestFriendsWith(int64 userId) [deprecated]
YieldFunction bool Player:IsFriendsWith(int64 userId)
YieldFunction bool Player:IsInGroup(int64 groupId)
YieldFunction void Player:LoadCharacter()
YieldFunction void Player:LoadCharacterBlocking() [LocalUserSecurity]
YieldFunction bool Player:WaitForDataReady() [deprecated]
YieldFunction bool Player:isFriendsWith(int userId) [deprecated]
YieldFunction bool Player:isFriendsWith(int64 userId) [deprecated]
YieldFunction bool Player:waitForDataReady() [deprecated]
Event Player.CharacterAdded(Instance character)
Event Player.CharacterAppearanceLoaded(Instance character)
Expand Down Expand Up @@ -1930,10 +1933,10 @@ Class Players : Instance
Function Objects Players:players() [deprecated]
YieldFunction Instance Players:GetCharacterAppearanceAsync(int64 userId)
YieldFunction Dictionary Players:GetCharacterAppearanceInfoAsync(int64 userId)
YieldFunction Instance Players:GetFriendsAsync(int userId)
YieldFunction string Players:GetNameFromUserIdAsync(int userId)
YieldFunction int Players:GetUserIdFromNameAsync(string userName)
YieldFunction Tuple Players:GetUserThumbnailAsync(int userId, ThumbnailType thumbnailType, ThumbnailSize thumbnailSize)
YieldFunction Instance Players:GetFriendsAsync(int64 userId)
YieldFunction string Players:GetNameFromUserIdAsync(int64 userId)
YieldFunction int64 Players:GetUserIdFromNameAsync(string userName)
YieldFunction Tuple Players:GetUserThumbnailAsync(int64 userId, ThumbnailType thumbnailType, ThumbnailSize thumbnailSize)
Event Players.FriendRequestEvent(Instance player, Instance player, FriendRequestEvent friendRequestEvent) [RobloxScriptSecurity]
Event Players.GameAnnounce(string message) [RobloxScriptSecurity]
Event Players.PlayerAdded(Instance player)
Expand All @@ -1946,7 +1949,7 @@ Class Plugin : Instance
Property bool Plugin.CollisionEnabled [readonly]
Property float Plugin.GridSize [readonly]
Function void Plugin:Activate(bool exclusiveMouse) [PluginSecurity]
Function Instance Plugin:CreatePluginGui(string pluginGuiId) [PluginSecurity]
Function Instance Plugin:CreatePluginGui(string pluginGuiName, bool restoreEnabledState, bool initialEnabledState) [PluginSecurity]
Function Instance Plugin:CreateToolbar(string name) [PluginSecurity]
Function JointCreationMode Plugin:GetJoinMode() [PluginSecurity]
Function Instance Plugin:GetMouse() [PluginSecurity]
Expand Down Expand Up @@ -2138,9 +2141,9 @@ Class ServiceProvider : Instance [notbrowsable]
Event ServiceProvider.ServiceAdded(Instance service)
Event ServiceProvider.ServiceRemoving(Instance service)
Class DataModel : ServiceProvider
Property int DataModel.CreatorId [readonly]
Property int64 DataModel.CreatorId [readonly]
Property CreatorType DataModel.CreatorType [readonly]
Property int DataModel.GameId [readonly]
Property int64 DataModel.GameId [readonly]
Property GearGenreSetting DataModel.GearGenreSetting [readonly]
Property Genre DataModel.Genre [readonly]
Property bool DataModel.IsSFFlagsLoaded [readonly] [RobloxScriptSecurity]
Expand Down Expand Up @@ -2330,6 +2333,7 @@ Class Stats : Instance
Property float Stats.PhysicsStepTimeMs [readonly]
Property int Stats.PrimitivesCount [readonly]
Function float Stats:GetMemoryUsageMbForTag(DeveloperMemoryTag tag)
Function float Stats:GetTotalUsedMemory()
YieldFunction Dictionary Stats:GetPaginatedMemoryByTexture(TextureQueryType queryType, int pageIndex, int pageSize) [RobloxScriptSecurity]
Class StatsItem : Instance
Function double StatsItem:GetValue() [PluginSecurity]
Expand Down Expand Up @@ -2438,6 +2442,7 @@ Class Trail : Instance
Property bool Trail.FaceCamera
Property float Trail.Lifetime
Property float Trail.LightEmission
Property float Trail.LightInfluence
Property float Trail.MinLength
Property Content Trail.Texture
Property float Trail.TextureLength
Expand Down
50 changes: 40 additions & 10 deletions BuiltInPlugins/TerrainTools.rbxmx
Expand Up @@ -145,13 +145,34 @@ for i,tool in pairs(plugins) do
end
end

local StudioTerrainToolsInLuaWidget = settings():GetFFlag("StudioTerrainToolsInLuaWidget")


function FirstTimeSetUp()
setup = true
local changeHistory = utilityModule:GetUsingAsPlugin() and game:GetService('ChangeHistoryService') or nil
local terrain = game.Workspace.Terrain
local coreGui = utilityModule:GetCoreGui()
local gui = script.Parent:WaitForChild('TerrainBrushGui')
local guiFrame = gui:WaitForChild('Frame')

local guiForBrushRendering
local guiForWidgetRendering
if (StudioTerrainToolsInLuaWidget) then
guiForBrushRendering = script.Parent:WaitForChild('TerrainBrushGui')

guiForWidgetRendering = plugin:CreatePluginGui('TerrainBrushPluginGui', false, true)
guiForWidgetRendering.Name = "Terrain Brush"
local children = guiForBrushRendering:GetChildren()
for i = 1, #children do
local child = children[i]
child.Parent = guiForWidgetRendering
end
guiForWidgetRendering.Enabled = true
else
guiForBrushRendering = script.Parent:WaitForChild('TerrainBrushGui')
guiForWidgetRendering = guiForBrushRendering
end

local guiFrame = guiForWidgetRendering:WaitForChild('Frame')
local closeButton = guiFrame:WaitForChild('CloseButton')
local titlelabel = guiFrame:WaitForChild('TitleLabel')
local checkBox1 = guiFrame:WaitForChild('CheckBox1')
Expand Down Expand Up @@ -525,7 +546,7 @@ function FirstTimeSetUp()
selectionBox.Transparency = transparency
selectionBox.Adornee = linePart
selectionBox.Parent = linePart
linePart.Parent = gui
linePart.Parent = guiForBrushRendering
gridLineParts[u] = linePart
elseif linePart.SelectionBox.Transparency ~= transparency or linePart.SelectionBox.Color ~= color then
linePart.SelectionBox.Transparency = transparency
Expand All @@ -549,7 +570,7 @@ function FirstTimeSetUp()
selectionBox.Transparency = transparency
selectionBox.Adornee = linePart
selectionBox.Parent = linePart
linePart.Parent = gui
linePart.Parent = guiForBrushRendering
gridLineParts[gridSize + u] = linePart
elseif linePart.SelectionBox.Transparency ~= transparency or linePart.SelectionBox.Color ~= color then
linePart.SelectionBox.Transparency = transparency
Expand Down Expand Up @@ -898,8 +919,12 @@ function FirstTimeSetUp()

resizeGuiFrame()
titlelabel.Text = tool.name
gui.Parent = coreGui
gui.Frame.Visible = true

guiForBrushRendering.Parent = coreGui
if (StudioTerrainToolsInLuaWidget) then
guiForWidgetRendering.Enabled = true
end
guiForWidgetRendering.Frame.Visible = true

local loopTag = {} --using table as a unique value for debouncing
currentLoopTag = loopTag
Expand Down Expand Up @@ -995,7 +1020,7 @@ function FirstTimeSetUp()
selectionPart.Anchored = true
selectionPart.CanCollide = false
selectionPart.Size = Vector3.new(1, 1, 1) * selectionSize * resolution + Vector3.new(.1, .1, .1)
selectionPart.Parent = gui
selectionPart.Parent = guiForBrushRendering
end
if not selectionObject then
selectionObject = Instance.new(brushShape == 'Sphere' and 'SelectionSphere' or 'SelectionBox')
Expand Down Expand Up @@ -1028,9 +1053,14 @@ function FirstTimeSetUp()
game.Workspace.CurrentCamera.CameraType = prevCameraType
end
currentLoopTag = nil
gui.Parent = script.Parent
gui.Frame.Visible = false


guiForBrushRendering.Parent = script.Parent
guiForWidgetRendering.Frame.Visible = false

if (StudioTerrainToolsInLuaWidget) then
guiForWidgetRendering.Enabled = false
end

clearSelection()
clearGrid()
if lastTool then
Expand Down
10 changes: 5 additions & 5 deletions ContentFiles.txt
Expand Up @@ -146,7 +146,7 @@ content/avatar/scripts/humanoidAnimateLocalKeyframe.rbxm
[19911 bytes]

content/avatar/scripts/humanoidAnimateR15.rbxm
[30428 bytes]
[33616 bytes]

content/avatar/scripts/humanoidHealthRegenScript.rbxmx
[1338 bytes]
Expand Down Expand Up @@ -251,7 +251,7 @@ content/scripts/CoreScripts/CoreScripts/VehicleHud.lua
[5805 bytes]

content/scripts/CoreScripts/Libraries/RbxGui.lua
[139655 bytes]
[139720 bytes]

content/scripts/CoreScripts/Libraries/RbxStamper.lua
[83818 bytes]
Expand Down Expand Up @@ -416,7 +416,7 @@ content/scripts/CoreScripts/Modules/Server/ClientChat/DefaultClientChatModules/M
[687 bytes]

content/scripts/CoreScripts/Modules/Server/ClientChat/DefaultClientChatModules/MessageCreatorModules/Util.lua
[12599 bytes]
[12664 bytes]

content/scripts/CoreScripts/Modules/Server/ClientChat/DefaultClientChatModules/MessageCreatorModules/WelcomeMessage.lua
[2432 bytes]
Expand Down Expand Up @@ -509,7 +509,7 @@ content/scripts/CoreScripts/Modules/Server/ServerUtil.lua
[9 bytes]

content/scripts/CoreScripts/Modules/Settings/Pages/GameSettings.lua
[44417 bytes]
[45991 bytes]

content/scripts/CoreScripts/Modules/Settings/Pages/Help.lua
[31810 bytes]
Expand Down Expand Up @@ -653,7 +653,7 @@ content/scripts/PlayerScripts/StarterCharacterScripts/Sound.server.lua
[2550 bytes]

content/scripts/PlayerScripts/StarterCharacterScripts/Sound/LocalSound.client.lua
[10234 bytes]
[11794 bytes]

content/scripts/PlayerScripts/StarterPlayerScripts/CameraScript.lua
[11421 bytes]
Expand Down
2 changes: 1 addition & 1 deletion CppTree.txt
Expand Up @@ -896,7 +896,7 @@ RBX
Player
PlayerConfigurer
PlayerGui
PlayerLocaleServiceTranslatorInstance
PlayerLocaleLocalizationServiceTranslatorInstance
PlayerMouse
Players
PlayerScripts
Expand Down

0 comments on commit fa5a3d2

Please sign in to comment.