Skip to content

Commit d38c980

Browse files
authored
Merge pull request #11469 from godotengine/classref/sync-ef34c3d
classref: Sync with current master branch (ef34c3d)
2 parents e9f98b9 + 7b4ae2a commit d38c980

36 files changed

+1384
-215
lines changed

classes/class_@globalscope.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6027,7 +6027,7 @@ Returns the :ref:`Object<class_Object>` that corresponds to ``instance_id``. All
60276027
func _ready():
60286028
var id = get_instance_id()
60296029
var instance = instance_from_id(id)
6030-
print(instance.foo) # Prints "water"
6030+
print(instance.drink) # Prints "water"
60316031

60326032
.. code-tab:: csharp
60336033

classes/class_array.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -930,7 +930,7 @@ In GDScript, this is equivalent to the ``in`` operator:
930930

931931
Returns a hashed 32-bit integer value representing the array and its contents.
932932

933-
\ **Note:** Arrays with equal hash values are *not* guaranteed to be the same, as a result of hash collisions. On the countrary, arrays with different hash values are guaranteed to be different.
933+
\ **Note:** Arrays with equal hash values are *not* guaranteed to be the same, as a result of hash collisions. On the contrary, arrays with different hash values are guaranteed to be different.
934934

935935
.. rst-class:: classref-item-separator
936936

classes/class_boneconstraint3d.rst

Lines changed: 120 additions & 27 deletions
Large diffs are not rendered by default.

classes/class_canvasitem.rst

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -515,6 +515,8 @@ The **CanvasItem** has entered the canvas.
515515

516516
The **CanvasItem** has exited the canvas.
517517

518+
This notification is sent in reversed order.
519+
518520
.. _class_CanvasItem_constant_NOTIFICATION_WORLD_2D_CHANGED:
519521

520522
.. rst-class:: classref-constant

classes/class_control.rst

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -604,7 +604,7 @@ Prevents the control from receiving mouse input. :ref:`get_mouse_filter_with_ove
604604

605605
:ref:`MouseBehaviorRecursive<enum_Control_MouseBehaviorRecursive>` **MOUSE_BEHAVIOR_ENABLED** = ``2``
606606

607-
Allows the control to be receive mouse input, depending on the :ref:`mouse_filter<class_Control_property_mouse_filter>`. This can be used to ignore the parent's :ref:`mouse_behavior_recursive<class_Control_property_mouse_behavior_recursive>`. :ref:`get_mouse_filter_with_override()<class_Control_method_get_mouse_filter_with_override>` will return the :ref:`mouse_filter<class_Control_property_mouse_filter>`.
607+
Allows the control to receive mouse input, depending on the :ref:`mouse_filter<class_Control_property_mouse_filter>`. This can be used to ignore the parent's :ref:`mouse_behavior_recursive<class_Control_property_mouse_behavior_recursive>`. :ref:`get_mouse_filter_with_override()<class_Control_method_get_mouse_filter_with_override>` will return the :ref:`mouse_filter<class_Control_property_mouse_filter>`.
608608

609609
.. rst-class:: classref-item-separator
610610

@@ -1285,6 +1285,8 @@ Sent when the node grabs focus.
12851285

12861286
Sent when the node loses focus.
12871287

1288+
This notification is sent in reversed order.
1289+
12881290
.. _class_Control_constant_NOTIFICATION_THEME_CHANGED:
12891291

12901292
.. rst-class:: classref-constant

classes/class_converttransformmodifier3d.rst

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,8 @@ There are 4 ways to apply the transform, depending on the combination of :ref:`s
3939

4040
- Extract reference pose absolutely and the apply bone's pose is replaced with it.
4141

42+
\ **Note:** Relative option is available only in the case :ref:`BoneConstraint3D.get_reference_type()<class_BoneConstraint3D_method_get_reference_type>` is :ref:`BoneConstraint3D.REFERENCE_TYPE_BONE<class_BoneConstraint3D_constant_REFERENCE_TYPE_BONE>`. See also :ref:`ReferenceType<enum_BoneConstraint3D_ReferenceType>`.
43+
4244
.. rst-class:: classref-reftable-group
4345

4446
Properties

classes/class_copytransformmodifier3d.rst

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,8 @@ There are 4 ways to apply the transform, depending on the combination of :ref:`s
3939

4040
- Extract reference pose absolutely and the apply bone's pose is replaced with it.
4141

42+
\ **Note:** Relative option is available only in the case :ref:`BoneConstraint3D.get_reference_type()<class_BoneConstraint3D_method_get_reference_type>` is :ref:`BoneConstraint3D.REFERENCE_TYPE_BONE<class_BoneConstraint3D_constant_REFERENCE_TYPE_BONE>`. See also :ref:`ReferenceType<enum_BoneConstraint3D_ReferenceType>`.
43+
4244
.. rst-class:: classref-reftable-group
4345

4446
Properties

classes/class_cpuparticles2d.rst

Lines changed: 184 additions & 138 deletions
Large diffs are not rendered by default.

classes/class_editorinterface.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -815,7 +815,7 @@ Plays the main scene.
815815

816816
Pops up an editor dialog for creating an object.
817817

818-
The ``callback`` must take a single argument of type :ref:`StringName<class_StringName>` which will contain the type name of the selected object or be empty if no item is selected.
818+
The ``callback`` must take a single argument of type :ref:`String<class_String>`, which will contain the type name of the selected object (or the script path of the type, if the type is created from a script), or be an empty string if no item is selected.
819819

820820
The ``base_type`` specifies the base type of objects to display. For example, if you set this to "Resource", all types derived from :ref:`Resource<class_Resource>` will display in the create dialog.
821821

classes/class_editorscript.rst

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -128,6 +128,8 @@ Returns the :ref:`EditorInterface<class_EditorInterface>` singleton instance.
128128

129129
:ref:`Node<class_Node>` **get_scene**\ (\ ) |const| :ref:`🔗<class_EditorScript_method_get_scene>`
130130

131+
**Deprecated:** Use :ref:`EditorInterface.get_edited_scene_root()<class_EditorInterface_method_get_edited_scene_root>` instead.
132+
131133
Returns the edited (current) scene's root :ref:`Node<class_Node>`. Equivalent of :ref:`EditorInterface.get_edited_scene_root()<class_EditorInterface_method_get_edited_scene_root>`.
132134

133135
.. |virtual| replace:: :abbr:`virtual (This method should typically be overridden by the user to have any effect.)`

0 commit comments

Comments
 (0)