diff --git a/core/bind/core_bind.cpp b/core/bind/core_bind.cpp
index e99e69578c20..202b1b1fe8ca 100644
--- a/core/bind/core_bind.cpp
+++ b/core/bind/core_bind.cpp
@@ -134,7 +134,7 @@ bool _ResourceLoader::exists(const String &p_path, const String &p_type_hint) {
void _ResourceLoader::_bind_methods() {
ClassDB::bind_method(D_METHOD("load_threaded_request", "path", "type_hint", "use_sub_threads"), &_ResourceLoader::load_threaded_request, DEFVAL(""), DEFVAL(false));
- ClassDB::bind_method(D_METHOD("load_threaded_get_status", "path", "r_progress"), &_ResourceLoader::load_threaded_get_status, DEFVAL(Array()));
+ ClassDB::bind_method(D_METHOD("load_threaded_get_status", "path", "progress"), &_ResourceLoader::load_threaded_get_status, DEFVAL(Array()));
ClassDB::bind_method(D_METHOD("load_threaded_get", "path"), &_ResourceLoader::load_threaded_get);
ClassDB::bind_method(D_METHOD("load", "path", "type_hint", "no_cache"), &_ResourceLoader::load, DEFVAL(""), DEFVAL(false));
diff --git a/doc/classes/NavigationServer.xml b/doc/classes/NavigationServer.xml
index 1f65a6004e9c..1b534b8458fe 100644
--- a/doc/classes/NavigationServer.xml
+++ b/doc/classes/NavigationServer.xml
@@ -298,6 +298,17 @@
Sets the map up direction.
+
+
+
+
+
+
+ Process the collision avoidance agents.
+ The result of this process is needed by the physics server, so this must be called in the main thread.
+ Note: This function is not thread safe.
+
+
@@ -358,17 +369,6 @@
Control activation of this server.
-
-
-
-
-
-
- Process the collision avoidance agents.
- The result of this process is needed by the physics server, so this must be called in the main thread.
- Note: This function is not thread safe.
-
-
diff --git a/doc/classes/ResourceInteractiveLoader.xml b/doc/classes/ResourceInteractiveLoader.xml
deleted file mode 100644
index 64e94c4f2da6..000000000000
--- a/doc/classes/ResourceInteractiveLoader.xml
+++ /dev/null
@@ -1,55 +0,0 @@
-
-
-
- Interactive [Resource] loader.
-
-
- Interactive [Resource] loader. This object is returned by [ResourceLoader] when performing an interactive load. It allows loading resources with high granularity, which makes it mainly useful for displaying loading bars or percentages.
-
-
-
-
-
-
-
-
- Returns the loaded resource if the load operation completed successfully, [code]null[/code] otherwise.
-
-
-
-
-
-
- Returns the load stage. The total amount of stages can be queried with [method get_stage_count].
-
-
-
-
-
-
- Returns the total amount of stages (calls to [method poll]) needed to completely load this resource.
-
-
-
-
-
-
- Polls the loading operation, i.e. loads a data chunk up to the next stage.
- Returns [constant OK] if the poll is successful but the load operation has not finished yet (intermediate stage). This means [method poll] will have to be called again until the last stage is completed.
- Returns [constant ERR_FILE_EOF] if the load operation has completed successfully. The loaded resource can be obtained by calling [method get_resource].
- Returns another [enum Error] code if the poll has failed.
-
-
-
-
-
-
- Polls the loading operation successively until the resource is completely loaded or a [method poll] fails.
- Returns [constant ERR_FILE_EOF] if the load operation has completed successfully. The loaded resource can be obtained by calling [method get_resource].
- Returns another [enum Error] code if a poll has failed, aborting the operation.
-
-
-
-
-
-
diff --git a/doc/classes/ResourceLoader.xml b/doc/classes/ResourceLoader.xml
index d2a0ac22d635..109bed537a4d 100644
--- a/doc/classes/ResourceLoader.xml
+++ b/doc/classes/ResourceLoader.xml
@@ -68,16 +68,34 @@
Returns an empty resource if no ResourceFormatLoader could handle the file.
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
- Starts loading a resource interactively. The returned [ResourceInteractiveLoader] object allows to load with high granularity, calling its [method ResourceInteractiveLoader.poll] method successively to load chunks.
- An optional [code]type_hint[/code] can be used to further specify the [Resource] type that should be handled by the [ResourceFormatLoader].
@@ -91,5 +109,13 @@
+
+
+
+
+
+
+
+
diff --git a/doc/classes/VisualShader.xml b/doc/classes/VisualShader.xml
index 27ba54cb68f0..0dd8ec00641f 100644
--- a/doc/classes/VisualShader.xml
+++ b/doc/classes/VisualShader.xml
@@ -183,6 +183,8 @@
+
+
diff --git a/doc/classes/VisualShaderNodeCompare.xml b/doc/classes/VisualShaderNodeCompare.xml
index 32f7be3ec30c..9c2331edeaf4 100644
--- a/doc/classes/VisualShaderNodeCompare.xml
+++ b/doc/classes/VisualShaderNodeCompare.xml
@@ -25,13 +25,16 @@
A floating-point scalar.
-
+
+ An integer scalar.
+
+
A 3D vector type.
-
+
A boolean type.
-
+
A transform ([code]mat4[/code]) type.
diff --git a/doc/classes/VisualShaderNodeIntFunc.xml b/doc/classes/VisualShaderNodeIntFunc.xml
index 4b5d4ca8d287..5c68c0ec717f 100644
--- a/doc/classes/VisualShaderNodeIntFunc.xml
+++ b/doc/classes/VisualShaderNodeIntFunc.xml
@@ -11,7 +11,7 @@
-
+
A function to be applied to the scalar. See [enum Function] for options.