Skip to content

Commit baa6f59

Browse files
committed
update to 1.2.182
1 parent 0dc17e6 commit baa6f59

19 files changed

Lines changed: 265 additions & 332 deletions

DefoldDocs/api/collision_object.lua

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,8 @@ physics.JOINT_TYPE_HINGE = nil
1212
physics.JOINT_TYPE_SLIDER = nil
1313
---spring joint type
1414
physics.JOINT_TYPE_SPRING = nil
15+
---weld joint type
16+
physics.JOINT_TYPE_WELD = nil
1517
---Create a physics joint between two collision object components.
1618
---Note: Currently only supported in 2D physics.
1719
---@param joint_type number the joint type

DefoldDocs/api/gui.lua

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -304,7 +304,7 @@ function gui.get_fill_angle(node) end
304304
function gui.get_flipbook(node) end
305305

306306
---This is only useful nodes with flipbook animations. Gets the normalized cursor of the flipbook animation on a node.
307-
---@param node node to get the cursor for (node)
307+
---@param node node node to get the cursor for (node)
308308
---@return value number cursor value
309309
function gui.get_flipbook_cursor(node) end
310310

@@ -464,7 +464,7 @@ function gui.get_spine_animation(node) end
464464
function gui.get_spine_bone(node, bone_id) end
465465

466466
---This is only useful for spine nodes. Gets the normalized cursor of the animation on a spine node.
467-
---@param node spine node to get the cursor for (node)
467+
---@param node node spine node to get the cursor for (node)
468468
---@return value number cursor value
469469
function gui.get_spine_cursor(node) end
470470

DefoldDocs/api/resource.lua

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -103,6 +103,11 @@ function resource.set(path, buffer) end
103103
---@param buffer buffer The resource buffer
104104
function resource.set_buffer(path, buffer) end
105105

106+
---Update internal sound resource (wavc/oggc) with new data
107+
---@param path hash|string The path to the resource
108+
---@param buffer string A lua string containing the binary sound data
109+
function resource.set_sound(path, buffer) end
110+
106111
---Sets the pixel data for a specific texture.
107112
---@param path hash|string The path to the resource
108113
---@param table table A table containing info about the texture. Supported entries:

DefoldDocs/api/system.lua

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,7 @@ function sys.set_error_handler(error_handler) end
128128
---be clamped to a swap interval that matches any detected main monitor refresh rate. If Vsync is
129129
---unchecked the engine will try to respect the rate in software using timers. There is no
130130
---guarantee that the frame cap will be achieved depending on platform specifics and hardware settings.
131-
---@param frequency target frequency. 60 for 60 fps
131+
---@param frequency number target frequency. 60 for 60 fps
132132
function sys.set_update_frequency(frequency) end
133133

134134
---Set the vsync swap interval. The interval with which to swap the front and back buffers
@@ -140,7 +140,7 @@ function sys.set_update_frequency(frequency) end
140140
---"game.project", the engine will try to respect the set frame cap value from
141141
---"game.project" in software instead.
142142
---This setting may be overridden by driver settings.
143-
---@param swap_interval target swap interval.
143+
---@param swap_interval number target swap interval.
144144
function sys.set_vsync_swap_interval(swap_interval) end
145145

146146

DefoldDocs/api/timer.lua

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ timer = {}
99
timer.INVALID_TIMER_HANDLE = nil
1010
---You may cancel a timer from inside a timer callback.
1111
---Cancelling a timer that is already executed or cancelled is safe.
12-
---@param handle the timer handle returned by timer.delay()
13-
---@return if the timer was active, false if the timer is already cancelled / complete
12+
---@param handle hash the timer handle returned by timer.delay()
13+
---@return boolean if the timer was active, false if the timer is already cancelled / complete
1414
function timer.cancel(handle) end
1515

