diff --git a/core/variant_call.cpp b/core/variant_call.cpp
index 4158c2a60e44..e6f36ecbf1c7 100644
--- a/core/variant_call.cpp
+++ b/core/variant_call.cpp
@@ -763,6 +763,7 @@ struct _VariantCall {
VCALL_PTR1R(Basis, xform_inv);
VCALL_PTR0R(Basis, get_orthogonal_index);
VCALL_PTR0R(Basis, orthonormalized);
+ VCALL_PTR2R(Basis, slerp);
VCALL_PTR0R(Transform, inverse);
VCALL_PTR0R(Transform, affine_inverse);
@@ -1803,6 +1804,7 @@ void register_variant_methods() {
ADDFUNC1R(BASIS, VECTOR3, Basis, xform, VECTOR3, "v", varray());
ADDFUNC1R(BASIS, VECTOR3, Basis, xform_inv, VECTOR3, "v", varray());
ADDFUNC0R(BASIS, INT, Basis, get_orthogonal_index, varray());
+ ADDFUNC2R(BASIS, BASIS, Basis, slerp, BASIS, "b", REAL, "t", varray());
ADDFUNC0R(TRANSFORM, TRANSFORM, Transform, inverse, varray());
ADDFUNC0R(TRANSFORM, TRANSFORM, Transform, affine_inverse, varray());
diff --git a/doc/classes/AnimationTreePlayer.xml b/doc/classes/AnimationTreePlayer.xml
index 49b4c6b43e38..8c32d5f6a375 100644
--- a/doc/classes/AnimationTreePlayer.xml
+++ b/doc/classes/AnimationTreePlayer.xml
@@ -50,6 +50,14 @@
Returns the name of the [member master_player]'s [Animation] bound to this animation node.
+
+
+
+
+
+
+
+
diff --git a/doc/classes/ColorPickerButton.xml b/doc/classes/ColorPickerButton.xml
index 656fce587f9c..9d7df1401414 100644
--- a/doc/classes/ColorPickerButton.xml
+++ b/doc/classes/ColorPickerButton.xml
@@ -11,7 +11,7 @@
-
+
diff --git a/doc/classes/EditorInspector.xml b/doc/classes/EditorInspector.xml
new file mode 100644
index 000000000000..381eef5a4070
--- /dev/null
+++ b/doc/classes/EditorInspector.xml
@@ -0,0 +1,37 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/doc/classes/EditorInspectorPlugin.xml b/doc/classes/EditorInspectorPlugin.xml
new file mode 100644
index 000000000000..c614575e8e7c
--- /dev/null
+++ b/doc/classes/EditorInspectorPlugin.xml
@@ -0,0 +1,95 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/doc/classes/EditorPlugin.xml b/doc/classes/EditorPlugin.xml
index e8e2c4fd7467..860d98ab6238 100644
--- a/doc/classes/EditorPlugin.xml
+++ b/doc/classes/EditorPlugin.xml
@@ -81,7 +81,7 @@
-
+
@@ -94,6 +94,14 @@
+
+
+
+
+
+
+
+
@@ -135,6 +143,12 @@
This is used, for example, in shader editors to let the plugin know that it must apply the shader code being written by the user to the object.
+
+
+
+
+
+
@@ -341,7 +355,7 @@
-
+
@@ -354,6 +368,14 @@
+
+
+
+
+
+
+
+
diff --git a/doc/classes/EditorProperty.xml b/doc/classes/EditorProperty.xml
new file mode 100644
index 000000000000..9b5452ec144f
--- /dev/null
+++ b/doc/classes/EditorProperty.xml
@@ -0,0 +1,111 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/doc/classes/EditorSettings.xml b/doc/classes/EditorSettings.xml
index 5325a67de32c..bd85075b7e44 100644
--- a/doc/classes/EditorSettings.xml
+++ b/doc/classes/EditorSettings.xml
@@ -67,7 +67,7 @@
-
+
@@ -144,6 +144,8 @@
+
+
diff --git a/doc/classes/OrientedPathFollow.xml b/doc/classes/OrientedPathFollow.xml
index c32e545ff5dd..85d60936ad58 100644
--- a/doc/classes/OrientedPathFollow.xml
+++ b/doc/classes/OrientedPathFollow.xml
@@ -5,7 +5,7 @@
This node behaves like [PathFollow], except it uses its parent [Path] up vector information to enforce orientation.
- Make sure to check if the curve of this node's parent [Path] has up vectors enabled. See [PathFollow] and [Curve3D] for further information.
+ Make sure to check if the curve of this node's parent [Path] has up vectors enabled. See [PathFollow] and [Curve3D] for further information.
diff --git a/doc/classes/PhysicalBone.xml b/doc/classes/PhysicalBone.xml
index 80b3c11270d2..99f551b86573 100644
--- a/doc/classes/PhysicalBone.xml
+++ b/doc/classes/PhysicalBone.xml
@@ -9,12 +9,24 @@
+
+
+
+
+
+
+
+
+
+
+
+
@@ -31,10 +43,6 @@
-
-
-
-
diff --git a/doc/classes/Physics2DServer.xml b/doc/classes/Physics2DServer.xml
index 4a678d9f6b23..c302797704e6 100644
--- a/doc/classes/Physics2DServer.xml
+++ b/doc/classes/Physics2DServer.xml
@@ -140,6 +140,18 @@
Removes a shape from an area. It does not delete the shape, so it can be reassigned later.
+
+
+
+
+
+
+
+
+
+
+
+
@@ -180,6 +192,16 @@
5: The shape index of the area where the object entered/exited.
+
+
+
+
+
+
+
+
+
+
diff --git a/doc/classes/PhysicsServer.xml b/doc/classes/PhysicsServer.xml
index f5311974f2a3..6efbfdb51971 100644
--- a/doc/classes/PhysicsServer.xml
+++ b/doc/classes/PhysicsServer.xml
@@ -149,6 +149,18 @@
Removes a shape from an area. It does not delete the shape, so it can be reassigned later.
+
+
+
+
+
+
+
+
+
+
+
+
@@ -189,6 +201,16 @@
5: The shape index of the area where the object entered/exited.
+
+
+
+
+
+
+
+
+
+
diff --git a/doc/classes/ProceduralSky.xml b/doc/classes/ProceduralSky.xml
index 664c80be5e73..df0519b2ad1e 100644
--- a/doc/classes/ProceduralSky.xml
+++ b/doc/classes/ProceduralSky.xml
@@ -54,7 +54,7 @@
Amount of energy contribution from the sun.
- The suns height using polar coordinates.
+ The suns height using polar coordinates.
The direction of the sun using polar coordinates.
diff --git a/doc/classes/Quat.xml b/doc/classes/Quat.xml
index 412179088171..589f7d00c612 100644
--- a/doc/classes/Quat.xml
+++ b/doc/classes/Quat.xml
@@ -19,16 +19,19 @@
-
-
-
-
-
-
-
+
- Returns a quaternion defined by these values.
+ Returns the rotation matrix corresponding to the given quaternion.
+
+
+
+
+
+
+
+
+ Returns a quaternion that will perform a rotation specified by Euler angles (in the YXZ convention: first Z, then X, and Y last), given in the vector format as (X-angle, Y-angle, Z-angle).
@@ -45,19 +48,16 @@
-
+
+
+
+
+
+
+
- Returns a quaternion that will perform a rotation specified by Euler angles (in the YXZ convention: first Z, then X, and Y last), given in the vector format as (X-angle, Y-angle, Z-angle).
-
-
-
-
-
-
-
-
- Returns the rotation matrix corresponding to the given quaternion.
+ Returns a quaternion defined by these values.
@@ -129,7 +129,7 @@
-
+
Set the quaternion to a rotation which rotates around axis by the specified angle, in radians. The axis must be a normalized vector.
diff --git a/doc/classes/Range.xml b/doc/classes/Range.xml
index 545f5cc83b39..fa7e20eff66d 100644
--- a/doc/classes/Range.xml
+++ b/doc/classes/Range.xml
@@ -29,6 +29,10 @@
+
+
+
+
If [code]true[/code] and [code]min_value[/code] is greater than 0, [code]value[/code] will be represented exponentially rather than linearly.
diff --git a/doc/classes/ScrollContainer.xml b/doc/classes/ScrollContainer.xml
index f16b3920c2d3..3a99a203ae89 100644
--- a/doc/classes/ScrollContainer.xml
+++ b/doc/classes/ScrollContainer.xml
@@ -42,4 +42,8 @@
+
+
+
+
diff --git a/doc/classes/ShaderMaterial.xml b/doc/classes/ShaderMaterial.xml
index 058e00e46ce4..5abba9fba96e 100644
--- a/doc/classes/ShaderMaterial.xml
+++ b/doc/classes/ShaderMaterial.xml
@@ -1,7 +1,7 @@
- A material that uses a custom [Shader] program
+ A material that uses a custom [Shader] program.
A material that uses a custom [Shader] program to render either items to screen or process particles. You can create multiple materials for the same shader but configure different values for the uniforms defined in the shader.
@@ -17,7 +17,7 @@
- Returns the current value set for this material of a uniform in the shader
+ Returns the current value set for this material of a uniform in the shader.
@@ -28,13 +28,13 @@
- Changes the value set for this material of a uniform in the shader
+ Changes the value set for this material of a uniform in the shader.
- The [Shader] program used to render this material
+ The [Shader] program used to render this material.
diff --git a/doc/classes/Skeleton.xml b/doc/classes/Skeleton.xml
index 67e10e8f0a2c..0f96ee01ff2e 100644
--- a/doc/classes/Skeleton.xml
+++ b/doc/classes/Skeleton.xml
@@ -147,14 +147,20 @@
-
+
-
+
+
+
+
+
+
+
diff --git a/doc/classes/String.xml b/doc/classes/String.xml
index a55e18447442..0ba1066dfdbb 100644
--- a/doc/classes/String.xml
+++ b/doc/classes/String.xml
@@ -643,6 +643,20 @@
Returns the right side of the string from a given position.
+
+
+
+
+
+
+
+
+
+
+ Splits the string by a [code]divisor[/code] string and returns an array of the substrings, starting from right. Example "One,Two,Three" will return ["One","Two","Three"] if split by ",".
+ If [code]maxsplit[/code] is specified, then it is number of splits to do, default is 0 which splits all the items.
+
+
@@ -688,20 +702,6 @@
If [code]maxsplit[/code] is given, at most maxsplit number of splits occur, and the remainder of the string is returned as the final element of the list (thus, the list will have at most maxsplit+1 elements)
-
-
-
-
-
-
-
-
-
-
- Splits the string by a [code]divisor[/code] string and returns an array of the substrings, starting from right. Example "One,Two,Three" will return ["One","Two","Three"] if split by ",".
- If [code]maxsplit[/code] is specified, then it is number of splits to do, default is 0 which splits all the items.
-
-
diff --git a/doc/classes/TextEdit.xml b/doc/classes/TextEdit.xml
index 11fc00d12956..ee9b7383e5ff 100644
--- a/doc/classes/TextEdit.xml
+++ b/doc/classes/TextEdit.xml
@@ -386,7 +386,7 @@
If [code]true[/code], enables text wrapping when it goes beyond he edge of what is visible.
-
+
diff --git a/doc/classes/TileMap.xml b/doc/classes/TileMap.xml
index 775fef4fb7cf..5af29d96cdeb 100644
--- a/doc/classes/TileMap.xml
+++ b/doc/classes/TileMap.xml
@@ -52,7 +52,7 @@
- Returns [code]true[/code] if the given collision layer bit is set.
+ Returns [code]true[/code] if the given collision layer bit is set.
@@ -61,7 +61,7 @@
- Returns [code]true[/code] if the given collision mask bit is set.
+ Returns [code]true[/code] if the given collision mask bit is set.
@@ -77,14 +77,14 @@
- Returns an array of all cells with the given tile id.
+ Returns an array of all cells with the given tile id.
- Returns a rectangle enclosing the used (non-empty) tiles of the map.
+ Returns a rectangle enclosing the used (non-empty) tiles of the map.
@@ -128,7 +128,7 @@
- Returns the global position corresponding to the given tilemap (grid-based) coordinates.
+ Returns the global position corresponding to the given tilemap (grid-based) coordinates.
Optionally, the tilemap's half offset can be ignored.
@@ -193,7 +193,7 @@
- Sets the given collision mask bit.
+ Sets the given collision mask bit.
@@ -223,7 +223,7 @@
- Returns the tilemap (grid-based) coordinatescorresponding to the given global position.
+ Returns the tilemap (grid-based) coordinatescorresponding to the given global position.
diff --git a/doc/classes/TileSet.xml b/doc/classes/TileSet.xml
index 8f7969505e62..bdf8634a6c70 100644
--- a/doc/classes/TileSet.xml
+++ b/doc/classes/TileSet.xml
@@ -450,7 +450,9 @@
-
+
+
+
diff --git a/doc/classes/Vector2.xml b/doc/classes/Vector2.xml
index e3fbaff62dfd..923be94db9cd 100644
--- a/doc/classes/Vector2.xml
+++ b/doc/classes/Vector2.xml
@@ -34,7 +34,7 @@
- Returns the vector's angle in radians with respect to the x-axis, or [code](1, 0)[/code] vector.
+ Returns the vector's angle in radians with respect to the x-axis, or [code](1, 0)[/code] vector.
Equivalent to the result of atan2 when called with the vector's x and y as parameters: [code]atan2(x, y)[/code].
@@ -190,7 +190,7 @@
- Returns the vector reflected from a plane defined by the given normal.
+ Returns the vector reflected from a plane defined by the given normal.
diff --git a/doc/classes/Vector3.xml b/doc/classes/Vector3.xml
index 84c16c9fc523..edd0965b6415 100644
--- a/doc/classes/Vector3.xml
+++ b/doc/classes/Vector3.xml
@@ -151,7 +151,7 @@
- Returns the result of the linear interpolation between this vector and [code]b[/code] by amount [code]t[/code]. [code]t[/code] is in the range of [code]0.0 - 1.0[/code], a percentage of how far along the interpolation is.
+ Returns the result of the linear interpolation between this vector and [code]b[/code] by amount [code]t[/code]. [code]t[/code] is in the range of [code]0.0 - 1.0[/code], a percentage of how far along the interpolation is.