Skip to content

Commit 5193b4e

Browse files
authored
Merge pull request #10894 from godotengine/classref/sync-e37c626
classref: Sync with current master branch (e37c626)
2 parents 19ff7aa + e66e1fb commit 5193b4e

28 files changed

+1340
-309
lines changed

classes/[email protected]

+9-1
Original file line numberDiff line numberDiff line change
@@ -3875,11 +3875,19 @@ Hints that a :ref:`Callable<class_Callable>` property should be displayed as a c
38753875

38763876
Hints that a property will be changed on its own after setting, such as :ref:`AudioStreamPlayer.playing<class_AudioStreamPlayer_property_playing>` or :ref:`GPUParticles3D.emitting<class_GPUParticles3D_property_emitting>`.
38773877

3878+
.. _class_@GlobalScope_constant_PROPERTY_HINT_GROUP_ENABLE:
3879+
3880+
.. rst-class:: classref-enumeration-constant
3881+
3882+
:ref:`PropertyHint<enum_@GlobalScope_PropertyHint>` **PROPERTY_HINT_GROUP_ENABLE** = ``42``
3883+
3884+
Hints that a boolean property will enable the feature associated with the group that it occurs in. Only works within a group or subgroup.
3885+
38783886
.. _class_@GlobalScope_constant_PROPERTY_HINT_MAX:
38793887

38803888
.. rst-class:: classref-enumeration-constant
38813889

3882-
:ref:`PropertyHint<enum_@GlobalScope_PropertyHint>` **PROPERTY_HINT_MAX** = ``42``
3890+
:ref:`PropertyHint<enum_@GlobalScope_PropertyHint>` **PROPERTY_HINT_MAX** = ``43``
38833891

38843892
Represents the size of the :ref:`PropertyHint<enum_@GlobalScope_PropertyHint>` enum.
38853893

classes/class_astar2d.rst

+1-1
Original file line numberDiff line numberDiff line change
@@ -494,7 +494,7 @@ Removes the point associated with the given ``id`` from the points pool.
494494

495495
|void| **reserve_space**\ (\ num_nodes\: :ref:`int<class_int>`\ ) :ref:`🔗<class_AStar2D_method_reserve_space>`
496496

497-
Reserves space internally for ``num_nodes`` points. Useful if you're adding a known large number of points at once, such as points on a grid. The new capacity must be greater or equal to the old capacity.
497+
Reserves space internally for ``num_nodes`` points. Useful if you're adding a known large number of points at once, such as points on a grid.
498498

499499
.. rst-class:: classref-item-separator
500500

classes/class_astar3d.rst

+1-1
Original file line numberDiff line numberDiff line change
@@ -543,7 +543,7 @@ Removes the point associated with the given ``id`` from the points pool.
543543

544544
|void| **reserve_space**\ (\ num_nodes\: :ref:`int<class_int>`\ ) :ref:`🔗<class_AStar3D_method_reserve_space>`
545545

546-
Reserves space internally for ``num_nodes`` points. Useful if you're adding a known large number of points at once, such as points on a grid. New capacity must be greater or equals to old capacity.
546+
Reserves space internally for ``num_nodes`` points. Useful if you're adding a known large number of points at once, such as points on a grid.
547547

548548
.. rst-class:: classref-item-separator
549549

classes/class_canvaslayer.rst

+1-1
Original file line numberDiff line numberDiff line change
@@ -140,7 +140,7 @@ The custom :ref:`Viewport<class_Viewport>` node assigned to the **CanvasLayer**.
140140
- |void| **set_follow_viewport**\ (\ value\: :ref:`bool<class_bool>`\ )
141141
- :ref:`bool<class_bool>` **is_following_viewport**\ (\ )
142142

143-
If enabled, the **CanvasLayer** stays in a fixed position on the screen. If disabled, the **CanvasLayer** maintains its position in world space.
143+
If enabled, the **CanvasLayer** maintains its position in world space. If disabled, the **CanvasLayer** stays in a fixed position on the screen.
144144

145145
Together with :ref:`follow_viewport_scale<class_CanvasLayer_property_follow_viewport_scale>`, this can be used for a pseudo-3D effect.
146146

classes/class_editorsettings.rst

