Skip to content

Commit 5f7da09

Browse files
authored
Merge pull request #9704 from godotengine/classref/sync-3978628
classref: Sync with current master branch (3978628)
2 parents 2886f9b + 12846af commit 5f7da09

9 files changed

+46
-8
lines changed

classes/class_array.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1256,7 +1256,7 @@ If ``deep`` is ``true``, all nested **Array** and :ref:`Dictionary<class_Diction
12561256

12571257
|void| **sort**\ (\ ) :ref:`🔗<class_Array_method_sort>`
12581258

1259-
Sorts the array in ascending order. The final order is dependent on the "less than" (``>``) comparison between elements.
1259+
Sorts the array in ascending order. The final order is dependent on the "less than" (``<``) comparison between elements.
12601260

12611261

12621262
.. tabs::

classes/class_color.rst

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1771,6 +1771,8 @@ Decodes a **Color** from an RGBE9995 format integer. See :ref:`Image.FORMAT_RGBE
17711771

17721772
Creates a **Color** from the given string, which can be either an HTML color code or a named color (case-insensitive). Returns ``default`` if the color cannot be inferred from the string.
17731773

1774+
If you want to create a color from String in a constant expression, use the equivalent constructor instead (i.e. ``Color("color string")``).
1775+
17741776
.. rst-class:: classref-item-separator
17751777

17761778
----
@@ -1816,6 +1818,8 @@ In GDScript and C#, the :ref:`int<class_int>` is best visualized with hexadecima
18161818

18171819

18181820

1821+
If you want to use hex notation in a constant expression, use the equivalent constructor instead (i.e. ``Color(0xRRGGBBAA)``).
1822+
18191823
.. rst-class:: classref-item-separator
18201824

18211825
----

classes/class_editorsettings.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4155,7 +4155,7 @@ If ``true``, allows scrolling past the end of the file.
41554155

41564156
:ref:`bool<class_bool>` **text_editor/behavior/navigation/smooth_scrolling** :ref:`🔗<class_EditorSettings_property_text_editor/behavior/navigation/smooth_scrolling>`
41574157

4158-
If ``true``, allows scrolling in sub-line intervals and enables a smooth scrolling animation when using the mouse wheel to scroll.
4158+
If ``true``, enables a smooth scrolling animation when using the mouse wheel to scroll. See :ref:`text_editor/behavior/navigation/v_scroll_speed<class_EditorSettings_property_text_editor/behavior/navigation/v_scroll_speed>` for the speed of this animation.
41594159

41604160
\ **Note:** :ref:`text_editor/behavior/navigation/smooth_scrolling<class_EditorSettings_property_text_editor/behavior/navigation/smooth_scrolling>` currently behaves poorly in projects where :ref:`ProjectSettings.physics/common/physics_ticks_per_second<class_ProjectSettings_property_physics/common/physics_ticks_per_second>` has been increased significantly from its default value (``60``). In this case, it is recommended to disable this setting.
41614161

@@ -4205,7 +4205,7 @@ If ``true``, uses the characters in ```!"#$%&'()*+,-./:;<=>?@[\]^`{|}~``, the Un
42054205

42064206
:ref:`int<class_int>` **text_editor/behavior/navigation/v_scroll_speed** :ref:`🔗<class_EditorSettings_property_text_editor/behavior/navigation/v_scroll_speed>`
42074207

4208-
The number of pixels to scroll with every mouse wheel increment. Higher values make the script scroll by faster when using the mouse wheel.
4208+
The speed of scrolling in lines per second when :ref:`text_editor/behavior/navigation/smooth_scrolling<class_EditorSettings_property_text_editor/behavior/navigation/smooth_scrolling>` is ``true``. Higher values make the script scroll by faster when using the mouse wheel.
42094209

42104210
\ **Note:** You can hold down :kbd:`Alt` while using the mouse wheel to temporarily scroll 5 times faster.
42114211

classes/class_font.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -501,7 +501,7 @@ To print available variation axes of a variable font:
501501
::
502502

503503
var fv = FontVariation.new()
504-
fv.set_base_font = load("res://RobotoFlex.ttf")
504+
fv.base_font = load("res://RobotoFlex.ttf")
505505
var variation_list = fv.get_supported_variation_list()
506506
for tag in variation_list:
507507
var name = TextServerManager.get_primary_interface().tag_to_name(tag)

classes/class_fontvariation.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,8 @@ To use simulated bold font variant:
2929
.. code-tab:: gdscript
3030

3131
var fv = FontVariation.new()
32-
fv.set_base_font(load("res://BarlowCondensed-Regular.ttf"))
33-
fv.set_variation_embolden(1.2)
32+
fv.base_font = load("res://BarlowCondensed-Regular.ttf")
33+
fv.variation_embolden = 1.2
3434
$Label.add_theme_font_override("font", fv)
3535
$Label.add_theme_font_size_override("font_size", 64)
3636

classes/class_inputeventshortcut.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ Represents a triggered keyboard :ref:`Shortcut<class_Shortcut>`.
1919
Description
2020
-----------
2121

