Skip to content

Commit de475c8

Browse files
authored
Merge pull request godotengine#7494 from godotengine/classref/sync-9723077
2 parents efe99c2 + 82b2845 commit de475c8

29 files changed

+343
-228
lines changed

classes/class_animatedtexture.rst

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,9 @@ The playback of the animation is controlled by the :ref:`speed_scale<class_Anima
2727

2828
\ **Note:** AnimatedTexture doesn't support using :ref:`AtlasTexture<class_AtlasTexture>`\ s. Each frame needs to be a separate :ref:`Texture2D<class_Texture2D>`.
2929

30-
\ **Warning:** AnimatedTexture is deprecated, and might be removed in a future release. Its current implementation is not efficient for the modern renderers.
30+
\ **Warning:** The current implementation is not efficient for the modern renderers.
31+
32+
\ *Deprecated.* This class is deprecated, and might be removed in a future release.
3133

3234
.. rst-class:: classref-reftable-group
3335

classes/class_astargrid2d.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -389,7 +389,7 @@ The region of grid cells available for pathfinding. If changed, :ref:`update<cla
389389

390390
The size of the grid (number of cells of size :ref:`cell_size<class_AStarGrid2D_property_cell_size>` on each axis). If changed, :ref:`update<class_AStarGrid2D_method_update>` needs to be called before finding the next path.
391391

392-
\ **Note:** This property is deprecated, use :ref:`region<class_AStarGrid2D_property_region>` instead.
392+
\ *Deprecated.* Use :ref:`region<class_AStarGrid2D_property_region>` instead.
393393

394394
.. rst-class:: classref-section-separator
395395

classes/class_codeedit.rst

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

classes/class_control.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1743,7 +1743,7 @@ The size of the node's bounding rectangle, in the node's coordinate system. :ref
17431743
- void **set_h_size_flags** **(** :ref:`SizeFlags<enum_Control_SizeFlags>` value **)**
17441744
- :ref:`SizeFlags<enum_Control_SizeFlags>` **get_h_size_flags** **(** **)**
17451745

1746-
Tells the parent :ref:`Container<class_Container>` nodes how they should resize and place the node on the X axis. Use one of the :ref:`SizeFlags<enum_Control_SizeFlags>` constants to change the flags. See the constants to learn what each does.
1746+
Tells the parent :ref:`Container<class_Container>` nodes how they should resize and place the node on the X axis. Use a combination of the :ref:`SizeFlags<enum_Control_SizeFlags>` constants to change the flags. See the constants to learn what each does.
17471747

17481748
.. rst-class:: classref-item-separator
17491749

@@ -1777,7 +1777,7 @@ If the node and at least one of its neighbors uses the :ref:`SIZE_EXPAND<class_C
17771777
- void **set_v_size_flags** **(** :ref:`SizeFlags<enum_Control_SizeFlags>` value **)**
17781778
- :ref:`SizeFlags<enum_Control_SizeFlags>` **get_v_size_flags** **(** **)**
17791779

1780-
Tells the parent :ref:`Container<class_Container>` nodes how they should resize and place the node on the Y axis. Use one of the :ref:`SizeFlags<enum_Control_SizeFlags>` constants to change the flags. See the constants to learn what each does.
1780+
Tells the parent :ref:`Container<class_Container>` nodes how they should resize and place the node on the Y axis. Use a combination of the :ref:`SizeFlags<enum_Control_SizeFlags>` constants to change the flags. See the constants to learn what each does.
17811781

17821782
.. rst-class:: classref-item-separator
17831783

classes/class_editorexportplatformandroid.rst

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -612,6 +612,8 @@ Path of the debug keystore file.
612612

613613
Can be overridden with the environment variable ``GODOT_ANDROID_KEYSTORE_DEBUG_PATH``.
614614

615+
Fallbacks to ``EditorSettings.export/android/debug_keystore`` if empty.
616+
615617
.. rst-class:: classref-item-separator
616618

617619
----
@@ -626,6 +628,8 @@ Password for the debug keystore file.
626628

627629
Can be overridden with the environment variable ``GODOT_ANDROID_KEYSTORE_DEBUG_PASSWORD``.
628630

631+
Fallbacks to ``EditorSettings.export/android/debug_keystore_pass`` if both it and :ref:`keystore/debug<class_EditorExportPlatformAndroid_property_keystore/debug>` are empty.
632+
629633
.. rst-class:: classref-item-separator
630634

631635
----
@@ -640,6 +644,8 @@ User name for the debug keystore file.
640644

641645
Can be overridden with the environment variable ``GODOT_ANDROID_KEYSTORE_DEBUG_USER``.
642646

647+
Fallbacks to ``EditorSettings.export/android/debug_keystore_user`` if both it and :ref:`keystore/debug<class_EditorExportPlatformAndroid_property_keystore/debug>` are empty.
648+
643649
.. rst-class:: classref-item-separator
644650

645651
----
@@ -716,7 +722,7 @@ Foreground layer of the application adaptive icon file.
716722

717723
:ref:`String<class_String>` **launcher_icons/main_192x192**
718724

719-
Application icon file. If left empty, project icon is used instead.
725+
Application icon file. If left empty, it will fallback to :ref:`ProjectSettings.application/config/icon<class_ProjectSettings_property_application/config/icon>`.
720726

721727
.. rst-class:: classref-item-separator
722728

classes/class_editorexportplatformios.rst

Lines changed: 25 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -390,7 +390,7 @@ Path to the custom export template. If left empty, default template is used.
390390

391391
:ref:`String<class_String>` **icons/app_store_1024x1024**
392392

393-
App Store application icon file. If left empty, project icon is used instead. See `App icons <https://developer.apple.com/design/human-interface-guidelines/foundations/app-icons>`__.
393+
App Store application icon file. If left empty, it will fallback to :ref:`ProjectSettings.application/config/icon<class_ProjectSettings_property_application/config/icon>`. See `App icons <https://developer.apple.com/design/human-interface-guidelines/foundations/app-icons>`__.
394394

