Skip to content

Commit 34801c3

Browse files
author
Redot Organization
committed
classref: Sync with current master branch (74e2158)
1 parent 65d7e30 commit 34801c3

File tree

1,020 files changed

+39972
-14462
lines changed

Some content is hidden

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

1,020 files changed

+39972
-14462
lines changed

classes/class_@gdscript.rst

Lines changed: 146 additions & 64 deletions
Large diffs are not rendered by default.

classes/class_@globalscope.rst

Lines changed: 298 additions & 137 deletions
Large diffs are not rendered by default.

classes/class_aabb.rst

Lines changed: 38 additions & 37 deletions
Large diffs are not rendered by default.

classes/class_acceptdialog.rst

Lines changed: 18 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ A base dialog used for user notification.
2121
Description
2222
-----------
2323

24-
The default use of **AcceptDialog** is to allow it to only be accepted or closed, with the same result. However, the :ref:`confirmed<class_AcceptDialog_signal_confirmed>` and :ref:`canceled<class_AcceptDialog_signal_canceled>` signals allow to make the two actions different, and the :ref:`add_button<class_AcceptDialog_method_add_button>` method allows to add custom buttons and actions.
24+
The default use of **AcceptDialog** is to allow it to only be accepted or closed, with the same result. However, the :ref:`confirmed<class_AcceptDialog_signal_confirmed>` and :ref:`canceled<class_AcceptDialog_signal_canceled>` signals allow to make the two actions different, and the :ref:`add_button()<class_AcceptDialog_method_add_button>` method allows to add custom buttons and actions.
2525

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

@@ -44,7 +44,11 @@ Properties
4444
+-----------------------------+-----------------------------------------------------------------------------------+------------------------------------------------------------------------------+
4545
| :ref:`bool<class_bool>` | keep_title_visible | ``true`` (overrides :ref:`Window<class_Window_property_keep_title_visible>`) |
4646
+-----------------------------+-----------------------------------------------------------------------------------+------------------------------------------------------------------------------+
47-
| :ref:`String<class_String>` | :ref:`ok_button_text<class_AcceptDialog_property_ok_button_text>` | ``"OK"`` |
47+
| :ref:`bool<class_bool>` | maximize_disabled | ``true`` (overrides :ref:`Window<class_Window_property_maximize_disabled>`) |
48+
+-----------------------------+-----------------------------------------------------------------------------------+------------------------------------------------------------------------------+
49+
| :ref:`bool<class_bool>` | minimize_disabled | ``true`` (overrides :ref:`Window<class_Window_property_minimize_disabled>`) |
50+
+-----------------------------+-----------------------------------------------------------------------------------+------------------------------------------------------------------------------+
51+
| :ref:`String<class_String>` | :ref:`ok_button_text<class_AcceptDialog_property_ok_button_text>` | ``""`` |
4852
+-----------------------------+-----------------------------------------------------------------------------------+------------------------------------------------------------------------------+
4953
| :ref:`String<class_String>` | title | ``"Alert!"`` (overrides :ref:`Window<class_Window_property_title>`) |
5054
+-----------------------------+-----------------------------------------------------------------------------------+------------------------------------------------------------------------------+
@@ -110,7 +114,7 @@ Signals
110114

111115
**canceled**\ (\ ) :ref:`🔗<class_AcceptDialog_signal_canceled>`
112116

113-
Emitted when the dialog is closed or the button created with :ref:`add_cancel_button<class_AcceptDialog_method_add_cancel_button>` is pressed.
117+
Emitted when the dialog is closed or the button created with :ref:`add_cancel_button()<class_AcceptDialog_method_add_cancel_button>` is pressed.
114118

115119
.. rst-class:: classref-item-separator
116120

@@ -134,7 +138,7 @@ Emitted when the dialog is accepted, i.e. the OK button is pressed.
134138

135139
**custom_action**\ (\ action\: :ref:`StringName<class_StringName>`\ ) :ref:`🔗<class_AcceptDialog_signal_custom_action>`
136140

137-
Emitted when a custom button is pressed. See :ref:`add_button<class_AcceptDialog_method_add_button>`.
141+
Emitted when a custom button with an action is pressed. See :ref:`add_button()<class_AcceptDialog_method_add_button>`.
138142

139143
.. rst-class:: classref-section-separator
140144

@@ -173,7 +177,7 @@ Sets autowrapping for the text in the dialog.
173177
- |void| **set_close_on_escape**\ (\ value\: :ref:`bool<class_bool>`\ )
174178
- :ref:`bool<class_bool>` **get_close_on_escape**\ (\ )
175179

176-
If ``true``, the dialog will be hidden when the escape key (:ref:`@GlobalScope.KEY_ESCAPE<class_@GlobalScope_constant_KEY_ESCAPE>`) is pressed.
180+
If ``true``, the dialog will be hidden when the ``ui_cancel`` action is pressed (by default, this action is bound to :ref:`@GlobalScope.KEY_ESCAPE<class_@GlobalScope_constant_KEY_ESCAPE>`).
177181