1616
---Adds a timer and returns a unique handle
@@ -19,10 +19,10 @@ function timer.cancel(handle) end
1919
---script update functions.
2020
---If you want a timer that triggers on each frame, set delay to 0.0f and repeat to true.
2121
---Timers created within a script will automatically die when the script is deleted.
22-
---@param delay time interval in seconds
23-
---@param _repeat true = repeat timer until cancel, false = one-shot timer
22+
---@param delay number time interval in seconds
23+
---@param _repeat boolean true = repeat timer until cancel, false = one-shot timer
2424
---@param callback function(self, handle, time_elapsed) timer callback function
25-
---@return identifier for the create timer, returns timer.INVALID_TIMER_HANDLE if the timer can not be created
25+
---@return hash handle identifier for the create timer, returns timer.INVALID_TIMER_HANDLE if the timer can not be created
2626
function timer.delay(delay, _repeat, callback) end
2727

2828

DefoldDocs/api/vector_math.lua

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -201,7 +201,7 @@ function vmath.matrix4_rotation_z(angle) end
201201

202202
---The resulting matrix describes a translation of a point
203203
---in euclidean space.
204-
---@param position vector3|type:vector4 position vector to create matrix from
204+
---@param position vector3|vector4 position vector to create matrix from
205205
---@return matrix4 matrix from the supplied position vector
206206
function vmath.matrix4_translation(position) end
207207

DefoldDocs/doc/dmConnectionPool_doc.json

Lines changed: 75 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -195,10 +195,75 @@
195195
]
196196
},
197197
{
198-
"doc": "The DNS channel that will be used for translating the host to an address",
199-
"name": "dns_channel",
198+
"doc": "true for ssl connection",
199+
"name": "ssl",
200+
"types": [
201+
"bool"
202+
]
203+
},
204+
{
205+
"doc": "The timeout (micro seconds) for the connection and ssl handshake",
206+
"name": "timeout",
207+
"types": [
208+
"int"
209+
]
210+
},
211+
{
212+
"doc": "connection (out)",
213+
"name": "connection",
214+
"types": [
215+
"dmConnectionPool::HConnection*"
216+
]
217+
},
218+
{
219+
"doc": "socket-result code on failure",
220+
"name": "sock_res",
221+
"types": [
222+
"dmSocket::Result*"
223+
]
224+
}
225+
],
226+
"returnvalues": [
227+
{
228+
"doc": "on success",
229+
"name": "dmConnectionPool::RESULT_OK",
230+
"types": [
231+
""
232+
]
233+
}
234+
],
235+
"notes": [],
236+
"brief": "Connection to a host/port",
237+
"examples": "",
238+
"members": [],
239+
"error": "",
240+
"tparams": [],
241+
"type": "FUNCTION",
242+
"name": "dmConnectionPool::Dial"
243+
},
244+
{
245+
"replaces": "",
246+
"description": "Connection to a host/port",
247+
"parameters": [
248+
{
249+
"doc": "pool",
250+
"name": "pool",
251+
"types": [
252+
"dmConnectionPool::HPool"
253+
]
254+
},
255+
{
256+
"doc": "host",
257+
"name": "host",
258+
"types": [
259+
"const char*"
260+
]
261+
},
262+
{
263+
"doc": "port",
264+
"name": "port",
200265
"types": [
201-
"dmDNS::HChannel"
266+
"uint16_t"
202267
]
203268
},
204269
{
@@ -215,6 +280,13 @@
215280
"int"
216281
]
217282
},
283+
{
284+
"doc": "If set and not null, will make the request early out",
285+
"name": "cancelflag",
286+
"types": [
287+
"int*"
288+
]
289+
},
218290
{
219291
"doc": "connection (out)",
220292
"name": "connection",

DefoldDocs/doc/dmDNS_doc.json

Lines changed: 0 additions & 171 deletions
This file was deleted.

DefoldDocs/doc/dmGameObject_doc.json

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,11 @@
11
{
22
"info": {
3-
"group": "DEFOLD SDK",
4-
"description": "API for manipulating game objects",
3+
"description": "<span class=\"file\">&lt;dmsdk/gameobject/component.h&gt;</span>\nApi for manipulating game object components (WIP)",
54
"namespace": "dmGameObject",
6-
"brief": "Game object functions",
7-
"file": "dmsdk/gameobject/gameobject.h",
8-
"path": "engine/gameobject/src/dmsdk/gameobject/gameobject.h",
9-
"name": "Gameobject"
5+
"brief": "SDK Component API documentation",
6+
"file": "",
7+
"path": "",
8+
"name": "Component"
109
},
1110
"elements": [
1211
{

0 commit comments

Comments
 (0)