395395
.. rst-class:: classref-item-separator
396396

@@ -402,7 +402,7 @@ App Store application icon file. If left empty, project icon is used instead. Se
402402

403403
:ref:`String<class_String>` **icons/ipad_76x76**
404404

405-
Home screen application icon file on iPad (1x DPI). If left empty, project icon is used instead. See `App icons <https://developer.apple.com/design/human-interface-guidelines/foundations/app-icons>`__.
405+
Home screen application icon file on iPad (1x DPI). If left empty, it will fallback to :ref:`ProjectSettings.application/config/icon<class_ProjectSettings_property_application/config/icon>`. See `App icons <https://developer.apple.com/design/human-interface-guidelines/foundations/app-icons>`__.
406406

407407
.. rst-class:: classref-item-separator
408408

@@ -414,7 +414,7 @@ Home screen application icon file on iPad (1x DPI). If left empty, project icon
414414

415415
:ref:`String<class_String>` **icons/ipad_152x152**
416416

417-
Home screen application icon file on iPad (2x DPI). If left empty, project icon is used instead. See `App icons <https://developer.apple.com/design/human-interface-guidelines/foundations/app-icons>`__.
417+
Home screen application icon file on iPad (2x DPI). If left empty, it will fallback to :ref:`ProjectSettings.application/config/icon<class_ProjectSettings_property_application/config/icon>`. See `App icons <https://developer.apple.com/design/human-interface-guidelines/foundations/app-icons>`__.
418418

419419
.. rst-class:: classref-item-separator
420420

@@ -426,7 +426,7 @@ Home screen application icon file on iPad (2x DPI). If left empty, project icon
426426

427427
:ref:`String<class_String>` **icons/ipad_167x167**
428428

429-
Home screen application icon file on iPad (3x DPI). If left empty, project icon is used instead. See `App icons <https://developer.apple.com/design/human-interface-guidelines/foundations/app-icons>`__.
429+
Home screen application icon file on iPad (3x DPI). If left empty, it will fallback to :ref:`ProjectSettings.application/config/icon<class_ProjectSettings_property_application/config/icon>`. See `App icons <https://developer.apple.com/design/human-interface-guidelines/foundations/app-icons>`__.
430430

431431
.. rst-class:: classref-item-separator
432432

@@ -438,7 +438,7 @@ Home screen application icon file on iPad (3x DPI). If left empty, project icon
438438

439439
:ref:`String<class_String>` **icons/iphone_120x120**
440440