178182
.. rst-class:: classref-item-separator
179183

@@ -219,14 +223,14 @@ The text displayed by the dialog.
219223

220224
.. rst-class:: classref-property
221225

222-
:ref:`String<class_String>` **ok_button_text** = ``"OK"`` :ref:`🔗<class_AcceptDialog_property_ok_button_text>`
226+
:ref:`String<class_String>` **ok_button_text** = ``""`` :ref:`🔗<class_AcceptDialog_property_ok_button_text>`
223227

224228
.. rst-class:: classref-property-setget
225229

226230
- |void| **set_ok_button_text**\ (\ value\: :ref:`String<class_String>`\ )
227231
- :ref:`String<class_String>` **get_ok_button_text**\ (\ )
228232

229-
The text displayed by the OK button (see :ref:`get_ok_button<class_AcceptDialog_method_get_ok_button>`).
233+
The text displayed by the OK button (see :ref:`get_ok_button()<class_AcceptDialog_method_get_ok_button>`). If empty, a default text will be used.
230234

231235
.. rst-class:: classref-section-separator
232236

@@ -243,11 +247,13 @@ Method Descriptions
243247

244248
:ref:`Button<class_Button>` **add_button**\ (\ text\: :ref:`String<class_String>`, right\: :ref:`bool<class_bool>` = false, action\: :ref:`String<class_String>` = ""\ ) :ref:`🔗<class_AcceptDialog_method_add_button>`
245249

246-
Adds a button with label ``text`` and a custom ``action`` to the dialog and returns the created button. ``action`` will be passed to the :ref:`custom_action<class_AcceptDialog_signal_custom_action>` signal when pressed.
250+
Adds a button with label ``text`` and a custom ``action`` to the dialog and returns the created button.
251+
252+
If ``action`` is not empty, pressing the button will emit the :ref:`custom_action<class_AcceptDialog_signal_custom_action>` signal with the specified action string.
247253

248254
If ``true``, ``right`` will place the button to the right of any sibling buttons.
249255

250-
You can use :ref:`remove_button<class_AcceptDialog_method_remove_button>` method to remove a button created with this method from the dialog.
256+
You can use :ref:`remove_button()<class_AcceptDialog_method_remove_button>` method to remove a button created with this method from the dialog.
251257

252258
.. rst-class:: classref-item-separator
253259

@@ -261,7 +267,7 @@ You can use :ref:`remove_button<class_AcceptDialog_method_remove_button>` method
261267

262268
Adds a button with label ``name`` and a cancel action to the dialog and returns the created button.
263269

264-
You can use :ref:`remove_button<class_AcceptDialog_method_remove_button>` method to remove a button created with this method from the dialog.
270+
You can use :ref:`remove_button()<class_AcceptDialog_method_remove_button>` method to remove a button created with this method from the dialog.
265271

266272
.. rst-class:: classref-item-separator
267273

@@ -313,7 +319,7 @@ Registers a :ref:`LineEdit<class_LineEdit>` in the dialog. When the enter key is
313319

314320
|void| **remove_button**\ (\ button\: :ref:`Button<class_Button>`\ ) :ref:`🔗<class_AcceptDialog_method_remove_button>`
315321

316-
Removes the ``button`` from the dialog. Does NOT free the ``button``. The ``button`` must be a :ref:`Button<class_Button>` added with :ref:`add_button<class_AcceptDialog_method_add_button>` or :ref:`add_cancel_button<class_AcceptDialog_method_add_cancel_button>` method. After removal, pressing the ``button`` will no longer emit this dialog's :ref:`custom_action<class_AcceptDialog_signal_custom_action>` or :ref:`canceled<class_AcceptDialog_signal_canceled>` signals.
322+
Removes the ``button`` from the dialog. Does NOT free the ``button``. The ``button`` must be a :ref:`Button<class_Button>` added with :ref:`add_button()<class_AcceptDialog_method_add_button>` or :ref:`add_cancel_button()<class_AcceptDialog_method_add_cancel_button>` method. After removal, pressing the ``button`` will no longer emit this dialog's :ref:`custom_action<class_AcceptDialog_signal_custom_action>` or :ref:`canceled<class_AcceptDialog_signal_canceled>` signals.
317323

318324
.. rst-class:: classref-section-separator
319325

@@ -369,6 +375,7 @@ The size of the vertical space between the dialog's content and the button row.
369375
The panel that fills the background of the window.
370376

371377
.. |virtual| replace:: :abbr:`virtual (This method should typically be overridden by the user to have any effect.)`
378+
.. |required| replace:: :abbr:`required (This method is required to be overridden when extending its base class.)`
372379
.. |const| replace:: :abbr:`const (This method has no side effects. It doesn't modify any of the instance's member variables.)`
373380
.. |vararg| replace:: :abbr:`vararg (This method accepts any number of arguments after the ones described here.)`
374381
.. |constructor| replace:: :abbr:`constructor (This method is used to construct a type.)`

