summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
Diffstat (limited to 'doc')
-rw-r--r--doc/classes/CanvasItem.xml2
-rw-r--r--doc/classes/ColorPicker.xml6
-rw-r--r--doc/classes/OS.xml12
-rw-r--r--doc/classes/Object.xml3
-rw-r--r--doc/classes/RandomNumberGenerator.xml28
5 files changed, 24 insertions, 27 deletions
diff --git a/doc/classes/CanvasItem.xml b/doc/classes/CanvasItem.xml
index 63f82fe2bd..9e62cde019 100644
--- a/doc/classes/CanvasItem.xml
+++ b/doc/classes/CanvasItem.xml
@@ -135,7 +135,7 @@
<method name="draw_multimesh">
<return type="void">
</return>
- <argument index="0" name="mesh" type="MultiMesh">
+ <argument index="0" name="multimesh" type="MultiMesh">
</argument>
<argument index="1" name="texture" type="Texture">
</argument>
diff --git a/doc/classes/ColorPicker.xml b/doc/classes/ColorPicker.xml
index 2659fd8a39..b3a0164704 100644
--- a/doc/classes/ColorPicker.xml
+++ b/doc/classes/ColorPicker.xml
@@ -29,7 +29,7 @@
Remove the given color from the list of color presets of this color picker.
</description>
</method>
- <method name="get_presets">
+ <method name="get_presets" qualifiers="const">
<return type="PoolColorArray">
</return>
<description>
@@ -59,8 +59,6 @@
Emitted when the color is changed.
</description>
</signal>
- </signals>
- <signals>
<signal name="preset_added">
<argument index="0" name="color" type="Color">
</argument>
@@ -68,8 +66,6 @@
Emitted when a preset is added.
</description>
</signal>
- </signals>
- <signals>
<signal name="preset_removed">
<argument index="0" name="color" type="Color">
</argument>
diff --git a/doc/classes/OS.xml b/doc/classes/OS.xml
index 3cca19c6cb..ac865de3cd 100644
--- a/doc/classes/OS.xml
+++ b/doc/classes/OS.xml
@@ -210,18 +210,18 @@
Returns the path to the current engine executable.
</description>
</method>
- <method name="get_ime_text" qualifiers="const">
- <return type="String">
+ <method name="get_ime_selection" qualifiers="const">
+ <return type="Vector2">
</return>
<description>
- Returns IME intermediate text.
+ Returns IME selection range.
</description>
</method>
- <method name="get_ime_selection" qualifiers="const">
- <return type="Vector2">
+ <method name="get_ime_text" qualifiers="const">
+ <return type="String">
</return>
<description>
- Returns IME selection range.
+ Returns IME intermediate text.
</description>
</method>
<method name="get_latin_keyboard_variant" qualifiers="const">
diff --git a/doc/classes/Object.xml b/doc/classes/Object.xml
index 86de830d56..e358ad90b5 100644
--- a/doc/classes/Object.xml
+++ b/doc/classes/Object.xml
@@ -4,7 +4,8 @@
Base class for all non built-in types.
</brief_description>
<description>
- Base class for all non built-in types. Everything not a built-in type starts the inheritance chain from this class.
+ Base class for all non built-in types. Everything which is not a built-in type starts the inheritance chain from this class.
+ Objects can be constructed from scripting languages, using `Object.new()` in GDScript, `new Object` in C#, or the "Construct Object" node in VisualScript.
Objects do not manage memory, if inheriting from one the object will most likely have to be deleted manually (call the [method free] function from the script or delete from C++).
Some derivatives add memory management, such as [Reference] (which keeps a reference count and deletes itself automatically when no longer referenced) and [Node], which deletes the children tree when deleted.
Objects export properties, which are mainly useful for storage and editing, but not really so much in programming. Properties are exported in [method _get_property_list] and handled in [method _get] and [method _set]. However, scripting languages and C++ have simpler means to export them.
diff --git a/doc/classes/RandomNumberGenerator.xml b/doc/classes/RandomNumberGenerator.xml
index 720acc16ba..5badfba923 100644
--- a/doc/classes/RandomNumberGenerator.xml
+++ b/doc/classes/RandomNumberGenerator.xml
@@ -10,6 +10,13 @@
<demos>
</demos>
<methods>
+ <method name="randf">
+ <return type="float">
+ </return>
+ <description>
+ Generates pseudo-random float between '0.0' and '1.0'.
+ </description>
+ </method>
<method name="randf_range">
<return type="float">
</return>
@@ -21,6 +28,13 @@
Generates pseudo-random float between [code]from[/code] and [code]to[/code].
</description>
</method>
+ <method name="randi">
+ <return type="int">
+ </return>
+ <description>
+ Generates pseudo-random 32-bit unsigned integer between '0' and '4294967295'.
+ </description>
+ </method>
<method name="randi_range">
<return type="int">
</return>
@@ -32,20 +46,6 @@
Generates pseudo-random 32-bit signed integer between [code]from[/code] and [code]to[/code](inclusive).
</description>
</method>
- <method name="randf">
- <return type="float">
- </return>
- <description>
- Generates pseudo-random float between '0.0' and '1.0'.
- </description>
- </method>
- <method name="randi">
- <return type="int">
- </return>
- <description>
- Generates pseudo-random 32-bit unsigned integer between '0' and '4294967295'.
- </description>
- </method>
<method name="randomize">
<return type="void">
</return>