Skip to content

Commit

Permalink
0.367.0.269547
Browse files Browse the repository at this point in the history
  • Loading branch information
Roblox-Client-Tracker committed Jan 9, 2019
1 parent f2fc6e8 commit ab38fcb
Show file tree
Hide file tree
Showing 112 changed files with 4,983 additions and 1,369 deletions.
509 changes: 344 additions & 165 deletions API-Dump.json

Large diffs are not rendered by default.

29 changes: 19 additions & 10 deletions API-Dump.txt
Expand Up @@ -241,12 +241,6 @@ Class RocketPropulsion : BodyMover
Function void RocketPropulsion:Fire()
Function void RocketPropulsion:fire() [Deprecated]
Event RocketPropulsion.ReachedTarget()
Class Button : Instance [NotCreatable]
Property bool Button.ClickableWhenViewportHidden [NotReplicated]
Property bool Button.Enabled [NotReplicated]
Property Content Button.Icon [NotReplicated]
Function void Button:SetActive(bool active) {PluginSecurity}
Event Button.Click() {PluginSecurity}
Class CacheableContentProvider : Instance [NotCreatable] [Service] [NotReplicated]
Class MeshContentProvider : CacheableContentProvider [NotCreatable] [Service] [NotReplicated]
Class SolidModelContentProvider : CacheableContentProvider [NotCreatable] [Service] [NotReplicated]
Expand Down Expand Up @@ -310,11 +304,13 @@ Class CharacterMesh : CharacterAppearance
Property int64 CharacterMesh.MeshId
Property int64 CharacterMesh.OverlayTextureId
Class Clothing : CharacterAppearance [NotCreatable]
Property Color3 Clothing.Color3
Class Pants : Clothing
Property Content Pants.PantsTemplate
Class Shirt : Clothing
Property Content Shirt.ShirtTemplate
Class ShirtGraphic : CharacterAppearance
Property Color3 ShirtGraphic.Color3
Property Content ShirtGraphic.Graphic
Class Skin : CharacterAppearance [Deprecated]
Property BrickColor Skin.SkinColor
Expand Down Expand Up @@ -887,6 +883,8 @@ Class TextBox : GuiObject
Event TextBox.Focused()
Class ViewportFrame : GuiObject
Property Class<Camera> ViewportFrame.CurrentCamera [NotReplicated]
Property Color3 ViewportFrame.ImageColor3
Property float ViewportFrame.ImageTransparency
Class LayerCollector : GuiBase2d [NotCreatable] [NotBrowsable]
Property bool LayerCollector.Enabled
Property bool LayerCollector.ResetOnSpawn
Expand Down Expand Up @@ -1278,7 +1276,6 @@ Class InsertService : Instance [NotCreatable] [Service]
Function Instance InsertService:LoadLocalAsset(string assetPath) {RobloxScriptSecurity}
Function Objects InsertService:LoadPackageAsset(Content url) {RobloxScriptSecurity}
Function Instance InsertService:loadAsset(int64 assetId) [Yields] [Deprecated]
Class InstancePacketCache : Instance [NotCreatable] [Service] [NotReplicated]
Class JointInstance : Instance [NotCreatable]
Property bool JointInstance.Active [ReadOnly]
Property CFrame JointInstance.C0
Expand Down Expand Up @@ -1506,6 +1503,9 @@ Class MarketplaceService : Instance [NotCreatable] [Service]
Class Message : Instance [Deprecated]
Property string Message.Text
Class Hint : Message [Deprecated]
Class MessagingService : Instance [NotCreatable] [Service] [NotReplicated]
Function void MessagingService:PublishAsync(string topic, Variant message) [Yields]
Function RBXScriptConnection MessagingService:SubscribeAsync(string topic, Function callback) [Yields]
Class Mouse : Instance [NotCreatable]
Property CFrame Mouse.Hit [ReadOnly]
Property Content Mouse.Icon
Expand Down Expand Up @@ -1586,11 +1586,13 @@ Class NetworkSettings : Instance [Service] [NotBrowsable]
Property int NetworkSettings.PreferredClientPort
Property double NetworkSettings.ReceiveRate
Property float NetworkSettings.TouchSendRate
Property bool NetworkSettings.UseInstancePacketCache
Property bool NetworkSettings.UsePhysicsPacketCache
Property int NetworkSettings.PhysicsMtuAdjust
Property Enum<PacketPriority> NetworkSettings.PhysicsSendPriority [Hidden] [NotReplicated]
Property bool NetworkSettings.ProxyEnabled
Property string NetworkSettings.ProxyURL
Class NotificationService : Instance [NotCreatable] [Service]
Property bool NotificationService.IsLuaBottomBarEnabled {RobloxScriptSecurity} [ReadOnly]
Property bool NotificationService.IsLuaChatEnabled {RobloxScriptSecurity} [ReadOnly]
Property bool NotificationService.IsLuaGameDetailsEnabled {RobloxScriptSecurity} [ReadOnly]
Property bool NotificationService.IsLuaGamesPageEnabled {RobloxScriptSecurity} [ReadOnly]
Expand Down Expand Up @@ -2143,6 +2145,14 @@ Class PluginMenu : Instance [NotCreatable] [NotReplicated]
Function void PluginMenu:AddSeparator() {PluginSecurity}
Function void PluginMenu:Clear() {PluginSecurity}
Function Instance PluginMenu:ShowAsync() {PluginSecurity} [Yields]
Class PluginToolbar : Instance [NotCreatable]
Function Instance PluginToolbar:CreateButton(string text, string tooltip, string iconname) {PluginSecurity}
Class PluginToolbarButton : Instance [NotCreatable]
Property bool PluginToolbarButton.ClickableWhenViewportHidden [NotReplicated]
Property bool PluginToolbarButton.Enabled [NotReplicated]
Property Content PluginToolbarButton.Icon [NotReplicated]
Function void PluginToolbarButton:SetActive(bool active) {PluginSecurity}
Event PluginToolbarButton.Click() {PluginSecurity}
Class PointsService : Instance [NotCreatable] [Service] [Deprecated]
Function Tuple PointsService:AwardPoints(int64 userId, int amount) [Yields] [Deprecated]
Function int PointsService:GetAwardablePoints() [Deprecated]
Expand Down Expand Up @@ -2574,6 +2584,7 @@ Class Studio : Instance [Service] [NotReplicated]
Property bool Studio.LuaDebuggerEnabled
Property bool Studio.LuaDebuggerEnabledAtStartup [Hidden] [ReadOnly]
Property int Studio.ScriptTimeoutLength
Property bool Studio.Split Meshes
Property bool Studio.Clear Output On Start
Property int Studio.Maximum Output Lines
Property QFont Studio.Output Font
Expand Down Expand Up @@ -2696,8 +2707,6 @@ Class ThirdPartyUserService : Instance [NotCreatable] [Service] [NotReplicated]
Event ThirdPartyUserService.ActiveGamepadRemoved() {RobloxScriptSecurity}
Event ThirdPartyUserService.ActiveUserSignedOut(int signOutStatus) {RobloxScriptSecurity}
Class TimerService : Instance [NotCreatable] [Service]
Class Toolbar : Instance [NotCreatable]
Function Instance Toolbar:CreateButton(string text, string tooltip, string iconname) {PluginSecurity}
Class TouchInputService : Instance [NotCreatable] [Service]
Class TouchTransmitter : Instance [NotCreatable] [NotBrowsable]
Class Trail : Instance
Expand Down
Binary file modified BuiltInPlugins/AnimationEditorRigBuilder.rbxm
Binary file not shown.
@@ -1,9 +1,11 @@
local AnimationEvents = {}
AnimationEvents.Selected = {Events= {}, TempEvents= {}}
AnimationEvents.AnimationEventNames = {}
AnimationEvents.EditEventsEnabled = true