441-
Home screen application icon file on iPhone (2x DPI). If left empty, project icon is used instead. See `App icons <https://developer.apple.com/design/human-interface-guidelines/foundations/app-icons>`__.
441+
Home screen application icon file on iPhone (2x DPI). If left empty, it will fallback to :ref:`ProjectSettings.application/config/icon<class_ProjectSettings_property_application/config/icon>`. See `App icons <https://developer.apple.com/design/human-interface-guidelines/foundations/app-icons>`__.
442442

443443
.. rst-class:: classref-item-separator
444444

@@ -450,7 +450,7 @@ Home screen application icon file on iPhone (2x DPI). If left empty, project ico
450450

451451
:ref:`String<class_String>` **icons/iphone_180x180**
452452

453-
Home screen application icon file on iPhone (3x DPI). If left empty, project icon is used instead. See `App icons <https://developer.apple.com/design/human-interface-guidelines/foundations/app-icons>`__.
453+
Home screen application icon file on iPhone (3x DPI). If left empty, it will fallback to :ref:`ProjectSettings.application/config/icon<class_ProjectSettings_property_application/config/icon>`. See `App icons <https://developer.apple.com/design/human-interface-guidelines/foundations/app-icons>`__.
454454

455455
.. rst-class:: classref-item-separator
456456

@@ -462,7 +462,7 @@ Home screen application icon file on iPhone (3x DPI). If left empty, project ico
462462

463463
:ref:`String<class_String>` **icons/notification_40x40**
464464

465-
Notification icon file on iPad and iPhone (2x DPI). If left empty, project icon is used instead. See `App icons <https://developer.apple.com/design/human-interface-guidelines/foundations/app-icons>`__.
465+
Notification icon file on iPad and iPhone (2x DPI). If left empty, it will fallback to :ref:`ProjectSettings.application/config/icon<class_ProjectSettings_property_application/config/icon>`. See `App icons <https://developer.apple.com/design/human-interface-guidelines/foundations/app-icons>`__.
466466

467467
.. rst-class:: classref-item-separator
468468

@@ -474,7 +474,7 @@ Notification icon file on iPad and iPhone (2x DPI). If left empty, project icon
474474

475475
:ref:`String<class_String>` **icons/notification_60x60**
476476

477-
Notification icon file on iPhone (3x DPI). If left empty, project icon is used instead. See `App icons <https://developer.apple.com/design/human-interface-guidelines/foundations/app-icons>`__.
477+
Notification icon file on iPhone (3x DPI). If left empty, it will fallback to :ref:`ProjectSettings.application/config/icon<class_ProjectSettings_property_application/config/icon>`. See `App icons <https://developer.apple.com/design/human-interface-guidelines/foundations/app-icons>`__.
478478

479479
.. rst-class:: classref-item-separator
480480

@@ -486,7 +486,7 @@ Notification icon file on iPhone (3x DPI). If left empty, project icon is used i
486486

487487
:ref:`String<class_String>` **icons/settings_58x58**
488488

489-
Application settings icon file on iPad and iPhone (2x DPI). If left empty, project icon is used instead. See `App icons <https://developer.apple.com/design/human-interface-guidelines/foundations/app-icons>`__.
489+
Application settings icon file on iPad and iPhone (2x DPI). If left empty, it will fallback to :ref:`ProjectSettings.application/config/icon<class_ProjectSettings_property_application/config/icon>`. See `App icons <https://developer.apple.com/design/human-interface-guidelines/foundations/app-icons>`__.
490490

491491
.. rst-class:: classref-item-separator
492492

@@ -498,7 +498,7 @@ Application settings icon file on iPad and iPhone (2x DPI). If left empty, proje
498498

499499
:ref:`String<class_String>` **icons/settings_87x87**
500500

501-
Application settings icon file on iPhone (3x DPI). If left empty, project icon is used instead. See `App icons <https://developer.apple.com/design/human-interface-guidelines/foundations/app-icons>`__.
501+
Application settings icon file on iPhone (3x DPI). If left empty, it will fallback to :ref:`ProjectSettings.application/config/icon<class_ProjectSettings_property_application/config/icon>`. See `App icons <https://developer.apple.com/design/human-interface-guidelines/foundations/app-icons>`__.
502502

503503
.. rst-class:: classref-item-separator
504504

@@ -510,7 +510,7 @@ Application settings icon file on iPhone (3x DPI). If left empty, project icon i
510510

511511
:ref:`String<class_String>` **icons/spotlight_40x40**
512512

