Nixyri/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2024-11-25 05:33:11 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge pull request #3699 from Hinsbart/doc_os_getname

Browse Source 
Doc: add list of possible return values to OS.get_name() description
This commit is contained in:
Rémi Verschelde 2016-02-13 14:32:50 +01:00
commit 391a882218
1 changed files with 48 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
doc/base/classes.xml
View File

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8" ?> <?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"> <class name="@GDScript" category="Core">
<brief_description> <brief_description>
Built-in GDScript functions. Built-in GDScript functions.
@ -621,6 +621,32 @@
<description> <description>
</description> </description>
</method> </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> </methods>
<constants> <constants>
<constant name="PI" value="3.141593"> <constant name="PI" value="3.141593">
@ -12127,6 +12153,16 @@ This approximation makes straight segments between each point, then subdivides t
</signals> </signals>
<constants> <constants>
</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>
<class name="GraphNode" inherits="Container" category="Core"> <class name="GraphNode" inherits="Container" category="Core">
<brief_description> <brief_description>
@ -14081,7 +14117,7 @@ verify_host will check the SSL identity of the host if set to true.
</constant> </constant>
</constants> </constants>
</class> </class>
<class name="InputEventJoyButton" category="Built-In Types"> <class name="InputEventJoystickButton" category="Built-In Types">
<brief_description> <brief_description>
</brief_description> </brief_description>
<description> <description>
@ -14167,7 +14203,7 @@ verify_host will check the SSL identity of the host if set to true.
</constant> </constant>
</constants> </constants>
</class> </class>
<class name="InputEventJoyMotion" category="Built-In Types"> <class name="InputEventJoystickMotion" category="Built-In Types">
<brief_description> <brief_description>
</brief_description> </brief_description>
<description> <description>
@ -19736,7 +19772,7 @@ verify_host will check the SSL identity of the host if set to true.
<return type="String"> <return type="String">
</return> </return>
<description> <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> </description>
</method> </method>
<method name="get_cmdline_args"> <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]). 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> </description>
</method> </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"> <method name="get_captures" qualifiers="const">
<return type="StringArray"> <return type="StringArray">
</return> </return>