Skip to content

Commit e273520

Browse files
authored
Merge pull request #9748 from godotengine/classref/sync-8e666ad
classref: Sync with current master branch (8e666ad)
2 parents 91717ff + 9c9e3a3 commit e273520

7 files changed

+23
-9
lines changed

classes/class_animationmixer.rst

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,13 @@ Base class for :ref:`AnimationPlayer<class_AnimationPlayer>` and :ref:`Animation
2525

2626
After instantiating the playback information data within the extended class, the blending is processed by the **AnimationMixer**.
2727

28+
.. rst-class:: classref-introduction-group
29+
30+
Tutorials
31+
---------
32+
33+
- `Migrating Animations from Godot 4.0 to 4.3 <https://godotengine.org/article/migrating-animations-from-godot-4-0-to-4-3/>`__
34+
2835
.. rst-class:: classref-reftable-group
2936

3037
Properties
@@ -665,7 +672,7 @@ The most basic example is applying position to :ref:`CharacterBody3D<class_Chara
665672

666673

667674

668-
By using this in combination with :ref:`get_root_motion_position_accumulator<class_AnimationMixer_method_get_root_motion_position_accumulator>`, you can apply the root motion position more correctly to account for the rotation of the node.
675+
By using this in combination with :ref:`get_root_motion_rotation_accumulator<class_AnimationMixer_method_get_root_motion_rotation_accumulator>`, you can apply the root motion position more correctly to account for the rotation of the node.
669676

670677

671678
.. tabs::

classes/class_compositoreffect.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ This resource allows for creating a custom rendering effect.
2121
Description
2222
-----------
2323

24-
This resource defines a custom rendering effect that can be applied to :ref:`Viewport<class_Viewport>`\ s through the viewports' :ref:`Environment<class_Environment>`. You can implement a callback that is called during rendering at a given stage of the rendering pipeline and allows you to insert additional passes. Note that this callback happens on the rendering thread.
24+
This resource defines a custom rendering effect that can be applied to :ref:`Viewport<class_Viewport>`\ s through the viewports' :ref:`Environment<class_Environment>`. You can implement a callback that is called during rendering at a given stage of the rendering pipeline and allows you to insert additional passes. Note that this callback happens on the rendering thread. CompositorEffect is an abstract base class and must be extended to implement specific rendering logic.
2525

2626
.. rst-class:: classref-reftable-group
2727

classes/class_editorimportplugin.rst

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -120,18 +120,18 @@ Below is an example EditorImportPlugin that imports a :ref:`Mesh<class_Mesh>` fr
120120
};
121121
}
122122

123-
public override int _Import(string sourceFile, string savePath, Godot.Collections.Dictionary options, Godot.Collections.Array<string> platformVariants, Godot.Collections.Array<string> genFiles)
123+
public override Error _Import(string sourceFile, string savePath, Godot.Collections.Dictionary options, Godot.Collections.Array<string> platformVariants, Godot.Collections.Array<string> genFiles)
124124
{
125125
using var file = FileAccess.Open(sourceFile, FileAccess.ModeFlags.Read);
126126
if (file.GetError() != Error.Ok)
127127
{
128-
return (int)Error.Failed;
128+
return Error.Failed;
129129
}
130130

131131
var mesh = new ArrayMesh();
132132
// Fill the Mesh with data read in "file", left as an exercise to the reader.
133133
string filename = $"{savePath}.{_GetSaveExtension()}";
134-
return (int)ResourceSaver.Save(mesh, filename);
134+
return ResourceSaver.Save(mesh, filename);
135135
}
136136
}
137137

@@ -388,7 +388,7 @@ This method must be overridden to do the actual importing work. See this class'
388388

389389
:ref:`Error<enum_@GlobalScope_Error>` **append_import_external_resource**\ (\ path\: :ref:`String<class_String>`, custom_options\: :ref:`Dictionary<class_Dictionary>` = {}, custom_importer\: :ref:`String<class_String>` = "", generator_parameters\: :ref:`Variant<class_Variant>` = null\ ) :ref:`🔗<class_EditorImportPlugin_method_append_import_external_resource>`
390390

391-
This function can only be called during the :ref:`_import<class_EditorImportPlugin_private_method__import>` callback and it allows manually importing resources from it. This is useful when the imported file generates external resources that require importing (as example, images). Custom parameters for the ".import" file can be passed via the ``custom_options``. Additionally, in cases where multiple importers can handle a file, the ``custom_importer`` ca be specified to force a specific one. This function performs a resource import and returns immediately with a success or error code. ``generator_parameters`` defines optional extra metadata which will be stored as ``generator_parameters`` in the ``remap`` section of the ``.import`` file, for example to store a md5 hash of the source data.
391+
This function can only be called during the :ref:`_import<class_EditorImportPlugin_private_method__import>` callback and it allows manually importing resources from it. This is useful when the imported file generates external resources that require importing (as example, images). Custom parameters for the ".import" file can be passed via the ``custom_options``. Additionally, in cases where multiple importers can handle a file, the ``custom_importer`` can be specified to force a specific one. This function performs a resource import and returns immediately with a success or error code. ``generator_parameters`` defines optional extra metadata which will be stored as ``generator_parameters`` in the ``remap`` section of the ``.import`` file, for example to store a md5 hash of the source data.
392392

393393
.. |virtual| replace:: :abbr:`virtual (This method should typically be overridden by the user to have any effect.)`
394394
.. |const| replace:: :abbr:`const (This method has no side effects. It doesn't modify any of the instance's member variables.)`

classes/class_object.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -695,7 +695,7 @@ Override this method to customize existing properties. Every property info goes
695695

696696
public override void _ValidateProperty(Godot.Collections.Dictionary property)
697697
{
698-
if (property["name"].AsStringName() == PropertyName.Number && IsNumberEditable)
698+
if (property["name"].AsStringName() == PropertyName.Number && !IsNumberEditable)
699699
{
700700
var usage = property["usage"].As<PropertyUsageFlags>() | PropertyUsageFlags.ReadOnly;
701701
property["usage"] = (int)usage;

classes/class_skeletonmodifier3d.rst

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,13 @@ If there is :ref:`AnimationMixer<class_AnimationMixer>`, modification always per
2727

2828
This node should be used to implement custom IK solvers, constraints, or skeleton physics.
2929

30+
.. rst-class:: classref-introduction-group
31+
32+
Tutorials
33+
---------
34+
35+
- `Design of the Skeleton Modifier 3D <https://godotengine.org/article/design-of-the-skeleton-modifier-3d/>`__
36+
3037
.. rst-class:: classref-reftable-group
3138

