summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
Diffstat (limited to 'doc')
-rw-r--r--doc/classes/Button.xml3
-rw-r--r--doc/classes/File.xml1
-rw-r--r--doc/classes/Label.xml2
-rw-r--r--doc/classes/Node.xml2
-rw-r--r--doc/classes/NodePath.xml1
-rw-r--r--doc/classes/TileData.xml40
-rw-r--r--doc/classes/TileSet.xml2
7 files changed, 27 insertions, 24 deletions
diff --git a/doc/classes/Button.xml b/doc/classes/Button.xml
index c9078a4de5..239e0bb2d9 100644
--- a/doc/classes/Button.xml
+++ b/doc/classes/Button.xml
@@ -85,6 +85,9 @@
<member name="icon" type="Texture2D" setter="set_button_icon" getter="get_button_icon">
Button's icon, if text is present the icon will be placed before the text.
</member>
+ <member name="icon_align" type="int" setter="set_icon_align" getter="get_icon_align" enum="Button.TextAlign" default="0">
+ Specifies if the icon should be aligned to the left, right, or center of a button. Uses the same [enum TextAlign] constants as the text alignment. If centered, text will draw on top of the icon.
+ </member>
<member name="language" type="String" setter="set_language" getter="get_language" default="&quot;&quot;">
Language code used for line-breaking and text shaping algorithms, if left empty current locale is used instead.
</member>
diff --git a/doc/classes/File.xml b/doc/classes/File.xml
index 7feaaa2040..f98c31dc7f 100644
--- a/doc/classes/File.xml
+++ b/doc/classes/File.xml
@@ -486,6 +486,7 @@
</argument>
<description>
Stores any Variant value in the file. If [code]full_objects[/code] is [code]true[/code], encoding objects is allowed (and can potentially include code).
+ [b]Note:[/b] Not all properties are included. Only properties that are configured with the [constant PROPERTY_USAGE_STORAGE] flag set will be serialized. You can add a new usage flag to a property by overriding the [method Object._get_property_list] method in your class. You can also check how property usage is configured by calling [method Object._get_property_list]. See [enum PropertyUsageFlags] for the possible usage flags.
</description>
</method>
</methods>
diff --git a/doc/classes/Label.xml b/doc/classes/Label.xml
index ee59f0c85a..0789ac9010 100644
--- a/doc/classes/Label.xml
+++ b/doc/classes/Label.xml
@@ -79,7 +79,7 @@
If [code]true[/code], wraps the text inside the node's bounding rectangle. If you resize the node, it will change its height automatically to show all the text.
</member>
<member name="clip_text" type="bool" setter="set_clip_text" getter="is_clipping_text" default="false">
- If [code]true[/code], the Label only shows the text that fits inside its bounding rectangle. It also lets you scale the node down freely.
+ If [code]true[/code], the Label only shows the text that fits inside its bounding rectangle and will clip text horizontally.
</member>
<member name="language" type="String" setter="set_language" getter="get_language" default="&quot;&quot;">
Language code used for line-breaking and text shaping algorithms, if left empty current locale is used instead.
diff --git a/doc/classes/Node.xml b/doc/classes/Node.xml
index 21f3f1fcc0..f185a2bc57 100644
--- a/doc/classes/Node.xml
+++ b/doc/classes/Node.xml
@@ -426,7 +426,7 @@
Returns [code]true[/code] if the [NodePath] points to a valid node and its subname points to a valid resource, e.g. [code]Area2D/CollisionShape2D:shape[/code]. Properties with a non-[Resource] type (e.g. nodes or primitive math types) are not considered resources.
</description>
</method>
- <method name="is_a_parent_of" qualifiers="const">
+ <method name="is_ancestor_of" qualifiers="const">
<return type="bool">
</return>
<argument index="0" name="node" type="Node">
diff --git a/doc/classes/NodePath.xml b/doc/classes/NodePath.xml
index 817ccd5160..0ba2e73ad4 100644
--- a/doc/classes/NodePath.xml
+++ b/doc/classes/NodePath.xml
@@ -20,6 +20,7 @@
@"/root/Main" # If your main scene's root node were named "Main".
@"/root/MyAutoload" # If you have an autoloaded node or scene.
[/codeblock]
+ [b]Note:[/b] In the editor, [NodePath] properties are automatically updated when moving, renaming or deleting a node in the scene tree, but they are never updated at runtime.
</description>
<tutorials>
<link title="2D Role Playing Game Demo">https://godotengine.org/asset-library/asset/520</link>
diff --git a/doc/classes/TileData.xml b/doc/classes/TileData.xml
index 1f0f807a08..bb793024eb 100644
--- a/doc/classes/TileData.xml
+++ b/doc/classes/TileData.xml
@@ -7,7 +7,7 @@
<tutorials>
</tutorials>
<methods>
- <method name="add_collision_shape">
+ <method name="add_collision_polygon">
<return type="void">
</return>
<argument index="0" name="layer_id" type="int">
@@ -15,27 +15,27 @@
<description>
</description>
</method>
- <method name="get_collision_shape_one_way_margin" qualifiers="const">
+ <method name="get_collision_polygon_one_way_margin" qualifiers="const">
<return type="float">
</return>
<argument index="0" name="layer_id" type="int">
</argument>
- <argument index="1" name="shape_index" type="int">
+ <argument index="1" name="polygon_index" type="int">
</argument>
<description>
</description>
</method>
- <method name="get_collision_shape_shape" qualifiers="const">
- <return type="Shape2D">
+ <method name="get_collision_polygon_points" qualifiers="const">
+ <return type="PackedVector2Array">
</return>
<argument index="0" name="layer_id" type="int">
</argument>
- <argument index="1" name="shape_index" type="int">
+ <argument index="1" name="polygon_index" type="int">
</argument>
<description>
</description>
</method>
- <method name="get_collision_shapes_count" qualifiers="const">
+ <method name="get_collision_polygons_count" qualifiers="const">
<return type="int">
</return>
<argument index="0" name="layer_id" type="int">
@@ -83,68 +83,68 @@
<description>
</description>
</method>
- <method name="is_collision_shape_one_way" qualifiers="const">
+ <method name="is_collision_polygon_one_way" qualifiers="const">
<return type="bool">
</return>
<argument index="0" name="layer_id" type="int">
</argument>
- <argument index="1" name="shape_index" type="int">
+ <argument index="1" name="polygon_index" type="int">
</argument>
<description>
</description>
</method>
- <method name="remove_collision_shape">
+ <method name="remove_collision_polygon">
<return type="void">
</return>
<argument index="0" name="layer_id" type="int">
</argument>
- <argument index="1" name="shape_index" type="int">
+ <argument index="1" name="polygon_index" type="int">
</argument>
<description>
</description>
</method>
- <method name="set_collision_shape_one_way">
+ <method name="set_collision_polygon_one_way">
<return type="void">
</return>
<argument index="0" name="layer_id" type="int">
</argument>
- <argument index="1" name="shape_index" type="int">
+ <argument index="1" name="polygon_index" type="int">
</argument>
<argument index="2" name="one_way" type="bool">
</argument>
<description>
</description>
</method>
- <method name="set_collision_shape_one_way_margin">
+ <method name="set_collision_polygon_one_way_margin">
<return type="void">
</return>
<argument index="0" name="layer_id" type="int">
</argument>
- <argument index="1" name="shape_index" type="int">
+ <argument index="1" name="polygon_index" type="int">
</argument>
<argument index="2" name="one_way_margin" type="float">
</argument>
<description>
</description>
</method>
- <method name="set_collision_shape_shape">
+ <method name="set_collision_polygon_points">
<return type="void">
</return>
<argument index="0" name="layer_id" type="int">
</argument>
- <argument index="1" name="shape_index" type="int">
+ <argument index="1" name="polygon_index" type="int">
</argument>
- <argument index="2" name="shape" type="Shape2D">
+ <argument index="2" name="polygon" type="PackedVector2Array">
</argument>
<description>
</description>
</method>
- <method name="set_collision_shapes_count">
+ <method name="set_collision_polygons_count">
<return type="void">
</return>
<argument index="0" name="layer_id" type="int">
</argument>
- <argument index="1" name="shapes_count" type="int">
+ <argument index="1" name="polygons_count" type="int">
</argument>
<description>
</description>
diff --git a/doc/classes/TileSet.xml b/doc/classes/TileSet.xml
index 7d8b589f78..55f232c004 100644
--- a/doc/classes/TileSet.xml
+++ b/doc/classes/TileSet.xml
@@ -289,8 +289,6 @@
</member>
<member name="tile_size" type="Vector2i" setter="set_tile_size" getter="get_tile_size" default="Vector2i(16, 16)">
</member>
- <member name="tile_skew" type="Vector2" setter="set_tile_skew" getter="get_tile_skew" default="Vector2(0, 0)">
- </member>
<member name="uv_clipping" type="bool" setter="set_uv_clipping" getter="is_uv_clipping" default="false">
</member>
<member name="y_sorting" type="bool" setter="set_y_sorting" getter="is_y_sorting" default="false">