function AnimationEvents:init(Paths)
self.Paths = Paths
self.EditEventsEnabledChangedEvent = self.Paths.UtilityScriptEvent:new()
self.SelectionChangedEvent = self.Paths.UtilityScriptEvent:new()
end

Expand All @@ -16,6 +18,18 @@ function AnimationEvents:initPostGUICreate()
end))
end

function AnimationEvents:toggleEditEventsEnabled()
self.EditEventsEnabled = not self.EditEventsEnabled
self.EditEventsEnabledChangedEvent:fire(self.EditEventsEnabled)
if not self.EditEventsEnabled then
self:selectNone()
end
end

function AnimationEvents:isEditEventsEnabled()
return self.EditEventsEnabled
end

function AnimationEvents:selectAnimationEvent(time)
self.Paths.DataModelSession:deselectItemsInStudioHierarchy()
self.Paths.DataModelSession:selectNone()
Expand Down Expand Up @@ -233,6 +247,7 @@ function AnimationEvents:terminate()
AnimationEvents.AnimationEventNames = {}

self.SelectionChangedEvent = nil
self.EditEventsEnabledChangedEvent = nil

self.Paths = nil
end
Expand Down
Expand Up @@ -109,7 +109,11 @@ function FastFlags:fixKeyframeScaleHandlesPositioning()
end

