summaryrefslogtreecommitdiff
path: root/doc/classes/@GlobalScope.xml
diff options
context:
space:
mode:
Diffstat (limited to 'doc/classes/@GlobalScope.xml')
-rw-r--r--doc/classes/@GlobalScope.xml15
1 files changed, 10 insertions, 5 deletions
diff --git a/doc/classes/@GlobalScope.xml b/doc/classes/@GlobalScope.xml
index b25de3cf99..e346a312cb 100644
--- a/doc/classes/@GlobalScope.xml
+++ b/doc/classes/@GlobalScope.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8" ?>
-<class name="@GlobalScope" category="Core" version="3.2">
+<class name="@GlobalScope" version="3.2">
<brief_description>
Global scope constants and variables.
</brief_description>
@@ -42,8 +42,13 @@
<member name="JSON" type="JSON" setter="" getter="">
The [JSON] singleton.
</member>
+ <member name="JavaClassWrapper" type="JavaClassWrapper" setter="" getter="">
+ The [JavaClassWrapper] singleton.
+ [b]Note:[/b] Only implemented on Android.
+ </member>
<member name="JavaScript" type="JavaScript" setter="" getter="">
The [JavaScript] singleton.
+ [b]Note:[/b] Only implemented on HTML5.
</member>
<member name="Marshalls" type="Reference" setter="" getter="">
The [Marshalls] singleton.
@@ -879,7 +884,7 @@
Ctrl key mask.
</constant>
<constant name="KEY_MASK_CMD" value="268435456" enum="KeyModifierMask">
- Cmd key mask.
+ Command key mask. On macOS, this is equivalent to [constant KEY_MASK_META]. On other platforms, this is equivalent to [constant KEY_MASK_CTRL]. This mask should be preferred to [constant KEY_MASK_META] or [constant KEY_MASK_CTRL] for system shortcuts as it handles all platforms correctly.
</constant>
<constant name="KEY_MASK_KPAD" value="536870912" enum="KeyModifierMask">
Keypad key mask.
@@ -1162,10 +1167,10 @@
Since [constant OK] has value 0, and all other failure codes are positive integers, it can also be used in boolean checks, e.g.:
[codeblock]
var err = method_that_returns_error()
- if (err != OK):
+ if err != OK:
print("Failure!)
# Or, equivalent:
- if (err):
+ if err:
print("Still failing!)
[/codeblock]
</constant>
@@ -1449,7 +1454,7 @@
Default method flags.
</constant>
<constant name="TYPE_NIL" value="0" enum="Variant.Type">
- Variable is of type [Nil] (only applied for [code]null[/code]).
+ Variable is [code]null[/code].
</constant>
<constant name="TYPE_BOOL" value="1" enum="Variant.Type">
Variable is of type [bool].