From a415996f792c4e969b2f652ee85ec9254ea48863 Mon Sep 17 00:00:00 2001
From: hondres <liu.gam3@gmail.com>
Date: Sat, 13 Feb 2016 03:16:24 +0100
Subject: "Sync classes reference template with current code base"

---
 doc/base/classes.xml | 50 +++++++++++++++++++++++++++++++++++++++++++++++---
 1 file changed, 47 insertions(+), 3 deletions(-)

(limited to 'doc/base')

diff --git a/doc/base/classes.xml b/doc/base/classes.xml
index b1871632d0..e3962834d1 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>
@@ -14080,7 +14116,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>
@@ -14166,7 +14202,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>
@@ -27503,6 +27539,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>
-- 
cgit v1.2.3


From 080b5e4f63ead92c2fceea7b2d3338fe32dfd0cb Mon Sep 17 00:00:00 2001
From: hondres <liu.gam3@gmail.com>
Date: Sat, 13 Feb 2016 15:24:01 +0100
Subject: doc: add list of possible return values to OS.get_name() description

---
 doc/base/classes.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'doc/base')

diff --git a/doc/base/classes.xml b/doc/base/classes.xml
index e3962834d1..431e038062 100644
--- a/doc/base/classes.xml
+++ b/doc/base/classes.xml
@@ -19771,7 +19771,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">
-- 
cgit v1.2.3