function FastFlags:isAnimationEventsOn()
return isFlagOn("UseKeyframeMarkersForEvents")
return isFlagOn("UseKeyframeMarkersForEvents2")
end

function FastFlags:isFixSubWindowsOn()
return isFlagOn("StudioAnimationEditorFixSubWindows")
end

return FastFlags
Expand Up @@ -48,6 +48,13 @@ local function onManageClicked(self)
self.ManageEventsButton:setPressed(true)
end

local function onExpandClicked(self, enabled)
self.TargetWidget.Visible = enabled
local oldGUISize = self.Paths.GUI.Size
local newYOffset = not enabled and self.TargetWidget.Size.Y.Offset or 0
self.Paths.GUI.Size = UDim2.new(oldGUISize.X.Scale, oldGUISize.X.Offset, oldGUISize.Y.Scale, newYOffset)
end

function EventBar:init(Paths)
self.Paths = Paths
self.TargetWidget = self.Paths.GUIAnimationEventBar
Expand All @@ -64,6 +71,7 @@ function EventBar:init(Paths)
self.Connections:add(self.EventArea.InputBegan:connect(function(input) onAreaClicked(self, input) end))
self.Connections:add(self.TargetWidget.AnimationEventsButtons.ManageEventsButton.MouseButton1Click:connect(function() onManageClicked(self) end))
self.Connections:add(self.Paths.GUIScriptManageEvents.WindowClosedEvent:connect(function() self.ManageEventsButton:setPressed(false) end))
self.Connections:add(self.Paths.DataModelAnimationEvents.EditEventsEnabledChangedEvent:connect(function(enabled) onExpandClicked(self, enabled) end))
end

function EventBar:addKeyframeMarker(time)
Expand Down
Expand Up @@ -59,6 +59,7 @@ local function onPromptConfirm(self)
onPromptCancel(self)
if self.Prompt.Border.ParameterInput.Text ~= "" then
self.Paths.DataModelAnimationEvents:createEvent(self.Time, self.Prompt.Border.ParameterInput.Text)
self.Prompt.Border.ParameterInput.Text = ""
end
end

Expand Down
Expand Up @@ -102,6 +102,16 @@ local function initLooping(self)
self.Paths.GUIScriptToolTip:add(self.TargetWidget.Loop, "Toggle Looping Animation")
end

local function initEventsBarSwizzle(self)
self.TargetWidget.AnimationEventsBarSwizzle.Visible = true
self.Connections:add(self.TargetWidget.AnimationEventsBarSwizzle.ImageButton.MouseButton1Click:connect(function()
self.Paths.DataModelAnimationEvents:toggleEditEventsEnabled()
local enabled = self.Paths.DataModelAnimationEvents:isEditEventsEnabled()
self.TargetWidget.AnimationEventsBarSwizzle.Down.Visible = not enabled
self.TargetWidget.AnimationEventsBarSwizzle.Up.Visible = enabled
end))
end

