diff options
| author | Rémi Verschelde <remi@verschelde.fr> | 2021-07-23 19:27:31 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-07-23 19:27:31 +0200 |
| commit | eefc67a810975cb99343554c981968ea5ae2fd3e (patch) | |
| tree | f475726e88352b299573211c1564d9cda293c153 /doc | |
| parent | 9b034c930467606a7696d93020838c4f0c5f01e2 (diff) | |
| parent | 618eb27e8b1d3a00fd5a809a0a998d4e0f10e1b7 (diff) | |
Merge pull request #50747 from bruvzg/move_alert_to_os
Move `alert` function from `DisplayServer` to `OS`.
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/classes/DisplayServer.xml | 10 | ||||
| -rw-r--r-- | doc/classes/OS.xml | 11 |
2 files changed, 11 insertions, 10 deletions
diff --git a/doc/classes/DisplayServer.xml b/doc/classes/DisplayServer.xml index 17b51d5cbe..5c9bcc5014 100644 --- a/doc/classes/DisplayServer.xml +++ b/doc/classes/DisplayServer.xml @@ -7,16 +7,6 @@ <tutorials> </tutorials> <methods> - <method name="alert"> - <return type="void"> - </return> - <argument index="0" name="text" type="String"> - </argument> - <argument index="1" name="title" type="String" default=""Alert!""> - </argument> - <description> - </description> - </method> <method name="clipboard_get" qualifiers="const"> <return type="String"> </return> diff --git a/doc/classes/OS.xml b/doc/classes/OS.xml index fed38d2b8b..679a51935d 100644 --- a/doc/classes/OS.xml +++ b/doc/classes/OS.xml @@ -10,6 +10,17 @@ <link title="OS Test Demo">https://godotengine.org/asset-library/asset/677</link> </tutorials> <methods> + <method name="alert"> + <return type="void"> + </return> + <argument index="0" name="text" type="String"> + </argument> + <argument index="1" name="title" type="String" default=""Alert!""> + </argument> + <description> + Displays a modal dialog box using the host OS' facilities. Execution is blocked until the dialog is closed. + </description> + </method> <method name="can_use_threads" qualifiers="const"> <return type="bool"> </return> |