3239
Properties

classes/class_visibleonscreennotifier2d.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ A rectangular region of 2D space that detects whether it is visible on screen.
2121
Description
2222
-----------
2323

24-
:ref:`VisibleOnScreenEnabler2D<class_VisibleOnScreenEnabler2D>` represents a rectangular region of 2D space. When any part of this region becomes visible on screen or in a viewport, it will emit a :ref:`screen_entered<class_VisibleOnScreenNotifier2D_signal_screen_entered>` signal, and likewise it will emit a :ref:`screen_exited<class_VisibleOnScreenNotifier2D_signal_screen_exited>` signal when no part of it remains visible.
24+
**VisibleOnScreenNotifier2D** represents a rectangular region of 2D space. When any part of this region becomes visible on screen or in a viewport, it will emit a :ref:`screen_entered<class_VisibleOnScreenNotifier2D_signal_screen_entered>` signal, and likewise it will emit a :ref:`screen_exited<class_VisibleOnScreenNotifier2D_signal_screen_exited>` signal when no part of it remains visible.
2525

2626
If you want a node to be enabled automatically when this region is visible on screen, use :ref:`VisibleOnScreenEnabler2D<class_VisibleOnScreenEnabler2D>`.
2727

classes/class_visibleonscreennotifier3d.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ A box-shaped region of 3D space that detects whether it is visible on screen.
2121
Description
2222
-----------
2323

24-
:ref:`VisibleOnScreenEnabler3D<class_VisibleOnScreenEnabler3D>` represents a box-shaped region of 3D space. When any part of this region becomes visible on screen or in a :ref:`Camera3D<class_Camera3D>`'s view, it will emit a :ref:`screen_entered<class_VisibleOnScreenNotifier3D_signal_screen_entered>` signal, and likewise it will emit a :ref:`screen_exited<class_VisibleOnScreenNotifier3D_signal_screen_exited>` signal when no part of it remains visible.
24+
**VisibleOnScreenNotifier3D** represents a box-shaped region of 3D space. When any part of this region becomes visible on screen or in a :ref:`Camera3D<class_Camera3D>`'s view, it will emit a :ref:`screen_entered<class_VisibleOnScreenNotifier3D_signal_screen_entered>` signal, and likewise it will emit a :ref:`screen_exited<class_VisibleOnScreenNotifier3D_signal_screen_exited>` signal when no part of it remains visible.
2525

2626
If you want a node to be enabled automatically when this region is visible on screen, use :ref:`VisibleOnScreenEnabler3D<class_VisibleOnScreenEnabler3D>`.
2727

0 commit comments

Comments
 (0)