diff --git a/doc/base/classes.xml b/doc/base/classes.xml index e5bdcfbc6a3..342941970fe 100644 --- a/doc/base/classes.xml +++ b/doc/base/classes.xml @@ -257,13 +257,14 @@ - + - + - + + Linear interpolates between two values by a normalized value. @@ -276,6 +277,7 @@ + Decreases time by a specified amount. @@ -421,6 +423,7 @@ + Returns a reference to the specified function @@ -475,6 +478,7 @@ + Print one or more arguments to the console with a tab between each argument. @@ -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. + + + + + + + Converts the value of a variable to a String. + + + + + + + + + Converts the value of a String to a variable. + + @@ -544,6 +566,7 @@ + Hashes the variable passed and returns an integer. diff --git a/modules/gdscript/gd_functions.cpp b/modules/gdscript/gd_functions.cpp index b616d8f228d..f37b2f645af 100644 --- a/modules/gdscript/gd_functions.cpp +++ b/modules/gdscript/gd_functions.cpp @@ -1101,7 +1101,7 @@ MethodInfo GDFunctions::get_info(Function p_func) { return mi; } break; case MATH_LERP: { - MethodInfo mi("lerp",PropertyInfo(Variant::REAL,"a"),PropertyInfo(Variant::REAL,"b"), PropertyInfo(Variant::REAL,"c")); + MethodInfo mi("lerp",PropertyInfo(Variant::REAL,"from"),PropertyInfo(Variant::REAL,"to"), PropertyInfo(Variant::REAL,"weight")); mi.return_val.type=Variant::REAL; return mi; } break;