513-
Spotlight icon file on iPad (1x DPI). If left empty, project icon is used instead. See `App icons <https://developer.apple.com/design/human-interface-guidelines/foundations/app-icons>`__.
513+
Spotlight icon file on iPad (1x DPI). If left empty, it will fallback to :ref:`ProjectSettings.application/config/icon<class_ProjectSettings_property_application/config/icon>`. See `App icons <https://developer.apple.com/design/human-interface-guidelines/foundations/app-icons>`__.
514514

515515
.. rst-class:: classref-item-separator
516516

@@ -522,7 +522,7 @@ Spotlight icon file on iPad (1x DPI). If left empty, project icon is used instea
522522

523523
:ref:`String<class_String>` **icons/spotlight_80x80**
524524

525-
Spotlight icon file on iPad and iPhone (2x DPI). If left empty, project icon is used instead. See `App icons <https://developer.apple.com/design/human-interface-guidelines/foundations/app-icons>`__.
525+
Spotlight icon file on iPad and iPhone (2x DPI). If left empty, it will fallback to :ref:`ProjectSettings.application/config/icon<class_ProjectSettings_property_application/config/icon>`. See `App icons <https://developer.apple.com/design/human-interface-guidelines/foundations/app-icons>`__.
526526

527527
.. rst-class:: classref-item-separator
528528

@@ -534,7 +534,7 @@ Spotlight icon file on iPad and iPhone (2x DPI). If left empty, project icon is
534534

535535
:ref:`String<class_String>` **landscape_launch_screens/ipad_1024x768**
536536

537-
Application launch screen image file, if left empty project splash screen is used instead.
537+
Application launch screen image file. If left empty, it will fallback to :ref:`ProjectSettings.application/boot_splash/image<class_ProjectSettings_property_application/boot_splash/image>`.
538538

539539
.. rst-class:: classref-item-separator
540540

@@ -546,7 +546,7 @@ Application launch screen image file, if left empty project splash screen is use
546546

547547
:ref:`String<class_String>` **landscape_launch_screens/ipad_2048x1536**
548548

549-
Application launch screen image file, if left empty project splash screen is used instead.
549+
Application launch screen image file. If left empty, it will fallback to :ref:`ProjectSettings.application/boot_splash/image<class_ProjectSettings_property_application/boot_splash/image>`.
550550

551551
.. rst-class:: classref-item-separator
552552

@@ -558,7 +558,7 @@ Application launch screen image file, if left empty project splash screen is use
558558

559559
:ref:`String<class_String>` **landscape_launch_screens/iphone_2208x1242**
560560

561-
Application launch screen image file, if left empty project splash screen is used instead.
561+
Application launch screen image file. If left empty, it will fallback to :ref:`ProjectSettings.application/boot_splash/image<class_ProjectSettings_property_application/boot_splash/image>`.
562562

563563
.. rst-class:: classref-item-separator
564564

@@ -570,7 +570,7 @@ Application launch screen image file, if left empty project splash screen is use
570570

571571
:ref:`String<class_String>` **landscape_launch_screens/iphone_2436x1125**
572572

573-
Application launch screen image file, if left empty project splash screen is used instead.
573+
Application launch screen image file. If left empty, it will fallback to :ref:`ProjectSettings.application/boot_splash/image<class_ProjectSettings_property_application/boot_splash/image>`.
574574

575575
.. rst-class:: classref-item-separator
576576

@@ -582,7 +582,7 @@ Application launch screen image file, if left empty project splash screen is use
582582

583583
:ref:`String<class_String>` **portrait_launch_screens/ipad_768x1024**
584584

585-
Application launch screen image file, if left empty project splash screen is used instead.
585+
Application launch screen image file. If left empty, it will fallback to :ref:`ProjectSettings.application/boot_splash/image<class_ProjectSettings_property_application/boot_splash/image>`.
586586

587587
.. rst-class:: classref-item-separator
588588

@@ -594,7 +594,7 @@ Application launch screen image file, if left empty project splash screen is use
594594

595595
:ref:`String<class_String>` **portrait_launch_screens/ipad_1536x2048**
596596

597-
Application launch screen image file, if left empty project splash screen is used instead.
597+
Application launch screen image file. If left empty, it will fallback to :ref:`ProjectSettings.application/boot_splash/image<class_ProjectSettings_property_application/boot_splash/image>`.
598598

