root
/
teverse
mirror of https://github.com/teverse/teverse
1
0
Fork 0
Code Releases Activity

Compare commits

base: root:96da67ed5006a0e087c4199172a3ce5dc0180b7c
Branches Tags
root:master
root:rewrite-tevx
root:repro/memory-crash
root:bug/crash-repro
root:dev-0.20.6
root:feature-round-theme-property
root:feature-publish-interface
root:dev
root:backup
..
compare: root:ea94bd141579193d0bc3aed9475aba34060b0ecf
Branches Tags
root:master
root:rewrite-tevx
root:repro/memory-crash
root:bug/crash-repro
root:dev-0.20.6
root:feature-round-theme-property
root:feature-publish-interface
root:dev
root:backup

3 Commits
96da67ed50 ... ea94bd1415

Author SHA1 Message Date
Jay ea94bd1415 API Dump update 2020-06-28 20:35:31 +01:00
Jay 964fb857c9 Merge branch 'master' of https://github.com/teverse/teverse 2020-06-28 18:18:24 +01:00
Jay f604b3df0b remote testing 2020-06-28 18:18:21 +01:00
2 changed files with 274 additions and 28 deletions
Show Stats Expand all files Collapse all files

209
api.json
View File

@ -1,8 +1,8 @@
{ {
"os": "OSX", "os": "OSX",
"arch": "x64", "arch": "x64",
"version": "0.23.1", "version": "0.24.0",
"generatedAt": "19/06/2020 13:05:51", "generatedAt": "28/06/2020 20:32:30",
"sandbox": { "sandbox": {
"coroutine": { "coroutine": {
"status": "function", "status": "function",
@ -20,10 +20,10 @@
"xpcall": "function", "xpcall": "function",
"_DEVICE_PAD_BOTTOM": 0, "_DEVICE_PAD_BOTTOM": 0,
"ipairs": "function", "ipairs": "function",
"_TEV_BUILD": "0231", "_TEV_BUILD": "0240",
"colour": "cdata", "colour": "cdata",
"print": "function", "print": "function",
"_TEV_VERSION_MINOR": 23, "_TEV_VERSION_MINOR": 24,
"pcall": "function", "pcall": "function",
"gcinfo": "function", "gcinfo": "function",
"loadstring": "function", "loadstring": "function",
@ -45,13 +45,13 @@
"insert": "function" "insert": "function"
}, },
"error": "function", "error": "function",
"_TEV_VERSION": "0.23.1", "_TEV_VERSION": "0.24.0",
"quaternion": "cdata", "quaternion": "cdata",
"_DEVICE": "Mac", "_DEVICE": "Mac",
"require": "function", "require": "function",
"unpack": "function", "unpack": "function",
"_VERSION": "Lua 5.1", "_VERSION": "Lua 5.1",
"_TEV_VERSION_PATCH": 1, "_TEV_VERSION_PATCH": 0,
"next": "function", "next": "function",
"math": { "math": {
"ceil": "function", "ceil": "function",
@ -1391,7 +1391,7 @@
"fov": { "fov": {
"hasGetter": true, "hasGetter": true,
"type": "number", "type": "number",
"description": "", "description": "field of view",
"hasSetter": true "hasSetter": true
}, },
"position": { "position": {
@ -1503,6 +1503,19 @@
}, },
"networking": { "networking": {
"methods": { "methods": {
"broadcast": {
"parameters": [
{
"type": "string",
"name": "eventName"
},
{
"type": "..."
}
],
"returns": [],
"description": "Reliably sends the information you pass to all direct connections. Note that a client cannot broadcast to other clients as they are not directly connected."
},
"getClient": { "getClient": {
"parameters": [ "parameters": [
{ {
@ -1514,10 +1527,121 @@
"client" "client"
], ],
"description": "Returns the client for the matching name or id you provide" "description": "Returns the client for the matching name or id you provide"
},
"initiate": {
"parameters": [
{
"type": "string",
"name": "appId"
}
],
"returns": [],
"description": ""
},
"sendToClient": {
"parameters": [
{
"type": "client",
"name": "client"
},
{
"type": "string",
"name": "eventName"
},
{
"type": "..."
}
],
"returns": [],
"description": "[SERVER ONLY] Reliably sends the information you pass"
},
"sendToServer": {
"parameters": [
{
"type": "string",
"name": "eventName"
},
{
"type": "..."
}
],
"returns": [],
"description": "This is an alias for broadcast that only works on the client side."
} }
}, },
"className": "networking", "className": "networking",
"events": [], "events": {
"changed": {
"parameters": [
{
"type": "string",
"name": "property"
},
{
"type": "variant",
"name": "oldValue"
},
{
"type": "variant",
"name": "newValue"
}
],
"description": "Fired when a property is changed."
},
"_clientConnected": {
"parameters": [
{
"type": "client",
"name": "user"
}
],
"description": "Fired when a user connects"
},
"_disconnected": {
"parameters": [],
"description": "Fired when a connection fails or stops"
},
"_update": {
"parameters": [
{
"type": "string",
"name": "message"
}
],
"description": "Fired when an update begins"
},
"_connected": {
"parameters": [],
"description": "Fired when a connection has started"
},
"_clientDisconnected": {
"parameters": [
{
"type": "client",
"name": "user"
}
],
"description": "Fired when a user disconnects"
},
"_downloadProgress": {
"parameters": [
{
"type": "string",
"name": "percentage"
}
],
"description": "Fired when an update progresses"
},
"_localAuthenticating": {
"parameters": [
{
"type": "string",
"name": "status"
}
],
"description": "Fired when the local user authenticates"
}
},
"constructable": false, "constructable": false,
"properties": { "properties": {
"clients": { "clients": {
@ -1526,6 +1650,12 @@
"description": "A readonly list of clients, excluding local client when offline", "description": "A readonly list of clients, excluding local client when offline",
"hasSetter": false "hasSetter": false
}, },
"isConnected": {
"hasGetter": true,
"type": "boolean",
"description": "True when a connection is established",
"hasSetter": false
},
"localClient": { "localClient": {
"hasGetter": true, "hasGetter": true,
"type": "client", "type": "client",
@ -1598,7 +1728,33 @@
} }
}, },
"className": "block", "className": "block",
"events": [], "events": {
"changed": {
"parameters": [
{
"type": "string",
"name": "property"
},
{
"type": "variant",
"name": "oldValue"
},
{
"type": "variant",
"name": "newValue"
}
],
"description": "Fired when a property is changed."
},
"collisionEnded": {
"parameters": [],
"description": ""
},
"collisionStarted": {
"parameters": [],
"description": ""
}
},
"constructable": true, "constructable": true,
"extends": "sceneObject", "extends": "sceneObject",
"properties": { "properties": {
@ -1644,9 +1800,9 @@
"description": "", "description": "",
"hasSetter": true "hasSetter": true
}, },
"linearFactor": { "roughness": {
"hasGetter": true, "hasGetter": true,
"type": "vector3", "type": "number",
"description": "", "description": "",
"hasSetter": true "hasSetter": true
}, },
@ -1656,9 +1812,9 @@
"description": "", "description": "",
"hasSetter": true "hasSetter": true
}, },
"roughness": { "linearFactor": {
"hasGetter": true, "hasGetter": true,
"type": "number", "type": "vector3",
"description": "", "description": "",
"hasSetter": true "hasSetter": true
} }
@ -1678,21 +1834,28 @@
], ],
"description": "Returns the source code of the loaded app or nil if no app is loaded." "description": "Returns the source code of the loaded app or nil if no app is loaded."
}, },
"loadRemote": {
"parameters": [],
"returns": [],
"description": "Starts uploading the currently loaded UNPACKAGED app"
},
"loadDashboard": { "loadDashboard": {
"parameters": [], "parameters": [],
"returns": [], "returns": [],
"description": "Resets the environment and loads the default Dashboard app" "description": "Resets the environment and loads the default Dashboard app"
}, },
"loadRemote": {
"parameters": [],
"returns": [],
"description": "Starts uploading the currently loaded UNPACKAGED app"
},
"upload": { "upload": {
"parameters": [], "parameters": [],
"returns": [], "returns": [],
"description": "Starts uploading the currently loaded UNPACKAGED app" "description": "Starts uploading the currently loaded UNPACKAGED app"
}, },
"promptAppDirectory": {
"parameters": [],
"returns": [
"boolean"
],
"description": "Prompts the user to select a directory containing the manifest.json file"
},
"promptApp": { "promptApp": {
"parameters": [], "parameters": [],
"returns": [ "returns": [
@ -1717,12 +1880,10 @@
], ],
"description": "Resets the environment and loads the Lua string provided as an app." "description": "Resets the environment and loads the Lua string provided as an app."
}, },
"promptAppDirectory": { "test": {
"parameters": [], "parameters": [],
"returns": [ "returns": [],
"boolean" "description": "Uploads the unpackaged app and spins up a temporary test server on our cloud"
],
"description": "Prompts the user to select a directory containing the manifest.json file"
}, },
"loadWorkshop": { "loadWorkshop": {
"parameters": [], "parameters": [],
@ -2237,5 +2398,5 @@
"properties": [] "properties": []
} }
}, },
"build": "0231" "build": "0240"
} }

