summaryrefslogtreecommitdiff
path: root/doc/classes
diff options
context:
space:
mode:
Diffstat (limited to 'doc/classes')
-rw-r--r--doc/classes/Animation.xml22
-rw-r--r--doc/classes/EditorPlugin.xml4
-rw-r--r--doc/classes/PopupMenu.xml6
-rw-r--r--doc/classes/ProjectSettings.xml2
-rw-r--r--doc/classes/TileSet.xml12
-rw-r--r--doc/classes/TreeItem.xml6
-rw-r--r--doc/classes/Vector2.xml4
-rw-r--r--doc/classes/Vector3.xml4
8 files changed, 42 insertions, 18 deletions
diff --git a/doc/classes/Animation.xml b/doc/classes/Animation.xml
index 53d3663d4f..c79903cb80 100644
--- a/doc/classes/Animation.xml
+++ b/doc/classes/Animation.xml
@@ -536,43 +536,43 @@
Set the interpolation type of a given track, from the INTERPOLATION_* enum.
</description>
</method>
- <method name="track_set_key_transition">
+ <method name="track_set_key_time">
<return type="void">
</return>
<argument index="0" name="idx" type="int">
</argument>
<argument index="1" name="key_idx" type="int">
</argument>
- <argument index="2" name="transition" type="float">
+ <argument index="2" name="time" type="float">
</argument>
<description>
- Set the transition curve (easing) for a specific key (see built-in math function "ease").
+ Set the time of an existing key.
</description>
</method>
- <method name="track_set_key_value">
+ <method name="track_set_key_transition">
<return type="void">
</return>
<argument index="0" name="idx" type="int">
</argument>
- <argument index="1" name="key" type="int">
+ <argument index="1" name="key_idx" type="int">
</argument>
- <argument index="2" name="value" type="Variant">
+ <argument index="2" name="transition" type="float">
</argument>
<description>
- Set the value of an existing key.
+ Set the transition curve (easing) for a specific key (see built-in math function "ease").
</description>
</method>
- <method name="track_set_key_time">
+ <method name="track_set_key_value">
<return type="void">
</return>
<argument index="0" name="idx" type="int">
</argument>
- <argument index="1" name="key_idx" type="int">
+ <argument index="1" name="key" type="int">
</argument>
- <argument index="2" name="time" type="float">
+ <argument index="2" name="value" type="Variant">
</argument>
<description>
- Set the time of an existing key.
+ Set the value of an existing key.
</description>
</method>
<method name="track_set_path">
diff --git a/doc/classes/EditorPlugin.xml b/doc/classes/EditorPlugin.xml
index 97ad4f6829..3d91bff0aa 100644
--- a/doc/classes/EditorPlugin.xml
+++ b/doc/classes/EditorPlugin.xml
@@ -525,6 +525,10 @@
</constant>
<constant name="CONTAINER_PROPERTY_EDITOR_BOTTOM" value="9" enum="CustomControlContainer">
</constant>
+ <constant name="CONTAINER_PROJECT_SETTING_TAB_LEFT" value="10" enum="CustomControlContainer">
+ </constant>
+ <constant name="CONTAINER_PROJECT_SETTING_TAB_RIGHT" value="11" enum="CustomControlContainer">
+ </constant>
<constant name="DOCK_SLOT_LEFT_UL" value="0" enum="DockSlot">
</constant>
<constant name="DOCK_SLOT_LEFT_BL" value="1" enum="DockSlot">
diff --git a/doc/classes/PopupMenu.xml b/doc/classes/PopupMenu.xml
index 4bedc1b241..d6249f73aa 100644
--- a/doc/classes/PopupMenu.xml
+++ b/doc/classes/PopupMenu.xml
@@ -515,6 +515,9 @@
</method>
</methods>
<members>
+ <member name="allow_search" type="bool" setter="set_allow_search" getter="get_allow_search">
+ If [code]true[/code], allows to navigate [PopupMenu] with letter keys. Default value: [code]false[/code].
+ </member>
<member name="hide_on_checkable_item_selection" type="bool" setter="set_hide_on_checkable_item_selection" getter="is_hide_on_checkable_item_selection">
</member>
<member name="hide_on_item_selection" type="bool" setter="set_hide_on_item_selection" getter="is_hide_on_item_selection">
@@ -524,9 +527,6 @@
<member name="submenu_popup_delay" type="float" setter="set_submenu_popup_delay" getter="get_submenu_popup_delay">
Sets the delay time for the submenu item to popup on mouse hovering. If the popup menu is added as a child of another (acting as a submenu), it will inherit the delay time of the parent menu item. Default value: [code]0.3[/code] seconds.
</member>
- <member name="allow_search" type="bool" setter="set_allow_search" getter="get_allow_search">
- If [code]true[/code], allows to navigate [PopupMenu] with letter keys. Default value: [code]false[/code].
- </member>
</members>
<signals>
<signal name="id_focused">
diff --git a/doc/classes/ProjectSettings.xml b/doc/classes/ProjectSettings.xml
index ff8b702859..5bcd39a8d6 100644
--- a/doc/classes/ProjectSettings.xml
+++ b/doc/classes/ProjectSettings.xml
@@ -410,6 +410,8 @@
<member name="editor/active" type="bool" setter="" getter="">
Internal editor setting, don't touch.
</member>
+ <member name="editor/search_in_file_extensions" type="PoolStringArray" setter="" getter="">
+ </member>
<member name="gui/common/default_scroll_deadzone" type="int" setter="" getter="">
</member>
<member name="gui/common/swap_ok_cancel" type="bool" setter="" getter="">
diff --git a/doc/classes/TileSet.xml b/doc/classes/TileSet.xml
index 0bf602dcf7..f29a7990ed 100644
--- a/doc/classes/TileSet.xml
+++ b/doc/classes/TileSet.xml
@@ -10,6 +10,18 @@
<tutorials>
</tutorials>
<methods>
+ <method name="_forward_atlas_subtile_selection" qualifiers="virtual">
+ <return type="Vector2">
+ </return>
+ <argument index="0" name="atlastile_id" type="int">
+ </argument>
+ <argument index="1" name="tilemap" type="Object">
+ </argument>
+ <argument index="2" name="tile_location" type="Vector2">
+ </argument>
+ <description>
+ </description>
+ </method>
<method name="_forward_subtile_selection" qualifiers="virtual">
<return type="Vector2">
</return>
diff --git a/doc/classes/TreeItem.xml b/doc/classes/TreeItem.xml
index 9524e048bb..f7887a87c8 100644
--- a/doc/classes/TreeItem.xml
+++ b/doc/classes/TreeItem.xml
@@ -163,8 +163,11 @@
<method name="get_next_visible">
<return type="TreeItem">
</return>
+ <argument index="0" name="wrap" type="bool" default="false">
+ </argument>
<description>
Returns the next visible TreeItem in the tree.
+ If [code]wrap[/code] is enabled, the method will wrap around to the first visible element in the tree when called on the last visible element, otherwise it returns [code]null[/code].
</description>
</method>
<method name="get_parent">
@@ -184,8 +187,11 @@
<method name="get_prev_visible">
<return type="TreeItem">
</return>
+ <argument index="0" name="wrap" type="bool" default="false">
+ </argument>
<description>
Returns the previous visible TreeItem in the tree.
+ If [code]wrap[/code] is enabled, the method will wrap around to the last visible element in the tree when called on the first visible element, otherwise it returns [code]null[/code].
</description>
</method>
<method name="get_range" qualifiers="const">
diff --git a/doc/classes/Vector2.xml b/doc/classes/Vector2.xml
index eff8b0680e..243dbceced 100644
--- a/doc/classes/Vector2.xml
+++ b/doc/classes/Vector2.xml
@@ -188,9 +188,9 @@
<method name="move_toward">
<return type="Vector2">
</return>
- <argument index="0" name="b" type="Vector2">
+ <argument index="0" name="to" type="Vector2">
</argument>
- <argument index="1" name="t" type="float">
+ <argument index="1" name="delta" type="float">
</argument>
<description>
Moves the vector toward [code]to[/code] by the fixed [code]delta[/code] amount.
diff --git a/doc/classes/Vector3.xml b/doc/classes/Vector3.xml
index 86603d60cc..99bf3d2610 100644
--- a/doc/classes/Vector3.xml
+++ b/doc/classes/Vector3.xml
@@ -178,9 +178,9 @@
<method name="move_toward">
<return type="Vector3">
</return>
- <argument index="0" name="b" type="Vector3">
+ <argument index="0" name="to" type="Vector3">
</argument>
- <argument index="1" name="t" type="float">
+ <argument index="1" name="delta" type="float">
</argument>
<description>
Moves the vector toward [code]to[/code] by the fixed [code]delta[/code] amount.