Skip to content

Commit d775d7a

Browse files
authored
Merge pull request #9038 from godotengine/classref/sync-8e951fd
classref: Sync with current master branch (8e951fd)
2 parents 7030ad2 + 045efee commit d775d7a

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

54 files changed

+1915
-373
lines changed

classes/[email protected]

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -620,6 +620,24 @@ See also :ref:`@GlobalScope.PROPERTY_HINT_RANGE<class_@GlobalScope_constant_PROP
620620

621621
----
622622

623+
.. _class_@GDScript_annotation_@export_storage:
624+
625+
.. rst-class:: classref-annotation
626+
627+
**@export_storage**\ (\ )
628+
629+
Export a property with :ref:`@GlobalScope.PROPERTY_USAGE_STORAGE<class_@GlobalScope_constant_PROPERTY_USAGE_STORAGE>` flag. The property is not displayed in the editor, but it is serialized and stored in the scene or resource file. This can be useful for :ref:`@tool<class_@GDScript_annotation_@tool>` scripts. Also the property value is copied when :ref:`Resource.duplicate<class_Resource_method_duplicate>` or :ref:`Node.duplicate<class_Node_method_duplicate>` is called, unlike non-exported variables.
630+
631+
::
632+
633+
var a # Not stored in the file, not displayed in the editor.
634+
@export_storage var b # Stored in the file, not displayed in the editor.
635+
@export var c: int # Stored in the file, displayed in the editor.
636+
637+
.. rst-class:: classref-item-separator
638+
639+
----
640+
623641
.. _class_@GDScript_annotation_@export_subgroup:
624642

625643
.. rst-class:: classref-annotation

classes/class_animationnode.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -245,7 +245,7 @@ When inheriting from :ref:`AnimationRootNode<class_AnimationRootNode>`, implemen
245245

246246
:ref:`Dictionary<class_Dictionary>` **_get_child_nodes**\ (\ ) |virtual| |const|
247247

248-
When inheriting from :ref:`AnimationRootNode<class_AnimationRootNode>`, implement this virtual method to return all children animation nodes in order as a ``name: node`` dictionary.
248+
When inheriting from :ref:`AnimationRootNode<class_AnimationRootNode>`, implement this virtual method to return all child animation nodes in order as a ``name: node`` dictionary.
249249

250250
.. rst-class:: classref-item-separator
251251

@@ -359,7 +359,7 @@ Blend an input. This is only useful for animation nodes created for an :ref:`Ani
359359

360360
:ref:`float<class_float>` **blend_node**\ (\ name\: :ref:`StringName<class_StringName>`, node\: :ref:`AnimationNode<class_AnimationNode>`, time\: :ref:`float<class_float>`, seek\: :ref:`bool<class_bool>`, is_external_seeking\: :ref:`bool<class_bool>`, blend\: :ref:`float<class_float>`, filter\: :ref:`FilterAction<enum_AnimationNode_FilterAction>` = 0, sync\: :ref:`bool<class_bool>` = true, test_only\: :ref:`bool<class_bool>` = false\ )
361361

362-
Blend another animation node (in case this animation node contains children animation nodes). This function is only useful if you inherit from :ref:`AnimationRootNode<class_AnimationRootNode>` instead, else editors will not display your animation node for addition.
362+
Blend another animation node (in case this animation node contains child animation nodes). This function is only useful if you inherit from :ref:`AnimationRootNode<class_AnimationRootNode>` instead, otherwise editors will not display your animation node for addition.
363363

364364
.. rst-class:: classref-item-separator
365365

classes/class_animationnodetimescale.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ A time-scaling animation node used in :ref:`AnimationTree<class_AnimationTree>`.
1919
Description
2020
-----------
2121

22-
Allows to scale the speed of the animation (or reverse it) in any children :ref:`AnimationNode<class_AnimationNode>`\ s. Setting it to ``0.0`` will pause the animation.
22+
Allows to scale the speed of the animation (or reverse it) in any child :ref:`AnimationNode<class_AnimationNode>`\ s. Setting it to ``0.0`` will pause the animation.
2323

2424
.. rst-class:: classref-introduction-group
2525

classes/class_button.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,7 @@ Theme Properties
122122
+-----------------------------------+------------------------------------------------------------------------------------+-------------------------------------+
123123
| :ref:`Color<class_Color>` | :ref:`font_hover_pressed_color<class_Button_theme_color_font_hover_pressed_color>` | ``Color(1, 1, 1, 1)`` |
124124
+-----------------------------------+------------------------------------------------------------------------------------+-------------------------------------+
125-
| :ref:`Color<class_Color>` | :ref:`font_outline_color<class_Button_theme_color_font_outline_color>` | ``Color(1, 1, 1, 1)`` |
125+
| :ref:`Color<class_Color>` | :ref:`font_outline_color<class_Button_theme_color_font_outline_color>` | ``Color(0, 0, 0, 1)`` |
126126
+-----------------------------------+------------------------------------------------------------------------------------+-------------------------------------+
127127
| :ref:`Color<class_Color>` | :ref:`font_pressed_color<class_Button_theme_color_font_pressed_color>` | ``Color(1, 1, 1, 1)`` |
128128
+-----------------------------------+------------------------------------------------------------------------------------+-------------------------------------+
@@ -457,7 +457,7 @@ Text :ref:`Color<class_Color>` used when the **Button** is being hovered and pre
457457

458458
.. rst-class:: classref-themeproperty
459459

460-
:ref:`Color<class_Color>` **font_outline_color** = ``Color(1, 1, 1, 1)``
460+
:ref:`Color<class_Color>` **font_outline_color** = ``Color(0, 0, 0, 1)``
461461

462462
The tint of text outline of the **Button**.
463463

0 commit comments

Comments
 (0)