Skip to content

Commit 9afaf48

Browse files
author
Godot Organization
committed
classref: Sync with current master branch (cb7cd81)
1 parent c7cfd7f commit 9afaf48

File tree

119 files changed

+6335
-543
lines changed

Some content is hidden

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

119 files changed

+6335
-543
lines changed

classes/[email protected]

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -121,6 +121,8 @@ Positive floating-point infinity. This is the result of floating-point division
121121

122122
----
123123

124+
.. rst-class:: classref-descriptions-group
125+
124126
Annotations
125127
-----------
126128

@@ -692,7 +694,7 @@ See also :ref:`@GlobalScope.PROPERTY_HINT_PLACEHOLDER_TEXT<class_@GlobalScope_co
692694

693695
Export an :ref:`int<class_int>`, :ref:`float<class_float>`, :ref:`Array<class_Array>`\ \[:ref:`int<class_int>`\ \], :ref:`Array<class_Array>`\ \[:ref:`float<class_float>`\ \], :ref:`PackedByteArray<class_PackedByteArray>`, :ref:`PackedInt32Array<class_PackedInt32Array>`, :ref:`PackedInt64Array<class_PackedInt64Array>`, :ref:`PackedFloat32Array<class_PackedFloat32Array>`, or :ref:`PackedFloat64Array<class_PackedFloat64Array>` property as a range value. The range must be defined by ``min`` and ``max``, as well as an optional ``step`` and a variety of extra hints. The ``step`` defaults to ``1`` for integer properties. For floating-point numbers this value depends on your :ref:`EditorSettings.interface/inspector/default_float_step<class_EditorSettings_property_interface/inspector/default_float_step>` setting.
694696

695-
If hints ``"or_greater"`` and ``"or_less"`` are provided, the editor widget will not cap the value at range boundaries. The ``"exp"`` hint will make the edited values on range to change exponentially. The ``"hide_slider"`` hint will hide the slider element of the editor widget.
697+
If hints ``"or_greater"`` and ``"or_less"`` are provided, the editor widget will not cap the value at range boundaries. The ``"exp"`` hint will make the edited values on range to change exponentially. The ``"prefer_slider"`` hint will make integer values use the slider instead of arrows for editing, while ``"hide_control"`` will hide the element controlling the value of the editor widget.
696698

697699
Hints also allow to indicate the units for the edited value. Using ``"radians_as_degrees"`` you can specify that the actual value is in radians, but should be displayed in degrees in the Inspector dock (the range values are also in degrees). ``"degrees"`` allows to add a degree sign as a unit suffix (the value is unchanged). Finally, a custom suffix can be provided using ``"suffix:unit"``, where "unit" can be any string.
698700

classes/[email protected]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3473,7 +3473,7 @@ Hints that an :ref:`int<class_int>` or :ref:`float<class_float>` property should
34733473

34743474
\ **Example:** ``"-360,360,1,or_greater,or_less"``.
34753475

3476-
Additionally, other keywords can be included: ``"exp"`` for exponential range editing, ``"radians_as_degrees"`` for editing radian angles in degrees (the range values are also in degrees), ``"degrees"`` to hint at an angle and ``"hide_slider"`` to hide the slider.
3476+
Additionally, other keywords can be included: ``"exp"`` for exponential range editing, ``"radians_as_degrees"`` for editing radian angles in degrees (the range values are also in degrees), ``"degrees"`` to hint at an angle, ``"prefer_slider"`` to show the slider for integers, and ``"hide_control"`` to hide the slider or up-down arrows.
34773477

34783478
.. _class_@GlobalScope_constant_PROPERTY_HINT_ENUM:
34793479

classes/class_aescontext.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -151,15 +151,15 @@ AES electronic codebook decryption mode.
151151

152152
:ref:`Mode<enum_AESContext_Mode>` **MODE_CBC_ENCRYPT** = ``2``
153153

154-
AES cipher blocker chaining encryption mode.
154+
AES cipher block chaining encryption mode.
155155

156156
.. _class_AESContext_constant_MODE_CBC_DECRYPT:
157157

158158
.. rst-class:: classref-enumeration-constant
159159

160160
:ref:`Mode<enum_AESContext_Mode>` **MODE_CBC_DECRYPT** = ``3``
161161

162-
AES cipher blocker chaining decryption mode.
162+
AES cipher block chaining decryption mode.
163163

164164
.. _class_AESContext_constant_MODE_MAX:
165165

classes/class_animationplayer.rst

Lines changed: 36 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -47,11 +47,11 @@ Properties
4747
:widths: auto
4848

4949
+--------------------------------------------------+--------------------------------------------------------------------------------------------------------------------+-----------+
50-
| :ref:`String<class_String>` | :ref:`assigned_animation<class_AnimationPlayer_property_assigned_animation>` | |
50+
| :ref:`StringName<class_StringName>` | :ref:`assigned_animation<class_AnimationPlayer_property_assigned_animation>` | |
5151
+--------------------------------------------------+--------------------------------------------------------------------------------------------------------------------+-----------+
52-
| :ref:`String<class_String>` | :ref:`autoplay<class_AnimationPlayer_property_autoplay>` | ``""`` |
52+
| :ref:`StringName<class_StringName>` | :ref:`autoplay<class_AnimationPlayer_property_autoplay>` | ``&""`` |
5353
+--------------------------------------------------+--------------------------------------------------------------------------------------------------------------------+-----------+
54-
| :ref:`String<class_String>` | :ref:`current_animation<class_AnimationPlayer_property_current_animation>` | ``""`` |
54+
| :ref:`StringName<class_StringName>` | :ref:`current_animation<class_AnimationPlayer_property_current_animation>` | ``&""`` |
5555
+--------------------------------------------------+--------------------------------------------------------------------------------------------------------------------+-----------+
5656
| :ref:`float<class_float>` | :ref:`current_animation_length<class_AnimationPlayer_property_current_animation_length>` | |
5757
+--------------------------------------------------+--------------------------------------------------------------------------------------------------------------------+-----------+
@@ -95,7 +95,7 @@ Methods
9595
+--------------------------------------------------------------------------------+---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
9696
| :ref:`AnimationProcessCallback<enum_AnimationPlayer_AnimationProcessCallback>` | :ref:`get_process_callback<class_AnimationPlayer_method_get_process_callback>`\ (\ ) |const| |
9797
+--------------------------------------------------------------------------------+---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
98-
| :ref:`PackedStringArray<class_PackedStringArray>` | :ref:`get_queue<class_AnimationPlayer_method_get_queue>`\ (\ ) |
98+
| :ref:`Array<class_Array>`\[:ref:`StringName<class_StringName>`\] | :ref:`get_queue<class_AnimationPlayer_method_get_queue>`\ (\ ) |
9999
+--------------------------------------------------------------------------------+---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
100100
| :ref:`NodePath<class_NodePath>` | :ref:`get_root<class_AnimationPlayer_method_get_root>`\ (\ ) |const| |
101101
+--------------------------------------------------------------------------------+---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
@@ -105,6 +105,8 @@ Methods
105105
+--------------------------------------------------------------------------------+---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
106106
| :ref:`bool<class_bool>` | :ref:`has_section<class_AnimationPlayer_method_has_section>`\ (\ ) |const| |
107107
+--------------------------------------------------------------------------------+---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
108+
| :ref:`bool<class_bool>` | :ref:`is_animation_active<class_AnimationPlayer_method_is_animation_active>`\ (\ ) |const| |
109+
+--------------------------------------------------------------------------------+---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
108110
| :ref:`bool<class_bool>` | :ref:`is_playing<class_AnimationPlayer_method_is_playing>`\ (\ ) |const| |
109111
+--------------------------------------------------------------------------------+---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
110112
| |void| | :ref:`pause<class_AnimationPlayer_method_pause>`\ (\ ) |
@@ -171,7 +173,7 @@ Emitted when a queued animation plays after the previous animation finished. See
171173

172174
.. rst-class:: classref-signal
173175

174-
**current_animation_changed**\ (\ name\: :ref:`String<class_String>`\ ) :ref:`🔗<class_AnimationPlayer_signal_current_animation_changed>`
176+
**current_animation_changed**\ (\ name\: :ref:`StringName<class_StringName>`\ ) :ref:`🔗<class_AnimationPlayer_signal_current_animation_changed>`
175177

176178
Emitted when :ref:`current_animation<class_AnimationPlayer_property_current_animation>` changes.
177179

@@ -263,12 +265,12 @@ Property Descriptions
263265

264266
.. rst-class:: classref-property
265267

266-
:ref:`String<class_String>` **assigned_animation** :ref:`🔗<class_AnimationPlayer_property_assigned_animation>`
268+
:ref:`StringName<class_StringName>` **assigned_animation** :ref:`🔗<class_AnimationPlayer_property_assigned_animation>`
267269

268270
.. rst-class:: classref-property-setget
269271

270-
- |void| **set_assigned_animation**\ (\ value\: :ref:`String<class_String>`\ )
271-
- :ref:`String<class_String>` **get_assigned_animation**\ (\ )
272+
- |void| **set_assigned_animation**\ (\ value\: :ref:`StringName<class_StringName>`\ )
273+
- :ref:`StringName<class_StringName>` **get_assigned_animation**\ (\ )
272274

273275
If playing, the current animation's key, otherwise, the animation last played. When set, this changes the animation, but will not play it unless already playing. See also :ref:`current_animation<class_AnimationPlayer_property_current_animation>`.
274276

@@ -280,12 +282,12 @@ If playing, the current animation's key, otherwise, the animation last played. W
280282

281283
.. rst-class:: classref-property
282284

283-
:ref:`String<class_String>` **autoplay** = ``""`` :ref:`🔗<class_AnimationPlayer_property_autoplay>`
285+
:ref:`StringName<class_StringName>` **autoplay** = ``&""`` :ref:`🔗<class_AnimationPlayer_property_autoplay>`
284286

285287
.. rst-class:: classref-property-setget
286288

287-
- |void| **set_autoplay**\ (\ value\: :ref:`String<class_String>`\ )
288-
- :ref:`String<class_String>` **get_autoplay**\ (\ )
289+
- |void| **set_autoplay**\ (\ value\: :ref:`StringName<class_StringName>`\ )
290+
- :ref:`StringName<class_StringName>` **get_autoplay**\ (\ )
289291

290292
The key of the animation to play when the scene loads.
291293

@@ -297,12 +299,12 @@ The key of the animation to play when the scene loads.
297299

298300
.. rst-class:: classref-property
299301

300-
:ref:`String<class_String>` **current_animation** = ``""`` :ref:`🔗<class_AnimationPlayer_property_current_animation>`
302+
:ref:`StringName<class_StringName>` **current_animation** = ``&""`` :ref:`🔗<class_AnimationPlayer_property_current_animation>`
301303

302304
.. rst-class:: classref-property-setget
303305

304-
- |void| **set_current_animation**\ (\ value\: :ref:`String<class_String>`\ )
305-
- :ref:`String<class_String>` **get_current_animation**\ (\ )
306+
- |void| **set_current_animation**\ (\ value\: :ref:`StringName<class_StringName>`\ )
307+
- :ref:`StringName<class_StringName>` **get_current_animation**\ (\ )
306308

307309
The key of the currently playing animation. If no animation is playing, the property's value is an empty string. Changing this value does not restart the animation. See :ref:`play()<class_AnimationPlayer_method_play>` for more information on playing animations.
308310

@@ -570,7 +572,7 @@ Returns the process notification in which to update animations.
570572

571573
.. rst-class:: classref-method
572574

573-
:ref:`PackedStringArray<class_PackedStringArray>` **get_queue**\ (\ ) :ref:`🔗<class_AnimationPlayer_method_get_queue>`
575+
:ref:`Array<class_Array>`\[:ref:`StringName<class_StringName>`\] **get_queue**\ (\ ) :ref:`🔗<class_AnimationPlayer_method_get_queue>`
574576

575577
Returns a list of the animation keys that are currently queued to play.
576578

@@ -628,6 +630,25 @@ Returns ``true`` if an animation is currently playing with a section.
628630

629631
----
630632

633+
.. _class_AnimationPlayer_method_is_animation_active:
634+
635+
.. rst-class:: classref-method
636+
637+
:ref:`bool<class_bool>` **is_animation_active**\ (\ ) |const| :ref:`🔗<class_AnimationPlayer_method_is_animation_active>`
638+
639+
Returns ``true`` if the an animation is currently active. An animation is active if it was played by calling :ref:`play()<class_AnimationPlayer_method_play>` and was not finished yet, or was stopped by calling :ref:`stop()<class_AnimationPlayer_method_stop>`.
640+
641+
This can be used to check whether an animation is currently paused or stopped.
642+
643+
::
644+
645+
var is_paused = not is_playing() and is_animation_active()
646+
var is_stopped = not is_playing() and not is_animation_active()
647+
648+
.. rst-class:: classref-item-separator
649+
650+
----
651+
631652
.. _class_AnimationPlayer_method_is_playing:
632653

633654
.. rst-class:: classref-method

0 commit comments

Comments
 (0)