599599
.. rst-class:: classref-item-separator
600600

@@ -606,7 +606,7 @@ Application launch screen image file, if left empty project splash screen is use
606606

607607
:ref:`String<class_String>` **portrait_launch_screens/iphone_640x960**
608608

609-
Application launch screen image file, if left empty project splash screen is used instead.
609+
Application launch screen image file. If left empty, it will fallback to :ref:`ProjectSettings.application/boot_splash/image<class_ProjectSettings_property_application/boot_splash/image>`.
610610

611611
.. rst-class:: classref-item-separator
612612

@@ -618,7 +618,7 @@ Application launch screen image file, if left empty project splash screen is use
618618

619619
:ref:`String<class_String>` **portrait_launch_screens/iphone_640x1136**
620620

621-
Application launch screen image file, if left empty project splash screen is used instead.
621+
Application launch screen image file. If left empty, it will fallback to :ref:`ProjectSettings.application/boot_splash/image<class_ProjectSettings_property_application/boot_splash/image>`.
622622

623623
.. rst-class:: classref-item-separator
624624

@@ -630,7 +630,7 @@ Application launch screen image file, if left empty project splash screen is use
630630

631631
:ref:`String<class_String>` **portrait_launch_screens/iphone_750x1334**
632632

633-
Application launch screen image file, if left empty project splash screen is used instead.
633+
Application launch screen image file. If left empty, it will fallback to :ref:`ProjectSettings.application/boot_splash/image<class_ProjectSettings_property_application/boot_splash/image>`.
634634

635635
.. rst-class:: classref-item-separator
636636

@@ -642,7 +642,7 @@ Application launch screen image file, if left empty project splash screen is use
642642

643643
:ref:`String<class_String>` **portrait_launch_screens/iphone_1125x2436**
644644

645-
Application launch screen image file, if left empty project splash screen is used instead.
645+
Application launch screen image file. If left empty, it will fallback to :ref:`ProjectSettings.application/boot_splash/image<class_ProjectSettings_property_application/boot_splash/image>`.
646646

647647
.. rst-class:: classref-item-separator
648648

@@ -654,7 +654,7 @@ Application launch screen image file, if left empty project splash screen is use
654654

655655
:ref:`String<class_String>` **portrait_launch_screens/iphone_1242x2208**
656656

657-
Application launch screen image file, if left empty project splash screen is used instead.
657+
Application launch screen image file. If left empty, it will fallback to :ref:`ProjectSettings.application/boot_splash/image<class_ProjectSettings_property_application/boot_splash/image>`.
658658

659659
.. rst-class:: classref-item-separator
660660

@@ -750,7 +750,7 @@ A custom background color of the storyboard launch screen.
750750

751751
:ref:`String<class_String>` **storyboard/custom_image@2x**
752752

753-
Application launch screen image file (2x DPI), if left empty project splash screen is used instead.
753+
Application launch screen image file (2x DPI). If left empty, it will fallback to :ref:`ProjectSettings.application/boot_splash/image<class_ProjectSettings_property_application/boot_splash/image>`.
754754

755755
.. rst-class:: classref-item-separator
756756

@@ -762,7 +762,7 @@ Application launch screen image file (2x DPI), if left empty project splash scre
762762

763763
:ref:`String<class_String>` **storyboard/custom_image@3x**
764764

765-
Application launch screen image file (3x DPI), if left empty project splash screen is used instead.
765+
Application launch screen image file (3x DPI). If left empty, it will fallback to :ref:`ProjectSettings.application/boot_splash/image<class_ProjectSettings_property_application/boot_splash/image>`.
766766

767767
.. rst-class:: classref-item-separator
768768

classes/class_editorexportplatformmacos.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -272,7 +272,7 @@ Copyright notice for the bundle visible to the user (localized).
272272

273273
:ref:`String<class_String>` **application/icon**
274274

275-
Application icon file. If left empty, project icon is used instead.
275+
Application icon file. If left empty, it will fallback to :ref:`ProjectSettings.application/config/macos_native_icon<class_ProjectSettings_property_application/config/macos_native_icon>`, and then to :ref:`ProjectSettings.application/config/icon<class_ProjectSettings_property_application/config/icon>`.
276276

277277
.. rst-class:: classref-item-separator
278278

0 commit comments

Comments
 (0)