Skip to content

Commit 54ca539

Browse files
authored
Merge pull request godotengine#7663 from godotengine/classref/sync-a758388
classref: Sync with current master branch (a758388)
2 parents 147e996 + b3214b1 commit 54ca539

File tree

85 files changed

+3099
-116
lines changed

Some content is hidden

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

85 files changed

+3099
-116
lines changed

classes/[email protected]

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,10 @@ Singletons are also documented here, since they can be accessed from anywhere.
2323

2424
For the entries related to GDScript which can be accessed in any script see :ref:`@GDScript<class_@GDScript>`.
2525

26+
.. note::
27+
28+
There are notable differences when using this API with C#. See :ref:`doc_c_sharp_differences` for more information.
29+
2630
.. rst-class:: classref-introduction-group
2731

2832
Tutorials

classes/class_aabb.rst

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,10 @@ Negative values for :ref:`size<class_AABB_property_size>` are not supported and
2525

2626
\ **Note:** Unlike :ref:`Rect2<class_Rect2>`, **AABB** does not have a variant that uses integer coordinates.
2727

28+
.. note::
29+
30+
There are notable differences when using this API with C#. See :ref:`doc_c_sharp_differences` for more information.
31+
2832
.. rst-class:: classref-introduction-group
2933

3034
Tutorials

classes/class_animationnodeadd3.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ Blends two of three animations additively inside of an :ref:`AnimationNodeBlendT
1919
Description
2020
-----------
2121

22-
A resource to add to an :ref:`AnimationNodeBlendTree<class_AnimationNodeBlendTree>`. Blends two animations out of three additively out of three based on the amounmt value.
22+
A resource to add to an :ref:`AnimationNodeBlendTree<class_AnimationNodeBlendTree>`. Blends two animations out of three additively out of three based on the amount value.
2323

2424
This animation node has three inputs:
2525

classes/class_animationnodeblend3.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ Blends two of three animations linearly inside of an :ref:`AnimationNodeBlendTre
1919
Description
2020
-----------
2121

22-
A resource to add to an :ref:`AnimationNodeBlendTree<class_AnimationNodeBlendTree>`. Blends two animations out of three linearly out of three based on the amounmt value.
22+
A resource to add to an :ref:`AnimationNodeBlendTree<class_AnimationNodeBlendTree>`. Blends two animations out of three linearly out of three based on the amount value.
2323

2424
This animation node has three inputs:
2525

classes/class_array.rst

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,10 @@ Arrays can be concatenated using the ``+`` operator:
6868

6969
\ **Note:** Erasing elements while iterating over arrays is **not** supported and will result in unpredictable behavior.
7070

71+
.. note::
72+
73+
There are notable differences when using this API with C#. See :ref:`doc_c_sharp_differences` for more information.
74+
7175
.. rst-class:: classref-reftable-group
7276

7377
Constructors

classes/class_audiostreamoggvorbis.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@ Property Descriptions
115115
- void **set_loop** **(** :ref:`bool<class_bool>` value **)**
116116
- :ref:`bool<class_bool>` **has_loop** **(** **)**
117117

118-
If ``true``, the stream will automatically loop when it reaches the end.
118+
If ``true``, the audio will play again from the specified :ref:`loop_offset<class_AudioStreamOggVorbis_property_loop_offset>` once it is done playing. Useful for ambient sounds and background music.
119119

120120
.. rst-class:: classref-item-separator
121121

classes/class_basis.rst

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,10 @@ Basis can also be accessed as an array of 3D vectors. These vectors are usually
2525

2626
For more information, read the "Matrices and transforms" documentation article.
2727

28+
.. note::
29+
30+
There are notable differences when using this API with C#. See :ref:`doc_c_sharp_differences` for more information.
31+
2832
.. rst-class:: classref-introduction-group
2933

3034
Tutorials

classes/class_boneattachment3d.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -176,7 +176,7 @@ Sets the :ref:`NodePath<class_NodePath>` to the external skeleton that the BoneA
176176

177177
void **set_use_external_skeleton** **(** :ref:`bool<class_bool>` use_external_skeleton **)**
178178

179-
Sets whether the BoneAttachment3D node will use an extenral :ref:`Skeleton3D<class_Skeleton3D>` node rather than attenpting to use its parent node as the :ref:`Skeleton3D<class_Skeleton3D>`. When set to ``true``, the BoneAttachment3D node will use the external :ref:`Skeleton3D<class_Skeleton3D>` node set in :ref:`set_external_skeleton<class_BoneAttachment3D_method_set_external_skeleton>`.
179+
Sets whether the BoneAttachment3D node will use an external :ref:`Skeleton3D<class_Skeleton3D>` node rather than attempting to use its parent node as the :ref:`Skeleton3D<class_Skeleton3D>`. When set to ``true``, the BoneAttachment3D node will use the external :ref:`Skeleton3D<class_Skeleton3D>` node set in :ref:`set_external_skeleton<class_BoneAttachment3D_method_set_external_skeleton>`.
180180

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

classes/class_callable.rst

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -81,6 +81,10 @@ In GDScript, it's possible to create lambda functions within a method. Lambda fu
8181
# This will work, as lambdas are custom callables.
8282
create_tween().tween_callback(func(): my_dictionary.clear())
8383

84+
.. note::
85+
86+
There are notable differences when using this API with C#. See :ref:`doc_c_sharp_differences` for more information.
87+
8488
.. rst-class:: classref-reftable-group
8589

8690
Constructors

classes/class_camera3d.rst

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -79,6 +79,8 @@ Methods
7979
+---------------------------------------+-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
8080
| void | :ref:`clear_current<class_Camera3D_method_clear_current>` **(** :ref:`bool<class_bool>` enable_next=true **)** |
8181
+---------------------------------------+-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
82+
| :ref:`Projection<class_Projection>` | :ref:`get_camera_projection<class_Camera3D_method_get_camera_projection>` **(** **)** |const| |
83+
+---------------------------------------+-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
8284
| :ref:`RID<class_RID>` | :ref:`get_camera_rid<class_Camera3D_method_get_camera_rid>` **(** **)** |const| |
8385
+---------------------------------------+-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
8486
| :ref:`Transform3D<class_Transform3D>` | :ref:`get_camera_transform<class_Camera3D_method_get_camera_transform>` **(** **)** |const| |
@@ -497,6 +499,18 @@ If this is the current camera, remove it from being current. If ``enable_next``
497499

498500
----
499501

502+
.. _class_Camera3D_method_get_camera_projection:
503+
504+
.. rst-class:: classref-method
505+
506+
:ref:`Projection<class_Projection>` **get_camera_projection** **(** **)** |const|
507+
508+
Returns the projection matrix that this camera uses to render to its associated viewport. The camera must be part of the scene tree to function.
509+
510+
.. rst-class:: classref-item-separator
511+
512+
----
513+
500514
.. _class_Camera3D_method_get_camera_rid:
501515

502516
.. rst-class:: classref-method

0 commit comments

Comments
 (0)