summaryrefslogtreecommitdiff
path: root/doc/classes
diff options
context:
space:
mode:
Diffstat (limited to 'doc/classes')
-rw-r--r--doc/classes/@GDScript.xml2
-rw-r--r--doc/classes/CanvasItem.xml6
-rw-r--r--doc/classes/Control.xml2
-rw-r--r--doc/classes/MainLoop.xml4
-rw-r--r--doc/classes/MultiMesh.xml26
-rw-r--r--doc/classes/Spatial.xml6
6 files changed, 42 insertions, 4 deletions
diff --git a/doc/classes/@GDScript.xml b/doc/classes/@GDScript.xml
index 2cfdfafea1..3e46dc4e92 100644
--- a/doc/classes/@GDScript.xml
+++ b/doc/classes/@GDScript.xml
@@ -412,7 +412,7 @@
</description>
</method>
<method name="get_stack">
- <return type="void">
+ <return type="Array">
</return>
<description>
</description>
diff --git a/doc/classes/CanvasItem.xml b/doc/classes/CanvasItem.xml
index a04e38af5c..98404478f4 100644
--- a/doc/classes/CanvasItem.xml
+++ b/doc/classes/CanvasItem.xml
@@ -330,6 +330,12 @@
Draws a textured rectangle region at a given position, optionally modulated by a color. Transpose swaps the x and y coordinates when reading the texture.
</description>
</method>
+ <method name="force_update_transform">
+ <return type="void">
+ </return>
+ <description>
+ </description>
+ </method>
<method name="get_canvas" qualifiers="const">
<return type="RID">
</return>
diff --git a/doc/classes/Control.xml b/doc/classes/Control.xml
index bbd0441a0b..05b2c2704e 100644
--- a/doc/classes/Control.xml
+++ b/doc/classes/Control.xml
@@ -723,7 +723,7 @@
</description>
</signal>
<signal name="gui_input">
- <argument index="0" name="ev" type="InputEvent">
+ <argument index="0" name="event" type="InputEvent">
</argument>
<description>
Emitted when the node receives an [InputEvent].
diff --git a/doc/classes/MainLoop.xml b/doc/classes/MainLoop.xml
index 9454a16988..ad763e6532 100644
--- a/doc/classes/MainLoop.xml
+++ b/doc/classes/MainLoop.xml
@@ -47,7 +47,7 @@
<method name="_input_event" qualifiers="virtual">
<return type="void">
</return>
- <argument index="0" name="ev" type="InputEvent">
+ <argument index="0" name="event" type="InputEvent">
</argument>
<description>
</description>
@@ -91,7 +91,7 @@
<method name="input_event">
<return type="void">
</return>
- <argument index="0" name="ev" type="InputEvent">
+ <argument index="0" name="event" type="InputEvent">
</argument>
<description>
</description>
diff --git a/doc/classes/MultiMesh.xml b/doc/classes/MultiMesh.xml
index b78d82199c..1908fdd684 100644
--- a/doc/classes/MultiMesh.xml
+++ b/doc/classes/MultiMesh.xml
@@ -30,6 +30,14 @@
Get the color of a specific instance.
</description>
</method>
+ <method name="get_instance_custom_data" qualifiers="const">
+ <return type="Color">
+ </return>
+ <argument index="0" name="instance" type="int">
+ </argument>
+ <description>
+ </description>
+ </method>
<method name="get_instance_transform" qualifiers="const">
<return type="Transform">
</return>
@@ -50,6 +58,16 @@
Set the color of a specific instance.
</description>
</method>
+ <method name="set_instance_custom_data">
+ <return type="void">
+ </return>
+ <argument index="0" name="instance" type="int">
+ </argument>
+ <argument index="1" name="custom_data" type="Color">
+ </argument>
+ <description>
+ </description>
+ </method>
<method name="set_instance_transform">
<return type="void">
</return>
@@ -65,6 +83,8 @@
<members>
<member name="color_format" type="int" setter="set_color_format" getter="get_color_format" enum="MultiMesh.ColorFormat">
</member>
+ <member name="custom_data_format" type="int" setter="set_custom_data_format" getter="get_custom_data_format" enum="MultiMesh.CustomDataFormat">
+ </member>
<member name="instance_count" type="int" setter="set_instance_count" getter="get_instance_count">
</member>
<member name="mesh" type="Mesh" setter="set_mesh" getter="get_mesh">
@@ -83,5 +103,11 @@
</constant>
<constant name="COLOR_FLOAT" value="2" enum="ColorFormat">
</constant>
+ <constant name="CUSTOM_DATA_NONE" value="0" enum="CustomDataFormat">
+ </constant>
+ <constant name="CUSTOM_DATA_8BIT" value="1" enum="CustomDataFormat">
+ </constant>
+ <constant name="CUSTOM_DATA_FLOAT" value="2" enum="CustomDataFormat">
+ </constant>
</constants>
</class>
diff --git a/doc/classes/Spatial.xml b/doc/classes/Spatial.xml
index 4fa60b2e44..7fd7b5deed 100644
--- a/doc/classes/Spatial.xml
+++ b/doc/classes/Spatial.xml
@@ -13,6 +13,12 @@
<demos>
</demos>
<methods>
+ <method name="force_update_transform">
+ <return type="void">
+ </return>
+ <description>
+ </description>
+ </method>
<method name="get_parent_spatial" qualifiers="const">
<return type="Spatial">
</return>