diff options
| author | Rémi Verschelde <remi@verschelde.fr> | 2016-02-13 14:32:50 +0100 |
|---|---|---|
| committer | Rémi Verschelde <remi@verschelde.fr> | 2016-02-13 14:32:50 +0100 |
| commit | 391a8822187b9a62f4fb55bf7d84490bbb610c6b (patch) | |
| tree | 47f764b56150820edc30017d14b18a0a938ae8c0 /doc/base | |
| parent | 7371df3209f08a6d9f43d9ef2a484a68ff718850 (diff) | |
| parent | 080b5e4f63ead92c2fceea7b2d3338fe32dfd0cb (diff) | |
Merge pull request #3699 from Hinsbart/doc_os_getname
Doc: add list of possible return values to OS.get_name() description
Diffstat (limited to 'doc/base')
| -rw-r--r-- | doc/base/classes.xml | 52 |
1 files changed, 48 insertions, 4 deletions
diff --git a/doc/base/classes.xml b/doc/base/classes.xml index 0c7bbba85e..fd64349df9 100644 --- a/doc/base/classes.xml +++ b/doc/base/classes.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8" ?> -<doc version="2.0.beta.custom_build" name="Engine Types"> +<doc version="2.0.rc1.custom_build" name="Engine Types"> <class name="@GDScript" category="Core"> <brief_description> Built-in GDScript functions. @@ -621,6 +621,32 @@ <description> </description> </method> + <method name="preload"> + <return type="Resource"> + </return> + <argument index="0" name="path" type="String"> + </argument> + <description> + </description> + </method> + <method name="yield"> + <return type="Nil"> + </return> + <argument index="0" name="object" type="Object"> + </argument> + <argument index="1" name="signal" type="String"> + </argument> + <description> + </description> + </method> + <method name="assert"> + <return type="Nil"> + </return> + <argument index="0" name="condition" type="bool"> + </argument> + <description> + </description> + </method> </methods> <constants> <constant name="PI" value="3.141593"> @@ -12127,6 +12153,16 @@ This approximation makes straight segments between each point, then subdivides t </signals> <constants> </constants> + <theme_items> + <theme_item name="more" type="Texture"> + </theme_item> + <theme_item name="reset" type="Texture"> + </theme_item> + <theme_item name="minus" type="Texture"> + </theme_item> + <theme_item name="bg" type="StyleBox"> + </theme_item> + </theme_items> </class> <class name="GraphNode" inherits="Container" category="Core"> <brief_description> @@ -14081,7 +14117,7 @@ verify_host will check the SSL identity of the host if set to true. </constant> </constants> </class> -<class name="InputEventJoyButton" category="Built-In Types"> +<class name="InputEventJoystickButton" category="Built-In Types"> <brief_description> </brief_description> <description> @@ -14167,7 +14203,7 @@ verify_host will check the SSL identity of the host if set to true. </constant> </constants> </class> -<class name="InputEventJoyMotion" category="Built-In Types"> +<class name="InputEventJoystickMotion" category="Built-In Types"> <brief_description> </brief_description> <description> @@ -19736,7 +19772,7 @@ verify_host will check the SSL identity of the host if set to true. <return type="String"> </return> <description> - Return the name of the host OS. + Return the name of the host OS. Possible values are: "Android", "BlackBerry 10", "Flash", "Haiku", "iOS", "HTML5", "OSX", "Server", "Windows", "WinRT", "X11" </description> </method> <method name="get_cmdline_args"> @@ -27504,6 +27540,14 @@ This method controls whether the position between two cached points is interpola Returns a captured group. A captured group is the part of a string that matches a part of the pattern delimited by parentheses (unless they are non-capturing parentheses [i](?:)[/i]). </description> </method> + <method name="get_capture_start" qualifiers="const"> + <return type="int"> + </return> + <argument index="0" name="capture" type="int"> + </argument> + <description> + </description> + </method> <method name="get_captures" qualifiers="const"> <return type="StringArray"> </return> |