diff options
| -rw-r--r-- | doc/classes/Control.xml | 2 | ||||
| -rw-r--r-- | doc/classes/JSONRPC.xml | 95 | ||||
| -rw-r--r-- | doc/classes/ProjectSettings.xml | 2 | ||||
| -rw-r--r-- | doc/classes/SpriteBase3D.xml | 2 | ||||
| -rw-r--r-- | doc/classes/Vector2.xml | 4 | ||||
| -rw-r--r-- | doc/classes/Vector3.xml | 6 | ||||
| -rw-r--r-- | modules/gdnative/doc_classes/NativeScript.xml | 2 | ||||
| -rw-r--r-- | modules/gdnative/doc_classes/PluginScript.xml | 2 | ||||
| -rw-r--r-- | modules/gdscript/doc_classes/@GDScript.xml | 2 | ||||
| -rw-r--r-- | modules/gdscript/doc_classes/GDScript.xml | 2 |
10 files changed, 109 insertions, 10 deletions
diff --git a/doc/classes/Control.xml b/doc/classes/Control.xml index f263c12821..1eeef92ccc 100644 --- a/doc/classes/Control.xml +++ b/doc/classes/Control.xml @@ -260,7 +260,7 @@ </description> </method> <method name="get_drag_data" qualifiers="virtual"> - <return type="Object"> + <return type="Variant"> </return> <argument index="0" name="position" type="Vector2"> </argument> diff --git a/doc/classes/JSONRPC.xml b/doc/classes/JSONRPC.xml new file mode 100644 index 0000000000..921161afb4 --- /dev/null +++ b/doc/classes/JSONRPC.xml @@ -0,0 +1,95 @@ +<?xml version="1.0" encoding="UTF-8" ?> +<class name="JSONRPC" inherits="Object" category="Core" version="3.2"> + <brief_description> + </brief_description> + <description> + </description> + <tutorials> + </tutorials> + <methods> + <method name="make_notification"> + <return type="Dictionary"> + </return> + <argument index="0" name="method" type="String"> + </argument> + <argument index="1" name="params" type="Variant"> + </argument> + <description> + </description> + </method> + <method name="make_request"> + <return type="Dictionary"> + </return> + <argument index="0" name="method" type="String"> + </argument> + <argument index="1" name="params" type="Variant"> + </argument> + <argument index="2" name="id" type="Variant"> + </argument> + <description> + </description> + </method> + <method name="make_response"> + <return type="Dictionary"> + </return> + <argument index="0" name="result" type="Variant"> + </argument> + <argument index="1" name="id" type="Variant"> + </argument> + <description> + </description> + </method> + <method name="make_response_error" qualifiers="const"> + <return type="Dictionary"> + </return> + <argument index="0" name="code" type="int"> + </argument> + <argument index="1" name="message" type="String"> + </argument> + <argument index="2" name="id" type="Variant" default="null"> + </argument> + <description> + </description> + </method> + <method name="process_action"> + <return type="Variant"> + </return> + <argument index="0" name="action" type="Variant"> + </argument> + <argument index="1" name="recurse" type="bool" default="false"> + </argument> + <description> + </description> + </method> + <method name="process_string"> + <return type="String"> + </return> + <argument index="0" name="action" type="String"> + </argument> + <description> + </description> + </method> + <method name="set_scope"> + <return type="void"> + </return> + <argument index="0" name="scope" type="String"> + </argument> + <argument index="1" name="target" type="Object"> + </argument> + <description> + </description> + </method> + </methods> + <constants> + <constant name="ParseError" value="-32700" enum="ErrorCode"> + </constant> + <constant name="InvalidRequest" value="-32600" enum="ErrorCode"> + </constant> + <constant name="MethodNotFound" value="-32601" enum="ErrorCode"> + </constant> + <constant name="InvalidParams" value="-32602" enum="ErrorCode"> + </constant> + <constant name="InternalError" value="-32603" enum="ErrorCode"> + </constant> + </constants> +</class> diff --git a/doc/classes/ProjectSettings.xml b/doc/classes/ProjectSettings.xml index b3175bb2fd..86b874d8ee 100644 --- a/doc/classes/ProjectSettings.xml +++ b/doc/classes/ProjectSettings.xml @@ -415,6 +415,8 @@ <member name="editor/active" type="bool" setter="" getter="" default="false"> Internal editor setting, don't touch. </member> + <member name="editor/script_templates_search_path" type="String" setter="" getter="" default=""res://script_templates""> + </member> <member name="editor/search_in_file_extensions" type="PoolStringArray" setter="" getter="" default="PoolStringArray( "gd", "shader" )"> </member> <member name="gui/common/default_scroll_deadzone" type="int" setter="" getter="" default="0"> diff --git a/doc/classes/SpriteBase3D.xml b/doc/classes/SpriteBase3D.xml index 5529da909d..15d5d7beb4 100644 --- a/doc/classes/SpriteBase3D.xml +++ b/doc/classes/SpriteBase3D.xml @@ -46,6 +46,8 @@ <member name="axis" type="int" setter="set_axis" getter="get_axis" enum="Vector3.Axis" default="2"> The direction in which the front of the texture faces. </member> + <member name="billboard" type="int" setter="set_billboard_mode" getter="get_billboard_mode" enum="SpatialMaterial.BillboardMode" default="0"> + </member> <member name="centered" type="bool" setter="set_centered" getter="is_centered" default="true"> If [code]true[/code], texture will be centered. </member> diff --git a/doc/classes/Vector2.xml b/doc/classes/Vector2.xml index 66c4849358..987ed9867b 100644 --- a/doc/classes/Vector2.xml +++ b/doc/classes/Vector2.xml @@ -215,7 +215,7 @@ <method name="posmodv"> <return type="Vector2"> </return> - <argument index="0" name="mod" type="float"> + <argument index="0" name="modv" type="Vector2"> </argument> <description> Returns a vector composed of the [code]fposmod[/code] of this vector's components and [code]modv[/code]'s components. @@ -310,7 +310,7 @@ </members> <constants> <constant name="AXIS_X" value="0"> - Enumerated value for the X axis. Returned by [method max_axis] and [method min_axis]. + Enumerated value for the X axis. </constant> <constant name="AXIS_Y" value="1"> Enumerated value for the Y axis. diff --git a/doc/classes/Vector3.xml b/doc/classes/Vector3.xml index 4631eb7300..05ce6c43ae 100644 --- a/doc/classes/Vector3.xml +++ b/doc/classes/Vector3.xml @@ -214,7 +214,7 @@ <method name="posmodv"> <return type="Vector3"> </return> - <argument index="0" name="mod" type="float"> + <argument index="0" name="modv" type="Vector3"> </argument> <description> Returns a vector composed of the [code]fposmod[/code] of this vector's components and [code]modv[/code]'s components. @@ -317,10 +317,10 @@ Enumerated value for the X axis. Returned by [method max_axis] and [method min_axis]. </constant> <constant name="AXIS_Y" value="1"> - Enumerated value for the Y axis. + Enumerated value for the Y axis. Returned by [method max_axis] and [method min_axis]. </constant> <constant name="AXIS_Z" value="2"> - Enumerated value for the Z axis. + Enumerated value for the Z axis. Returned by [method max_axis] and [method min_axis]. </constant> <constant name="ZERO" value="Vector3( 0, 0, 0 )"> Zero vector. diff --git a/modules/gdnative/doc_classes/NativeScript.xml b/modules/gdnative/doc_classes/NativeScript.xml index e34e209374..dc735546e3 100644 --- a/modules/gdnative/doc_classes/NativeScript.xml +++ b/modules/gdnative/doc_classes/NativeScript.xml @@ -42,7 +42,7 @@ </description> </method> <method name="new" qualifiers="vararg"> - <return type="Object"> + <return type="Variant"> </return> <description> Constructs a new object of the base type with a script of this type already attached. diff --git a/modules/gdnative/doc_classes/PluginScript.xml b/modules/gdnative/doc_classes/PluginScript.xml index b07122bbdf..33b5f02bd4 100644 --- a/modules/gdnative/doc_classes/PluginScript.xml +++ b/modules/gdnative/doc_classes/PluginScript.xml @@ -8,7 +8,7 @@ </tutorials> <methods> <method name="new" qualifiers="vararg"> - <return type="Object"> + <return type="Variant"> </return> <description> Returns a new instance of the script. diff --git a/modules/gdscript/doc_classes/@GDScript.xml b/modules/gdscript/doc_classes/@GDScript.xml index 605a999d6a..4efa90fd86 100644 --- a/modules/gdscript/doc_classes/@GDScript.xml +++ b/modules/gdscript/doc_classes/@GDScript.xml @@ -1119,7 +1119,7 @@ [codeblock] stepify(100, 32) # Returns 96 stepify(3.14159, 0.01) # Returns 3.14 - [/codeblock] + [/codeblock] </description> </method> <method name="str" qualifiers="vararg"> diff --git a/modules/gdscript/doc_classes/GDScript.xml b/modules/gdscript/doc_classes/GDScript.xml index d606a41fab..6f43361914 100644 --- a/modules/gdscript/doc_classes/GDScript.xml +++ b/modules/gdscript/doc_classes/GDScript.xml @@ -19,7 +19,7 @@ </description> </method> <method name="new" qualifiers="vararg"> - <return type="Object"> + <return type="Variant"> </return> <description> Returns a new instance of the script. |