22-
InputEventShortcut is a special event that can be received in :ref:`Node._unhandled_key_input<class_Node_private_method__unhandled_key_input>`. It is typically sent by the editor's Command Palette to trigger actions, but can also be sent manually using :ref:`Viewport.push_input<class_Viewport_method_push_input>`.
22+
InputEventShortcut is a special event that can be received in :ref:`Node._input<class_Node_private_method__input>`, :ref:`Node._shortcut_input<class_Node_private_method__shortcut_input>`, and :ref:`Node._unhandled_input<class_Node_private_method__unhandled_input>`. It is typically sent by the editor's Command Palette to trigger actions, but can also be sent manually using :ref:`Viewport.push_input<class_Viewport_method_push_input>`.
2323

2424
.. rst-class:: classref-reftable-group
2525

classes/class_mobilevrinterface.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ You can initialize this interface as follows:
2929

3030
var interface = XRServer.find_interface("Native mobile")
3131
if interface and interface.initialize():
32-
get_viewport().xr = true
32+
get_viewport().use_xr = true
3333

3434
.. rst-class:: classref-reftable-group
3535

classes/class_os.rst

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1057,6 +1057,8 @@ Returns the exit code of a spawned process once it has finished running (see :re
10571057

10581058
Returns ``-1`` if the ``pid`` is not a PID of a spawned child process, the process is still running, or the method is not implemented for the current platform.
10591059

1060+
\ **Note:** Returns ``-1`` if the ``pid`` is a macOS bundled app process.
1061+
10601062
\ **Note:** This method is implemented on Android, Linux, macOS and Windows.
10611063

10621064
.. rst-class:: classref-item-separator

classes/class_projectsettings.rst

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1523,6 +1523,10 @@ Properties
15231523
+---------------------------------------------------+------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+--------------------------------------------------------------------------------------------------+
15241524
| :ref:`String<class_String>` | :ref:`rendering/rendering_device/driver.windows<class_ProjectSettings_property_rendering/rendering_device/driver.windows>` | |
15251525
+---------------------------------------------------+------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+--------------------------------------------------------------------------------------------------+
1526+
| :ref:`bool<class_bool>` | :ref:`rendering/rendering_device/fallback_to_d3d12<class_ProjectSettings_property_rendering/rendering_device/fallback_to_d3d12>` | ``true`` |
1527+
+---------------------------------------------------+------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+--------------------------------------------------------------------------------------------------+
1528+
| :ref:`bool<class_bool>` | :ref:`rendering/rendering_device/fallback_to_vulkan<class_ProjectSettings_property_rendering/rendering_device/fallback_to_vulkan>` | ``true`` |
1529+
+---------------------------------------------------+------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+--------------------------------------------------------------------------------------------------+
15261530
| :ref:`bool<class_bool>` | :ref:`rendering/rendering_device/pipeline_cache/enable<class_ProjectSettings_property_rendering/rendering_device/pipeline_cache/enable>` | ``true`` |
15271531
+---------------------------------------------------+------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+--------------------------------------------------------------------------------------------------+
15281532
| :ref:`float<class_float>` | :ref:`rendering/rendering_device/pipeline_cache/save_chunk_size_mb<class_ProjectSettings_property_rendering/rendering_device/pipeline_cache/save_chunk_size_mb>` | ``3.0`` |
@@ -11202,6 +11206,34 @@ Windows override for :ref:`rendering/rendering_device/driver<class_ProjectSettin
1120211206

1120311207
----
1120411208

11209+
.. _class_ProjectSettings_property_rendering/rendering_device/fallback_to_d3d12:
11210+
11211+
.. rst-class:: classref-property
11212+
11213+
:ref:`bool<class_bool>` **rendering/rendering_device/fallback_to_d3d12** = ``true`` :ref:`🔗<class_ProjectSettings_property_rendering/rendering_device/fallback_to_d3d12>`
11214+
11215+
If ``true``, the forward renderer will fall back to Direct3D 12 if Vulkan is not supported.
11216+
11217+
\ **Note:** This setting is implemented only on Windows.
11218+
11219+
.. rst-class:: classref-item-separator
11220+
11221+
----
11222+
11223+
.. _class_ProjectSettings_property_rendering/rendering_device/fallback_to_vulkan:
11224+
11225+
.. rst-class:: classref-property
11226+
11227+
:ref:`bool<class_bool>` **rendering/rendering_device/fallback_to_vulkan** = ``true`` :ref:`🔗<class_ProjectSettings_property_rendering/rendering_device/fallback_to_vulkan>`
11228+
11229+
If ``true``, the forward renderer will fall back to Vulkan if Direct3D 12 is not supported.
11230+
11231+
\ **Note:** This setting is implemented only on Windows.
11232+
11233+
.. rst-class:: classref-item-separator
11234+
11235+
----
11236+
1120511237
.. _class_ProjectSettings_property_rendering/rendering_device/pipeline_cache/enable:
1120611238

1120711239
.. rst-class:: classref-property

0 commit comments

Comments
 (0)