diff options
| author | Carl Olsson | 2015-03-23 08:19:20 +1000 |
|---|---|---|
| committer | Carl Olsson | 2015-03-23 08:19:20 +1000 |
| commit | fb2cdfe7edcc2ccafea7604afd104f582e5b9c17 (patch) | |
| tree | d9555d9519648f95d7ed3663fbca50978bb12a1f /doc/base/classes.xml | |
| parent | 41686d5fdd0d72f167894f976d19b177789f1f63 (diff) | |
| parent | e9f94ce8d2cc6805e74fffdf733e6dc5b5c530f5 (diff) | |
| download | godot-fb2cdfe7edcc2ccafea7604afd104f582e5b9c17.tar.gz godot-fb2cdfe7edcc2ccafea7604afd104f582e5b9c17.tar.zst godot-fb2cdfe7edcc2ccafea7604afd104f582e5b9c17.zip | |
Merge branch 'master' of https://github.com/not-surt/godot into snapping2
Conflicts:
tools/editor/plugins/canvas_item_editor_plugin.cpp
tools/editor/plugins/canvas_item_editor_plugin.h
Diffstat (limited to '')
| -rw-r--r-- | doc/base/classes.xml | 32 |
1 files changed, 28 insertions, 4 deletions
diff --git a/doc/base/classes.xml b/doc/base/classes.xml index 35de0106b..342941970 100644 --- a/doc/base/classes.xml +++ b/doc/base/classes.xml @@ -257,13 +257,14 @@ <method name="lerp" > <return type="float"> </return> - <argument index="0" name="a" type="float"> + <argument index="0" name="from" type="float"> </argument> - <argument index="1" name="b" type="float"> + <argument index="1" name="to" type="float"> </argument> - <argument index="2" name="c" type="float"> + <argument index="2" name="weight" type="float"> </argument> <description> + Linear interpolates between two values by a normalized value. </description> </method> <method name="dectime" > @@ -276,6 +277,7 @@ <argument index="2" name="step" type="float"> </argument> <description> + Decreases time by a specified amount. </description> </method> <method name="randomize" > @@ -421,6 +423,7 @@ <argument index="1" name="funcname" type="String"> </argument> <description> + Returns a reference to the specified function </description> </method> <method name="convert" > @@ -475,6 +478,7 @@ <argument index="1" name="..." type="var"> </argument> <description> + Print one or more arguments to the console with a tab between each argument. </description> </method> <method name="printerr" > @@ -499,6 +503,24 @@ Print one or more arguments to strings in the best way possible to console. No newline is added at the end. </description> </method> + <method name="var2str" > + <return type="String"> + </return> + <argument index="0" name="var" type="var"> + </argument> + <description> + Converts the value of a variable to a String. + </description> + </method> + <method name="str2var:var" > + <return type="String"> + </return> + <argument index="0" name="str" type="String"> + </argument> + <description> + Converts the value of a String to a variable. + </description> + </method> <method name="range" > <return type="Array"> </return> @@ -544,6 +566,7 @@ <argument index="0" name="var:var" type="var"> </argument> <description> + Hashes the variable passed and returns an integer. </description> </method> <method name="print_stack" > @@ -18902,7 +18925,8 @@ collider_id: collider id of the object agaisnt which the ray was stopped[br] collider: collider object agaisnt which the ray was stopped[br] rid: [RID] of the object agaisnt which the ray was stopped[br] - If the ray did not intersect anything, then null is returned instead of a [Dictionary]. + If the ray did not intersect anything, then an empty + dictionary (dir.empty()==true) is returned instead. </description> </method> <method name="intersect_shape" > |