classes/class_aescontext.rst

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,9 @@ This class holds the context information required for encryption and decryption
2727
.. code-tab:: gdscript
2828

2929
extends Node
30-
30+
3131
var aes = AESContext.new()
32-
32+
3333
func _ready():
3434
var key = "My secret key!!!" # Key must be either 16 or 32 bytes.
3535
var data = "My secret text!!" # Data size must be multiple of 16 bytes, apply padding if needed.
@@ -43,7 +43,7 @@ This class holds the context information required for encryption and decryption
4343
aes.finish()
4444
# Check ECB
4545
assert(decrypted == data.to_utf8_buffer())
46-
46+
4747
var iv = "My secret iv!!!!" # IV must be of exactly 16 bytes.
4848
# Encrypt CBC
4949
aes.start(AESContext.MODE_CBC_ENCRYPT, key.to_utf8_buffer(), iv.to_utf8_buffer())
@@ -60,11 +60,11 @@ This class holds the context information required for encryption and decryption
6060

6161
using Godot;
6262
using System.Diagnostics;
63-
63+
6464
public partial class MyNode : Node
6565
{
6666
private AesContext _aes = new AesContext();
67-
67+
6868
public override void _Ready()
6969
{
7070
string key = "My secret key!!!"; // Key must be either 16 or 32 bytes.
@@ -79,7 +79,7 @@ This class holds the context information required for encryption and decryption
7979
_aes.Finish();
8080
// Check ECB
8181
Debug.Assert(decrypted == data.ToUtf8Buffer());
82-
82+
8383
string iv = "My secret iv!!!!"; // IV must be of exactly 16 bytes.
8484
// Encrypt CBC
8585
_aes.Start(AesContext.Mode.EcbEncrypt, key.ToUtf8Buffer(), iv.ToUtf8Buffer());
@@ -184,7 +184,7 @@ Method Descriptions
184184

185185
|void| **finish**\ (\ ) :ref:`🔗<class_AESContext_method_finish>`
186186

187-
Close this AES context so it can be started again. See :ref:`start<class_AESContext_method_start>`.
187+
Close this AES context so it can be started again. See :ref:`start()<class_AESContext_method_start>`.
188188

189189
.. rst-class:: classref-item-separator
190190

@@ -196,7 +196,7 @@ Close this AES context so it can be started again. See :ref:`start<class_AESCont
196196

197197
:ref:`PackedByteArray<class_PackedByteArray>` **get_iv_state**\ (\ ) :ref:`🔗<class_AESContext_method_get_iv_state>`
198198

199-
Get the current IV state for this context (IV gets updated when calling :ref:`update<class_AESContext_method_update>`). You normally don't need this function.
199+
Get the current IV state for this context (IV gets updated when calling :ref:`update()<class_AESContext_method_update>`). You normally don't need this function.
200200

201201
\ **Note:** This function only makes sense when the context is started with :ref:`MODE_CBC_ENCRYPT<class_AESContext_constant_MODE_CBC_ENCRYPT>` or :ref:`MODE_CBC_DECRYPT<class_AESContext_constant_MODE_CBC_DECRYPT>`.
202202

@@ -222,11 +222,12 @@ Start the AES context in the given ``mode``. A ``key`` of either 16 or 32 bytes
222222

223223
:ref:`PackedByteArray<class_PackedByteArray>` **update**\ (\ src\: :ref:`PackedByteArray<class_PackedByteArray>`\ ) :ref:`🔗<class_AESContext_method_update>`
224224

225-
Run the desired operation for this AES context. Will return a :ref:`PackedByteArray<class_PackedByteArray>` containing the result of encrypting (or decrypting) the given ``src``. See :ref:`start<class_AESContext_method_start>` for mode of operation.
225+
Run the desired operation for this AES context. Will return a :ref:`PackedByteArray<class_PackedByteArray>` containing the result of encrypting (or decrypting) the given ``src``. See :ref:`start()<class_AESContext_method_start>` for mode of operation.
226226

227227
\ **Note:** The size of ``src`` must be a multiple of 16. Apply some padding if needed.
228228

229229
.. |virtual| replace:: :abbr:`virtual (This method should typically be overridden by the user to have any effect.)`
230+
.. |required| replace:: :abbr:`required (This method is required to be overridden when extending its base class.)`
230231
.. |const| replace:: :abbr:`const (This method has no side effects. It doesn't modify any of the instance's member variables.)`
231232
.. |vararg| replace:: :abbr:`vararg (This method accepts any number of arguments after the ones described here.)`
232233
.. |constructor| replace:: :abbr:`constructor (This method is used to construct a type.)`

0 commit comments

Comments
 (0)