+14-14
Original file line numberDiff line numberDiff line change
@@ -599,12 +599,12 @@ Properties
599599
+---------------------------------------------------+-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
600600
| :ref:`bool<class_bool>` | :ref:`interface/touchscreen/enable_pan_and_scale_gestures<class_EditorSettings_property_interface/touchscreen/enable_pan_and_scale_gestures>` |
601601
+---------------------------------------------------+-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
602-
| :ref:`bool<class_bool>` | :ref:`interface/touchscreen/enable_touch_actions_panel<class_EditorSettings_property_interface/touchscreen/enable_touch_actions_panel>` |
603-
+---------------------------------------------------+-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
604602
| :ref:`bool<class_bool>` | :ref:`interface/touchscreen/increase_scrollbar_touch_area<class_EditorSettings_property_interface/touchscreen/increase_scrollbar_touch_area>` |
605603
+---------------------------------------------------+-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
606604
| :ref:`float<class_float>` | :ref:`interface/touchscreen/scale_gizmo_handles<class_EditorSettings_property_interface/touchscreen/scale_gizmo_handles>` |
607605
+---------------------------------------------------+-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
606+
| :ref:`int<class_int>` | :ref:`interface/touchscreen/touch_actions_panel<class_EditorSettings_property_interface/touchscreen/touch_actions_panel>` |
607+
+---------------------------------------------------+-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
608608
| :ref:`int<class_int>` | :ref:`network/connection/check_for_updates<class_EditorSettings_property_network/connection/check_for_updates>` |
609609
+---------------------------------------------------+-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
610610
| :ref:`int<class_int>` | :ref:`network/connection/network_mode<class_EditorSettings_property_network/connection/network_mode>` |
@@ -4446,43 +4446,43 @@ If ``true``, enable two finger pan and scale gestures on touchscreen devices.
44464446

44474447
----
44484448

4449-
.. _class_EditorSettings_property_interface/touchscreen/enable_touch_actions_panel:
4449+
.. _class_EditorSettings_property_interface/touchscreen/increase_scrollbar_touch_area:
44504450

44514451
.. rst-class:: classref-property
44524452

4453-
:ref:`bool<class_bool>` **interface/touchscreen/enable_touch_actions_panel** :ref:`🔗<class_EditorSettings_property_interface/touchscreen/enable_touch_actions_panel>`
4453+
:ref:`bool<class_bool>` **interface/touchscreen/increase_scrollbar_touch_area** :ref:`🔗<class_EditorSettings_property_interface/touchscreen/increase_scrollbar_touch_area>`
44544454

4455-
If ``true``, enables the TouchActionsPanel to provide easy access to keyboard shortcuts on touchscreen devices.
4455+
If ``true``, increases the scrollbar touch area to improve usability on touchscreen devices.
44564456

4457-
\ **Note:** Only available in the Android editor.
4457+
\ **Note:** Defaults to ``true`` on touchscreen devices.
44584458

44594459
.. rst-class:: classref-item-separator
44604460

44614461
----
44624462

4463-
.. _class_EditorSettings_property_interface/touchscreen/increase_scrollbar_touch_area:
4463+
.. _class_EditorSettings_property_interface/touchscreen/scale_gizmo_handles:
44644464

44654465
.. rst-class:: classref-property
44664466

4467-
:ref:`bool<class_bool>` **interface/touchscreen/increase_scrollbar_touch_area** :ref:`🔗<class_EditorSettings_property_interface/touchscreen/increase_scrollbar_touch_area>`
4467+
:ref:`float<class_float>` **interface/touchscreen/scale_gizmo_handles** :ref:`🔗<class_EditorSettings_property_interface/touchscreen/scale_gizmo_handles>`
44684468

4469-
If ``true``, increases the scrollbar touch area to improve usability on touchscreen devices.
4469+
Specify the multiplier to apply to the scale for the editor gizmo handles to improve usability on touchscreen devices.
44704470

4471-
\ **Note:** Defaults to ``true`` on touchscreen devices.
4471+
\ **Note:** Defaults to ``1`` on non-touchscreen devices.
44724472

44734473
.. rst-class:: classref-item-separator
44744474

44754475
----
44764476

4477-
.. _class_EditorSettings_property_interface/touchscreen/scale_gizmo_handles:
4477+
.. _class_EditorSettings_property_interface/touchscreen/touch_actions_panel:
44784478

44794479
.. rst-class:: classref-property
44804480

4481-
:ref:`float<class_float>` **interface/touchscreen/scale_gizmo_handles** :ref:`🔗<class_EditorSettings_property_interface/touchscreen/scale_gizmo_handles>`
4481+
:ref:`int<class_int>` **interface/touchscreen/touch_actions_panel** :ref:`🔗<class_EditorSettings_property_interface/touchscreen/touch_actions_panel>`
44824482

4483-
Specify the multiplier to apply to the scale for the editor gizmo handles to improve usability on touchscreen devices.
4483+
A touch-friendly panel that provides easy access to common actions such as save, delete, undo, and redo without requiring a keyboard.
44844484

4485-
\ **Note:** Defaults to ``1`` on non-touchscreen devices.
4485+
\ **Note:** Only available in the Android and XR editor.
44864486

44874487
.. rst-class:: classref-item-separator
44884488

0 commit comments

Comments
 (0)