mirror of
https://github.com/rojo-rbx/rojo.git
synced 2026-10-21 20:21:38 +00:00
Merge branch 'master' of https://github.com/boatbomber/rojo into headless-api
This commit is contained in:
commit
ba634d4778
23 changed files with 6989 additions and 1329 deletions
1
plugin/Packages/Flipper
Submodule
1
plugin/Packages/Flipper
Submodule
|
|
@ -0,0 +1 @@
|
|||
Subproject commit 2d91a5ed55332a3bf50f4eba82f9c812bd2343f8
|
||||
1
plugin/Packages/Promise
Submodule
1
plugin/Packages/Promise
Submodule
|
|
@ -0,0 +1 @@
|
|||
Subproject commit 2c6f433903275e689ba1d48402d4a9d6fdc605a5
|
||||
1
plugin/Packages/Roact
Submodule
1
plugin/Packages/Roact
Submodule
|
|
@ -0,0 +1 @@
|
|||
Subproject commit 956891b70fdc5410e44e9664719cd0a9f7e6fabd
|
||||
1
plugin/Packages/TestEZ
Submodule
1
plugin/Packages/TestEZ
Submodule
|
|
@ -0,0 +1 @@
|
|||
Subproject commit edc7246d0173a3a90eba4a9f64ea26c576be5873
|
||||
1
plugin/Packages/t
Submodule
1
plugin/Packages/t
Submodule
|
|
@ -0,0 +1 @@
|
|||
Subproject commit 1f9754254b17bff5a0b7527620083f8ea85f579a
|
||||
|
|
@ -238,6 +238,23 @@ types = {
|
|||
toPod = serializeFloat,
|
||||
},
|
||||
|
||||
Font = {
|
||||
fromPod = function(pod)
|
||||
return Font.new(
|
||||
pod.family,
|
||||
if pod.weight ~= nil then Enum.FontWeight[pod.weight] else nil,
|
||||
if pod.style ~= nil then Enum.FontStyle[pod.style] else nil
|
||||
)
|
||||
end,
|
||||
toPod = function(roblox)
|
||||
return {
|
||||
family = roblox.Family,
|
||||
weight = roblox.Weight.Name,
|
||||
style = roblox.Style.Name,
|
||||
}
|
||||
end,
|
||||
},
|
||||
|
||||
Int32 = {
|
||||
fromPod = identity,
|
||||
toPod = identity,
|
||||
|
|
|
|||
|
|
@ -53,6 +53,11 @@ function PropertyDescriptor:read(instance)
|
|||
end
|
||||
|
||||
if self.scriptability == "Custom" then
|
||||
if customProperties[self.className] == nil then
|
||||
local fullName = ("%s.%s"):format(instance.className, self.name)
|
||||
return false, Error.new(Error.Kind.PropertyNotReadable, fullName)
|
||||
end
|
||||
|
||||
local interface = customProperties[self.className][self.name]
|
||||
|
||||
return interface.read(instance, self.name)
|
||||
|
|
@ -79,6 +84,11 @@ function PropertyDescriptor:write(instance, value)
|
|||
end
|
||||
|
||||
if self.scriptability == "Custom" then
|
||||
if customProperties[self.className] == nil then
|
||||
local fullName = ("%s.%s"):format(instance.className, self.name)
|
||||
return false, Error.new(Error.Kind.PropertyNotWritable, fullName)
|
||||
end
|
||||
|
||||
local interface = customProperties[self.className][self.name]
|
||||
|
||||
return interface.write(instance, self.name, value)
|
||||
|
|
|
|||
|
|
@ -207,6 +207,17 @@
|
|||
},
|
||||
"ty": "Float64"
|
||||
},
|
||||
"Font": {
|
||||
"value": {
|
||||
"Font": {
|
||||
"family": "rbxasset://fonts/families/SourceSansPro.json",
|
||||
"weight": "Regular",
|
||||
"style": "Normal",
|
||||
"cachedFaceId": null
|
||||
}
|
||||
},
|
||||
"ty": "Font"
|
||||
},
|
||||
"Int32": {
|
||||
"value": {
|
||||
"Int32": 6014
|
||||
|
|
|
|||
|
|
@ -61,4 +61,14 @@ return {
|
|||
end,
|
||||
},
|
||||
},
|
||||
Model = {
|
||||
Scale = {
|
||||
read = function(instance, _, _)
|
||||
return true, instance:GetScale()
|
||||
end,
|
||||
write = function(instance, _, value)
|
||||
return true, instance:ScaleTo(value)
|
||||
end,
|
||||
},
|
||||
},
|
||||
}
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load diff
|
|
@ -5,7 +5,7 @@ local isDevBuild = script.Parent.Parent:FindFirstChild("ROJO_DEV_BUILD") ~= nil
|
|||
return strict("Config", {
|
||||
isDevBuild = isDevBuild,
|
||||
codename = "Epiphany",
|
||||
version = {7, 2, 1},
|
||||
version = {7, 3, 0},
|
||||
expectedServerVersionString = "7.2 or newer",
|
||||
protocolVersion = 4,
|
||||
defaultHost = "localhost",
|
||||
|
|
|
|||
|
|
@ -9,7 +9,7 @@
|
|||
},
|
||||
|
||||
"Packages": {
|
||||
"$path": "DevPackages"
|
||||
"$path": "Packages"
|
||||
}
|
||||
},
|
||||
|
||||
|
|
|
|||
|
|
@ -1,33 +0,0 @@
|
|||
# This file is automatically @generated by Wally.
|
||||
# It is not intended for manual editing.
|
||||
registry = "test"
|
||||
|
||||
[[package]]
|
||||
name = "evaera/promise"
|
||||
version = "4.0.0"
|
||||
dependencies = []
|
||||
|
||||
[[package]]
|
||||
name = "osyrisrblx/t"
|
||||
version = "3.0.0"
|
||||
dependencies = []
|
||||
|
||||
[[package]]
|
||||
name = "reselim/flipper"
|
||||
version = "2.0.0"
|
||||
dependencies = []
|
||||
|
||||
[[package]]
|
||||
name = "roblox/roact"
|
||||
version = "1.4.4"
|
||||
dependencies = []
|
||||
|
||||
[[package]]
|
||||
name = "roblox/testez"
|
||||
version = "0.4.1"
|
||||
dependencies = []
|
||||
|
||||
[[package]]
|
||||
name = "rojo-rbx/rojo"
|
||||
version = "7.2.1"
|
||||
dependencies = [["Flipper", "reselim/flipper@2.0.0"], ["Promise", "evaera/promise@4.0.0"], ["Roact", "roblox/roact@1.4.4"], ["t", "osyrisrblx/t@3.0.0"]]
|
||||
|
|
@ -1,17 +0,0 @@
|
|||
[package]
|
||||
name = "rojo-rbx/rojo"
|
||||
description = "Rojo enables Roblox developers to use professional-grade software engineering tools"
|
||||
version = "7.2.1"
|
||||
license = "MPL-2.0"
|
||||
authors = ["LPGhatguy (https://lpg.space/)"]
|
||||
registry = "https://github.com/upliftgames/wally-index"
|
||||
realm = "shared"
|
||||
|
||||
[dependencies]
|
||||
Flipper = "reselim/flipper@2.0.0"
|
||||
Promise = "evaera/promise@4.0.0"
|
||||
Roact = "roblox/roact@1.4.4"
|
||||
t = "osyrisrblx/t@3.0.0"
|
||||
|
||||
[dev-dependencies]
|
||||
TestEZ = "roblox/testez@0.4.1"
|
||||
Loading…
Add table
Add a link
Reference in a new issue