Cherry-picks for the 3.x branch (future 3.4) - 15th batch

SConstruct

@@ -198,7 +198,13 @@ elif env_base["p"] != "":
     selected_platform = env_base["p"]
 else:
     # Missing `platform` argument, try to detect platform automatically
-    if sys.platform.startswith("linux"):
+    if (
+        sys.platform.startswith("linux")
+        or sys.platform.startswith("dragonfly")
+        or sys.platform.startswith("freebsd")
+        or sys.platform.startswith("netbsd")
+        or sys.platform.startswith("openbsd")
+    ):
         selected_platform = "x11"
     elif sys.platform == "darwin":
         selected_platform = "osx"
@@ -425,17 +431,21 @@ if selected_platform in platform_list:
     else:  # GCC, Clang
         version = methods.get_compiler_version(env) or [-1, -1]
 
-        gcc_common_warnings = []
+        common_warnings = []
 
         if methods.using_gcc(env):
-            gcc_common_warnings += ["-Wno-misleading-indentation"]
+            common_warnings += ["-Wno-misleading-indentation"]
             if version[0] >= 7:
-                gcc_common_warnings += ["-Wshadow-local"]
+                common_warnings += ["-Wshadow-local"]
+        elif methods.using_clang(env) or methods.using_emcc(env):
+            # We often implement `operator<` for structs of pointers as a requirement
+            # for putting them in `Set` or `Map`. We don't mind about unreliable ordering.
+            common_warnings += ["-Wno-ordered-compare-function-pointers"]
 
         if env["warnings"] == "extra":
             # Note: enable -Wimplicit-fallthrough for Clang (already part of -Wextra for GCC)
             # once we switch to C++11 or later (necessary for our FALLTHROUGH macro).