function MediaControls:init(Paths)
self.Paths = Paths
self.TargetWidget = Paths.GUIMediaControls
Expand All @@ -120,6 +130,10 @@ function MediaControls:init(Paths)
initScrubberTime(self)
initPlayPause(self)
initLooping(self)

if FastFlags:isAnimationEventsOn() then
initEventsBarSwizzle(self)
end

self.Connections:add(self.TargetWidget.GoToStart.ImageButton.MouseButton1Click:connect(function()
self.TimeChangeEvent:fire(0)
Expand Down
Expand Up @@ -29,7 +29,11 @@ function GUIScriptSubWindow:new(Paths, contentsFrame, parentWidget, canKill)
self.Connections = Paths.UtilityScriptConnections:new(Paths)

if Paths.UtilityScriptDrag:canCreate(Paths) then
self.Dragable = Paths.UtilityScriptDrag:new(Paths, self.GUI, true)
if FastFlags:isFixSubWindowsOn() then
self.Dragable = Paths.UtilityScriptDrag:new(Paths, self.GUI, true, self.GUI.ClickEater.Title)
else
self.Dragable = Paths.UtilityScriptDrag:new(Paths, self.GUI, true)
end
end

self.OnCloseEvent = self.Paths.UtilityScriptEvent:new(Paths)
Expand Down
Expand Up @@ -208,7 +208,7 @@ function CopyPaste:getPasteDescription()
end

local function canPasteEvents(self)
return self:canPasteAny() and not self.CopiedPoses
return self:canPasteAny() and not self.CopiedPoses and self.Paths.DataModelAnimationEvents:isEditEventsEnabled()
end

function CopyPaste:paste(atTime, registerUndo)
Expand Down
Expand Up @@ -7,9 +7,12 @@ function Drag:canCreate(Paths)
return nil ~= Paths.GUIDragArea
end

function Drag:new(Paths, dragable, setOffset)
function Drag:new(Paths, dragable, setOffset, clickTarget)
local self = setmetatable({}, Drag)
self.dragable = dragable
if FastFlags:isFixSubWindowsOn() and clickTarget == nil then
clickTarget = dragable
end

self.DragStartEvent = Paths.UtilityScriptEvent:new()
self.DragEvent = Paths.UtilityScriptEvent:new()
Expand Down Expand Up @@ -39,8 +42,14 @@ function Drag:new(Paths, dragable, setOffset)
end
end)

self.onDragBegin = dragable.InputBegan:connect(function(input) self:beginDrag(input) end)
self.onDragEnd = dragable.InputEnded:connect(function(input) self:endDrag(input) end)
if FastFlags:isFixSubWindowsOn() then
self.onMouseEnd = Paths.GUIDragArea.InputEnded:connect(function(input) self:endDrag(input) end)
self.onDragBegin = clickTarget.InputBegan:connect(function(input) self:beginDrag(input) end)
self.onDragEnd = clickTarget.InputEnded:connect(function(input) self:endDrag(input) end)
else
self.onDragBegin = dragable.InputBegan:connect(function(input) self:beginDrag(input) end)
self.onDragEnd = dragable.InputEnded:connect(function(input) self:endDrag(input) end)
end

return self
end
Expand Down
Expand Up @@ -90,16 +90,26 @@ local function createConfigureGui(R15Folder, R6Folder, R15FixedFolder, R15Legacy
setupTextClearOnFocus(R6TextureTextboxes.BaseTextureId)
setupTextClearOnFocus(R6TextureTextboxes.OverlayTextureId)

local assetUrls = {
"http://roblox.com/asset/?id=",
"rbxassetid://"
}

local function getTextureIdFromContent(contentId)
for _, assetUrl in pairs(assetUrls) do
if string.find(contentId, assetUrl, 1, true) ~= nil then
return string.sub(contentId, assetUrl:len() + 1)
end
end
return contentId
end

-- Show the current values from the rig
for _, obj in pairs(R15TextureIds:GetChildren()) do
for _, name in pairs(R15PartMapping[obj.Name]) do
local part = R15Folder:FindFirstChild(name)
if part and part:IsA("MeshPart") and part.TextureID ~= "" then
local assetUrl = "http://roblox.com/asset/?id="
local textureId = part.TextureID
if string.find(textureId, assetUrl, 1, true) ~= nil then
textureId = string.sub(textureId, assetUrl:len() + 1)
end
local textureId = getTextureIdFromContent(part.TextureID)
obj.TextureID.Text = textureId

if (not R15FixedFolder and not R15LegacyFolder) then
Expand All @@ -110,11 +120,7 @@ local function createConfigureGui(R15Folder, R6Folder, R15FixedFolder, R15Legacy
if (R15FixedFolder) then
local part = R15FixedFolder:FindFirstChild(name)
if part and part:IsA("MeshPart") and part.TextureID ~= "" then
local assetUrl = "http://roblox.com/asset/?id="
local textureId = part.TextureID
if string.find(textureId, assetUrl, 1, true) ~= nil then
textureId = string.sub(textureId, assetUrl:len() + 1)
end
local textureId = getTextureIdFromContent(part.TextureID)
obj.TextureID.Text = textureId
if (not R15LegacyFolder) then
break
Expand All @@ -125,11 +131,7 @@ local function createConfigureGui(R15Folder, R6Folder, R15FixedFolder, R15Legacy
if (R15LegacyFolder) then
local part = R15LegacyFolder:FindFirstChild(name)
if part and part:IsA("MeshPart") and part.TextureID ~= "" then
local assetUrl = "http://roblox.com/asset/?id="
local textureId = part.TextureID
if string.find(textureId, assetUrl, 1, true) ~= nil then
textureId = string.sub(textureId, assetUrl:len() + 1)
end
local textureId = getTextureIdFromContent(part.TextureID)
obj.TextureID.Text = textureId
break
end
Expand Down Expand Up @@ -1081,7 +1083,7 @@ local function fbxRigImported(R15Rig, rigProportionType)

if not r15Head:FindFirstChildOfClass("Decal") then
local Face = Instance.new("Decal", r15Head)
Face.Name = "Face"
Face.Name = "face"
Face.Texture = "rbxasset://textures/face.png"
end

Expand Down
Binary file modified BuiltInPlugins/CollisionGroupsEditor.rbxm
Binary file not shown.
66 changes: 66 additions & 0 deletions BuiltInPlugins/CollisionGroupsEditor/Roact.lua
@@ -0,0 +1,66 @@
--[[
Packages up the internals of Roact and exposes a public API for it.
]]

local Change = require(script.Change)
local Component = require(script.Component)
local Core = require(script.Core)
local createElement = require(script.createElement)
local createRef = require(script.createRef)
local Event = require(script.Event)
local GlobalConfig = require(script.GlobalConfig)
local Instrumentation = require(script.Instrumentation)
local oneChild = require(script.oneChild)
local PureComponent = require(script.PureComponent)
local Reconciler = require(script.Reconciler)
local ReconcilerCompat = require(script.ReconcilerCompat)

--[[
A utility to copy one module into another, erroring if there are
overlapping keys.
Any keys that begin with an underscore are considered private.
]]
local function apply(target, source)
for key, value in pairs(source) do
if target[key] ~= nil then
error(("Roact: key %q was overridden!"):format(key), 2)
end

-- Don't add internal values
if not key:find("^_") then
target[key] = value
end
end
end

local Roact = {}

apply(Roact, Core)
apply(Roact, Reconciler)
apply(Roact, ReconcilerCompat)

apply(Roact, {
Change = Change,
Component = Component,
createElement = createElement,
createRef = createRef,
Event = Event,
oneChild = oneChild,
PureComponent = PureComponent,
})

apply(Roact, {
setGlobalConfig = GlobalConfig.set,
getGlobalConfigValue = GlobalConfig.getValue,
})

apply(Roact, {
-- APIs that may change in the future
UNSTABLE = {
getCollectedStats = Instrumentation.getCollectedStats,
clearCollectedStats = Instrumentation.clearCollectedStats,
}
})

return Roact

0 comments on commit ab38fcb

Please sign in to comment.