93
core/apps/editor.lua
View File

@ -3,8 +3,8 @@
local share = teverse.construct("guiTextBox", { local share = teverse.construct("guiTextBox", {
parent = teverse.coreInterface, parent = teverse.coreInterface,
size = guiCoord(0, 60, 0, 16), size = guiCoord(0, 60, 0, 16),
position = guiCoord(0.5, -65, 1, -20), position = guiCoord(0.5, -65, 1, -26),
strokeRadius = 4, strokeRadius = 2,
text = "Share", text = "Share",
textAlign = "middle", textAlign = "middle",
textSize = 12 textSize = 12
@ -13,13 +13,23 @@ local share = teverse.construct("guiTextBox", {
local reload = teverse.construct("guiTextBox", { local reload = teverse.construct("guiTextBox", {
parent = teverse.coreInterface, parent = teverse.coreInterface,
size = guiCoord(0, 60, 0, 16), size = guiCoord(0, 60, 0, 16),
position = guiCoord(0.5, 5, 1, -20), position = guiCoord(0.5, 5, 1, -26),
strokeRadius = 4, strokeRadius = 2,
text = "Reload", text = "Reload",
textAlign = "middle", textAlign = "middle",
textSize = 12 textSize = 12
}) })
local test = teverse.construct("guiTextBox", {
parent = teverse.coreInterface,
size = guiCoord(0, 90, 0, 16),
position = guiCoord(1.0, -140, 1, -26),
strokeRadius = 2,
text = "Remote Test",
textAlign = "middle",
textSize = 12
})
reload:on("mouseLeftUp", function() reload:on("mouseLeftUp", function()
teverse.apps:reload() teverse.apps:reload()
end) end)
@ -102,4 +112,79 @@ share:on("mouseLeftUp", function()
teverse.input:waitFor("mouseLeftUp") teverse.input:waitFor("mouseLeftUp")
teverse.apps:reload() teverse.apps:reload()
end)
test:on("mouseLeftUp", function()
test.visible = false
reload.visible = false
local backdrop = teverse.construct("guiFrame", {
parent = teverse.coreInterface,
size = guiCoord(1, 0, 1, 0),
position = guiCoord(0, 0, 0, 0),
backgroundColour = colour(.25, .25, .25),
backgroundAlpha = 0.6,
zIndex = 1000
})
local spinner = teverse.construct("guiIcon", {
parent = backdrop,
size = guiCoord(0, 40, 0, 40),
position = guiCoord(0.5, -20, 0.5, -20),
iconMax = 40,
iconColour = colour(1, 1, 1),
iconType = "faSolid",
iconId = "spinner",
iconAlpha = 0.9
})
spawn(function()
while sleep() and spinner.alive do
spinner.rotation = spinner.rotation + math.rad(1)
end
end)
teverse.apps:test()
local success, result = teverse.apps:waitFor("upload")
spinner:destroy()
local container = teverse.construct("guiTextBox", {
parent = backdrop,
size = guiCoord(0, 460, 0, 120),
position = guiCoord(0.5, -230, 0.5, -60),
backgroundColour = colour(1, 1, 1),
dropShadowAlpha = 0.3,
})
local label = teverse.construct("guiTextBox", {
parent = container,
size = guiCoord(1.0, -20, 1.0, -20),
position = guiCoord(0, 10, 0, 10),
backgroundAlpha = 0.0,
textSize = 16,
textWrap = true,
textAlign = "topLeft",
textFont = "tevurl:fonts/firaCodeRegular.otf"
})
local title = teverse.construct("guiTextBox", {
parent = backdrop,
size = guiCoord(0, 460, 0, 20),
position = guiCoord(0.5, -230, 0.5, -80),
backgroundColour = colour(0.9, 0.9, 0.9),
textSize = 18,
dropShadowAlpha = 0.3,
textAlign = "middle",
zIndex = 2
})
if success then
teverse.apps:reload()
else
title.backgroundColour = colour.rgb(179, 70, 70)
title.textColour = colour.white()
title.text = "Something went wrong"
label.text = result
end
end) end)