-            env.Append(CCFLAGS=["-Wall", "-Wextra", "-Wwrite-strings", "-Wno-unused-parameter"] + gcc_common_warnings)
+            env.Append(CCFLAGS=["-Wall", "-Wextra", "-Wwrite-strings", "-Wno-unused-parameter"] + common_warnings)
             env.Append(CXXFLAGS=["-Wctor-dtor-privacy", "-Wnon-virtual-dtor"])
             if methods.using_gcc(env):
                 env.Append(
@@ -451,9 +461,9 @@ if selected_platform in platform_list:
                 if version[0] >= 9:
                     env.Append(CCFLAGS=["-Wattribute-alias=2"])
         elif env["warnings"] == "all":
-            env.Append(CCFLAGS=["-Wall"] + gcc_common_warnings)
+            env.Append(CCFLAGS=["-Wall"] + common_warnings)
         elif env["warnings"] == "moderate":
-            env.Append(CCFLAGS=["-Wall", "-Wno-unused"] + gcc_common_warnings)
+            env.Append(CCFLAGS=["-Wall", "-Wno-unused"] + common_warnings)
         else:  # 'no'
             env.Append(CCFLAGS=["-w"])
 

core/bind/core_bind.cpp

@@ -2643,7 +2643,7 @@ void _Thread::_start_func(void *ud) {
 			target_param_count = method->get_argument_count();
 			target_default_arg_count = method->get_default_argument_count();
 		}
-		if (target_param_count >= 1 && target_default_arg_count == target_param_count) {
+		if (target_param_count >= 1 && target_default_arg_count < target_param_count) {
 			argc = 1;
 		}
 	}

core/resource.h

@@ -59,8 +59,6 @@ class Resource : public Reference {
 	String path_cache;
 	int subindex;
 
-	virtual bool _use_builtin_script() const { return true; }
-
 #ifdef TOOLS_ENABLED
 	uint64_t last_modified_time;
 	uint64_t import_last_modified_time;

doc/classes/AABB.xml

@@ -9,9 +9,9 @@
 		[b]Note:[/b] Unlike [Rect2], [AABB] does not have a variant that uses integer coordinates.
 	</description>
 	<tutorials>
-		<link title="Math tutorial index">https://docs.godotengine.org/en/3.3/tutorials/math/index.html</link>
-		<link title="Vector math">https://docs.godotengine.org/en/3.3/tutorials/math/vector_math.html</link>
-		<link title="Advanced vector math">https://docs.godotengine.org/en/3.3/tutorials/math/vectors_advanced.html</link>
+		<link title="Math tutorial index">https://docs.godotengine.org/en/3.4/tutorials/math/index.html</link>
+		<link title="Vector math">https://docs.godotengine.org/en/3.4/tutorials/math/vector_math.html</link>
+		<link title="Advanced vector math">https://docs.godotengine.org/en/3.4/tutorials/math/vectors_advanced.html</link>
 	</tutorials>
 	<methods>
 		<method name="AABB">

doc/classes/ARVRCamera.xml

@@ -8,7 +8,7 @@
 		The position and orientation of this node is automatically updated by the ARVR Server to represent the location of the HMD if such tracking is available and can thus be used by game logic. Note that, in contrast to the ARVR Controller, the render thread has access to the most up-to-date tracking data of the HMD and the location of the ARVRCamera can lag a few milliseconds behind what is used for rendering as a result.
 	</description>
 	<tutorials>
-		<link>https://docs.godotengine.org/en/3.3/tutorials/vr/index.html</link>
+		<link>https://docs.godotengine.org/en/3.4/tutorials/vr/index.html</link>
 	</tutorials>
 	<methods>
 	</methods>

doc/classes/ARVRController.xml

@@ -9,7 +9,7 @@
 		The position of the controller node is automatically updated by the [ARVRServer]. This makes this node ideal to add child nodes to visualize the controller.
 	</description>
 	<tutorials>
-		<link>https://docs.godotengine.org/en/3.3/tutorials/vr/index.html</link>
+		<link>https://docs.godotengine.org/en/3.4/tutorials/vr/index.html</link>
 	</tutorials>
 	<methods>
 		<method name="get_controller_name" qualifiers="const">

doc/classes/ARVRInterface.xml

@@ -8,7 +8,7 @@
 		Interfaces should be written in such a way that simply enabling them will give us a working setup. You can query the available interfaces through [ARVRServer].
 	</description>
 	<tutorials>
-		<link>https://docs.godotengine.org/en/3.3/tutorials/vr/index.html</link>
+		<link>https://docs.godotengine.org/en/3.4/tutorials/vr/index.html</link>
 	</tutorials>
 	<methods>
 		<method name="get_camera_feed_id">

doc/classes/ARVROrigin.xml

@@ -10,7 +10,7 @@
 		For example, if your character is driving a car, the ARVROrigin node should be a child node of this car. Or, if you're implementing a teleport system to move your character, you should change the position of this node.
 	</description>
 	<tutorials>
-		<link>https://docs.godotengine.org/en/3.3/tutorials/vr/index.html</link>
+		<link>https://docs.godotengine.org/en/3.4/tutorials/vr/index.html</link>
 	</tutorials>
 	<methods>
 	</methods>

doc/classes/ARVRPositionalTracker.xml

@@ -9,7 +9,7 @@
 		The [ARVRController] and [ARVRAnchor] both consume objects of this type and should be used in your project. The positional trackers are just under-the-hood objects that make this all work. These are mostly exposed so that GDNative-based interfaces can interact with them.
 	</description>
 	<tutorials>
-		<link>https://docs.godotengine.org/en/3.3/tutorials/vr/index.html</link>
+		<link>https://docs.godotengine.org/en/3.4/tutorials/vr/index.html</link>
 	</tutorials>
 	<methods>
 		<method name="get_hand" qualifiers="const">

doc/classes/ARVRServer.xml

@@ -7,7 +7,7 @@
 		The AR/VR server is the heart of our Advanced and Virtual Reality solution and handles all the processing.
 	</description>
 	<tutorials>
-		<link>https://docs.godotengine.org/en/3.3/tutorials/vr/index.html</link>
+		<link>https://docs.godotengine.org/en/3.4/tutorials/vr/index.html</link>
 	</tutorials>
 	<methods>
 		<method name="add_interface">

doc/classes/AnimatedSprite.xml

@@ -8,7 +8,7 @@
 		[b]Note:[/b] You can associate a set of normal maps by creating additional [SpriteFrames] resources with a [code]_normal[/code] suffix. For example, having 2 [SpriteFrames] resources [code]run[/code] and [code]run_normal[/code] will make it so the [code]run[/code] animation uses the normal map.
 	</description>
 	<tutorials>
-		<link title="2D Sprite animation">https://docs.godotengine.org/en/3.3/tutorials/2d/2d_sprite_animation.html</link>
+		<link title="2D Sprite animation">https://docs.godotengine.org/en/3.4/tutorials/2d/2d_sprite_animation.html</link>
 		<link title="2D Dodge The Creeps Demo">https://godotengine.org/asset-library/asset/515</link>
 	</tutorials>
 	<methods>

doc/classes/AnimatedSprite3D.xml

@@ -7,7 +7,7 @@
 		Animations are created using a [SpriteFrames] resource, which can be configured in the editor via the SpriteFrames panel.
 	</description>
 	<tutorials>
-		<link title="2D Sprite animation (also applies to 3D)">https://docs.godotengine.org/en/3.3/tutorials/2d/2d_sprite_animation.html</link>
+		<link title="2D Sprite animation (also applies to 3D)">https://docs.godotengine.org/en/3.4/tutorials/2d/2d_sprite_animation.html</link>
 	</tutorials>
 	<methods>
 		<method name="is_playing" qualifiers="const">

doc/classes/Animation.xml

@@ -17,7 +17,7 @@
 		Animations are just data containers, and must be added to nodes such as an [AnimationPlayer] or [AnimationTreePlayer] to be played back. Animation tracks have different types, each with its own set of dedicated methods. Check [enum TrackType] to see available types.
 	</description>
 	<tutorials>
-		<link>https://docs.godotengine.org/en/3.3/tutorials/animation/index.html</link>
+		<link>https://docs.godotengine.org/en/3.4/tutorials/animation/index.html</link>
 	</tutorials>
 	<methods>
 		<method name="add_track">

doc/classes/AnimationNode.xml

@@ -8,7 +8,7 @@
 	Inherit this when creating nodes mainly for use in [AnimationNodeBlendTree], otherwise [AnimationRootNode] should be used instead.
 	</description>
 	<tutorials>
-		<link>https://docs.godotengine.org/en/3.3/tutorials/animation/animation_tree.html</link>
+		<link>https://docs.godotengine.org/en/3.4/tutorials/animation/animation_tree.html</link>
 	</tutorials>
 	<methods>
 		<method name="add_input">

doc/classes/AnimationNodeAdd2.xml

@@ -7,7 +7,7 @@
 		A resource to add to an [AnimationNodeBlendTree]. Blends two animations additively based on an amount value in the [code][0.0, 1.0][/code] range.
 	</description>
 	<tutorials>
-		<link>https://docs.godotengine.org/en/3.3/tutorials/animation/animation_tree.html</link>
+		<link>https://docs.godotengine.org/en/3.4/tutorials/animation/animation_tree.html</link>
 	</tutorials>
 	<methods>
 	</methods>

doc/classes/AnimationNodeAdd3.xml

@@ -11,7 +11,7 @@
 		- A +add animation to blend with when the blend amount is in the [code][0.0, 1.0][/code] range
 	</description>
 	<tutorials>
-		<link title="AnimationTree">https://docs.godotengine.org/en/3.3/tutorials/animation/animation_tree.html</link>
+		<link title="AnimationTree">https://docs.godotengine.org/en/3.4/tutorials/animation/animation_tree.html</link>
 		<link title="Third Person Shooter Demo">https://godotengine.org/asset-library/asset/678</link>
 	</tutorials>
 	<methods>

doc/classes/AnimationNodeAnimation.xml

@@ -7,7 +7,7 @@
 		A resource to add to an [AnimationNodeBlendTree]. Only features one output set using the [member animation] property. Use it as an input for [AnimationNode] that blend animations together.
 	</description>
 	<tutorials>
-		<link title="AnimationTree">https://docs.godotengine.org/en/3.3/tutorials/animation/animation_tree.html</link>
+		<link title="AnimationTree">https://docs.godotengine.org/en/3.4/tutorials/animation/animation_tree.html</link>
 		<link title="3D Platformer Demo">https://godotengine.org/asset-library/asset/125</link>
 		<link title="Third Person Shooter Demo">https://godotengine.org/asset-library/asset/678</link>
 	</tutorials>

doc/classes/AnimationNodeBlend2.xml

@@ -7,7 +7,7 @@
 		A resource to add to an [AnimationNodeBlendTree]. Blends two animations linearly based on an amount value in the [code][0.0, 1.0][/code] range.
 	</description>
 	<tutorials>
-		<link title="AnimationTree">https://docs.godotengine.org/en/3.3/tutorials/animation/animation_tree.html</link>
+		<link title="AnimationTree">https://docs.godotengine.org/en/3.4/tutorials/animation/animation_tree.html</link>
 		<link title="3D Platformer Demo">https://godotengine.org/asset-library/asset/125</link>
 		<link title="Third Person Shooter Demo">https://godotengine.org/asset-library/asset/678</link>
 	</tutorials>

doc/classes/AnimationNodeBlend3.xml

@@ -11,7 +11,7 @@
 		- A +blend animation to blend with when the blend amount is in the [code][0.0, 1.0][/code] range
 	</description>
 	<tutorials>
-		<link>https://docs.godotengine.org/en/3.3/tutorials/animation/animation_tree.html</link>
+		<link>https://docs.godotengine.org/en/3.4/tutorials/animation/animation_tree.html</link>
 	</tutorials>
 	<methods>
 	</methods>

doc/classes/AnimationNodeBlendSpace1D.xml

@@ -10,7 +10,7 @@
 		You can set the extents of the axis using the [member min_space] and [member max_space].
 	</description>
 	<tutorials>
-		<link>https://docs.godotengine.org/en/3.3/tutorials/animation/animation_tree.html</link>
+		<link>https://docs.godotengine.org/en/3.4/tutorials/animation/animation_tree.html</link>
 	</tutorials>
 	<methods>
 		<method name="add_blend_point">

doc/classes/AnimationNodeBlendSpace2D.xml

@@ -9,7 +9,7 @@
 		You can add vertices to the blend space with [method add_blend_point] and automatically triangulate it by setting [member auto_triangles] to [code]true[/code]. Otherwise, use [method add_triangle] and [method remove_triangle] to create up the blend space by hand.
 	</description>
 	<tutorials>
-		<link title="AnimationTree">https://docs.godotengine.org/en/3.3/tutorials/animation/animation_tree.html</link>
+		<link title="AnimationTree">https://docs.godotengine.org/en/3.4/tutorials/animation/animation_tree.html</link>
 		<link title="Third Person Shooter Demo">https://godotengine.org/asset-library/asset/678</link>
 	</tutorials>
 	<methods>

doc/classes/AnimationNodeBlendTree.xml

@@ -7,7 +7,7 @@
 		This node may contain a sub-tree of any other blend type nodes, such as mix, blend2, blend3, one shot, etc. This is one of the most commonly used roots.
 	</description>
 	<tutorials>
-		<link>https://docs.godotengine.org/en/3.3/tutorials/animation/animation_tree.html</link>
+		<link>https://docs.godotengine.org/en/3.4/tutorials/animation/animation_tree.html</link>
 	</tutorials>
 	<methods>
 		<method name="add_node">

doc/classes/AnimationNodeOneShot.xml

@@ -7,7 +7,7 @@
 		A resource to add to an [AnimationNodeBlendTree]. This node will execute a sub-animation and return once it finishes. Blend times for fading in and out can be customized, as well as filters.
 	</description>
 	<tutorials>
-		<link title="AnimationTree">https://docs.godotengine.org/en/3.3/tutorials/animation/animation_tree.html</link>
+		<link title="AnimationTree">https://docs.godotengine.org/en/3.4/tutorials/animation/animation_tree.html</link>
 		<link title="Third Person Shooter Demo">https://godotengine.org/asset-library/asset/678</link>
 	</tutorials>
 	<methods>

doc/classes/AnimationNodeOutput.xml

@@ -6,7 +6,7 @@
 	<description>
 	</description>
 	<tutorials>
-		<link title="AnimationTree">https://docs.godotengine.org/en/3.3/tutorials/animation/animation_tree.html</link>
+		<link title="AnimationTree">https://docs.godotengine.org/en/3.4/tutorials/animation/animation_tree.html</link>
 		<link title="3D Platformer Demo">https://godotengine.org/asset-library/asset/125</link>
 		<link title="Third Person Shooter Demo">https://godotengine.org/asset-library/asset/678</link>
 	</tutorials>

doc/classes/AnimationNodeStateMachine.xml

@@ -12,7 +12,7 @@
 		[/codeblock]
 	</description>
 	<tutorials>
-		<link>https://docs.godotengine.org/en/3.3/tutorials/animation/animation_tree.html</link>
+		<link>https://docs.godotengine.org/en/3.4/tutorials/animation/animation_tree.html</link>
 	</tutorials>
 	<methods>
 		<method name="add_node">

doc/classes/AnimationNodeStateMachinePlayback.xml

@@ -12,7 +12,7 @@
 		[/codeblock]
 	</description>
 	<tutorials>
-		<link>https://docs.godotengine.org/en/3.3/tutorials/animation/animation_tree.html</link>
+		<link>https://docs.godotengine.org/en/3.4/tutorials/animation/animation_tree.html</link>
 	</tutorials>
 	<methods>
 		<method name="get_current_length" qualifiers="const">

doc/classes/AnimationNodeStateMachineTransition.xml

@@ -5,13 +5,13 @@
 	<description>
 	</description>
 	<tutorials>
-		<link>https://docs.godotengine.org/en/3.3/tutorials/animation/animation_tree.html</link>
+		<link>https://docs.godotengine.org/en/3.4/tutorials/animation/animation_tree.html</link>
 	</tutorials>
 	<methods>
 	</methods>
 	<members>
 		<member name="advance_condition" type="String" setter="set_advance_condition" getter="get_advance_condition" default="&quot;&quot;">
-			Turn on auto advance when this condition is set. The provided name will become a boolean parameter on the [AnimationTree] that can be controlled from code (see [url=https://docs.godotengine.org/en/3.3/tutorials/animation/animation_tree.html#controlling-from-code][/url]). For example, if [member AnimationTree.tree_root] is an [AnimationNodeStateMachine] and [member advance_condition] is set to [code]"idle"[/code]:
+			Turn on auto advance when this condition is set. The provided name will become a boolean parameter on the [AnimationTree] that can be controlled from code (see [url=https://docs.godotengine.org/en/3.4/tutorials/animation/animation_tree.html#controlling-from-code][/url]). For example, if [member AnimationTree.tree_root] is an [AnimationNodeStateMachine] and [member advance_condition] is set to [code]"idle"[/code]:
 			[codeblock]
 			$animation_tree["parameters/conditions/idle"] = is_on_floor and (linear_velocity.x == 0)
 			[/codeblock]

doc/classes/AnimationNodeTimeScale.xml

@@ -7,7 +7,7 @@
 		Allows scaling the speed of the animation (or reversing it) in any children nodes. Setting it to 0 will pause the animation.
 	</description>
 	<tutorials>
-		<link title="AnimationTree">https://docs.godotengine.org/en/3.3/tutorials/animation/animation_tree.html</link>
+		<link title="AnimationTree">https://docs.godotengine.org/en/3.4/tutorials/animation/animation_tree.html</link>
 		<link title="3D Platformer Demo">https://godotengine.org/asset-library/asset/125</link>
 	</tutorials>
 	<methods>

doc/classes/AnimationNodeTimeSeek.xml

@@ -18,7 +18,7 @@
 		[/codeblock]
 	</description>
 	<tutorials>
-		<link>https://docs.godotengine.org/en/3.3/tutorials/animation/animation_tree.html</link>
+		<link>https://docs.godotengine.org/en/3.4/tutorials/animation/animation_tree.html</link>
 	</tutorials>
 	<methods>
 	</methods>

doc/classes/AnimationNodeTransition.xml

@@ -7,7 +7,7 @@
 		Simple state machine for cases which don't require a more advanced [AnimationNodeStateMachine]. Animations can be connected to the inputs and transition times can be specified.
 	</description>
 	<tutorials>
-		<link title="AnimationTree">https://docs.godotengine.org/en/3.3/tutorials/animation/animation_tree.html</link>
+		<link title="AnimationTree">https://docs.godotengine.org/en/3.4/tutorials/animation/animation_tree.html</link>
 		<link title="3D Platformer Demo">https://godotengine.org/asset-library/asset/125</link>
 		<link title="Third Person Shooter Demo">https://godotengine.org/asset-library/asset/678</link>
 	</tutorials>

doc/classes/AnimationPlayer.xml

@@ -9,8 +9,8 @@
 		Updating the target properties of animations occurs at process time.
 	</description>
 	<tutorials>
-		<link title="Animation tutorial index">https://docs.godotengine.org/en/3.3/tutorials/animation/index.html</link>
-		<link title="2D Sprite animation">https://docs.godotengine.org/en/3.3/tutorials/2d/2d_sprite_animation.html</link>
+		<link title="Animation tutorial index">https://docs.godotengine.org/en/3.4/tutorials/animation/index.html</link>
+		<link title="2D Sprite animation">https://docs.godotengine.org/en/3.4/tutorials/2d/2d_sprite_animation.html</link>
 		<link title="Third Person Shooter Demo">https://godotengine.org/asset-library/asset/678</link>
 	</tutorials>
 	<methods>

doc/classes/AnimationTree.xml

@@ -7,7 +7,7 @@
 		Note: When linked with an [AnimationPlayer], several properties and methods of the corresponding [AnimationPlayer] will not function as expected. Playback and transitions should be handled using only the [AnimationTree] and its constituent [AnimationNode](s). The [AnimationPlayer] node should be used solely for adding, deleting, and editing animations.
 	</description>
 	<tutorials>
-		<link title="Using AnimationTree">https://docs.godotengine.org/en/3.3/tutorials/animation/animation_tree.html</link>
+		<link title="Using AnimationTree">https://docs.godotengine.org/en/3.4/tutorials/animation/animation_tree.html</link>
 		<link title="Third Person Shooter Demo">https://godotengine.org/asset-library/asset/678</link>
 	</tutorials>
 	<methods>

doc/classes/AnimationTreePlayer.xml

@@ -9,7 +9,7 @@
 		See [AnimationTree] for a more full-featured replacement of this node.
 	</description>
 	<tutorials>
-		<link>https://docs.godotengine.org/en/3.3/tutorials/animation/animation_tree.html</link>
+		<link>https://docs.godotengine.org/en/3.4/tutorials/animation/animation_tree.html</link>
 	</tutorials>
 	<methods>
 		<method name="add_node">

doc/classes/Area2D.xml

@@ -7,7 +7,7 @@
 		2D area that detects [CollisionObject2D] nodes overlapping, entering, or exiting. Can also alter or override local physics parameters (gravity, damping) and route audio to a custom audio bus.
 	</description>
 	<tutorials>
-		<link title="Using Area2D">https://docs.godotengine.org/en/3.3/tutorials/physics/using_area_2d.html</link>
+		<link title="Using Area2D">https://docs.godotengine.org/en/3.4/tutorials/physics/using_area_2d.html</link>
 		<link title="2D Dodge The Creeps Demo">https://godotengine.org/asset-library/asset/515</link>
 		<link title="2D Pong Demo">https://godotengine.org/asset-library/asset/121</link>
 		<link title="2D Platformer Demo">https://godotengine.org/asset-library/asset/120</link>