Directly RC as we'll keep changes conservative to keep this branch usable
in production at any time.

(cherry picked from commit a4423c8)

It's possible to link against system zlib on Linux, so we should use system paths.

(cherry picked from commit 93b7406)

(cherry picked from commit 3d46f28)

* Better handling of the scene's environment energy in the lightmapper
  bakes.
* Fixed a bug where ProceduralSky::get_panorama() returned a reference
  instead of a copy.
* Removed includes to Embree's internal header files.

(cherry picked from commit 2db2d11)

(cherry picked from commit b266cc2)

(cherry picked from commit 47f869b)

We need to propagate the hacky checks from the raycast config to the
lightmapper config, as the failure of a `can_build()` check is not notified to
other modules (which might even be checked further depending on the processing
order in SConstruct).

A more thorough fix would be to change SConstruct to do two loops on modules:
one to check `can_build()` and disable modules which can't build, then another
one to rechecked `can_build()` with the new lineup and do further config.
But there would be more risk for regressions than with this ad hoc hack.

Similar story for the `platform/x11/detect.py` change... oh my eyes :(

(cherry picked from commit a2c68d9)

…ss too

`tech_debt++`, that's what we get for not taking the time to cleanup all this
and do it right...

Follow-up to godotengine#48073 and godotengine#48102.

(cherry picked from commit a14b51d)

Follow-up to godotengine#46810, this was missed in godotengine#47079 when fixing the issue
for other platforms.

Fixes godotengine#48135.

(cherry picked from commit a09f383)

(cherry picked from commit 0c9a1a1)

(cherry picked from commit 188bd56)

(cherry picked from commit dbd4b45)

(cherry picked from commit 4d7f642)

…ript

(cherry picked from commit ac91e2c)

- Modified classes: RigidBody, PhysicalBone, VehicleBody, RigidBody2D, KinematicBody2D
- The input argument is untrusted even in release mode

(cherry picked from commit e075b6b)

This updates global classes and exposes base member variables.
Fixes godotengine#39713

(cherry picked from commit b16bb33)

The final_modulate was incorrectly being set in the uniform on light passes in GLES3 in situations where color was baked in the vertices. This was already correct in GLES2. This PR makes prevents setting final_modulate in this situation.

(cherry picked from commit 35c5ccc)

The translation to larger vertex formats was assuming that batches were rects, and not accounting that the num_commands had a different meaning for lines and polys, so the calculation for number of vertices to translate was incorrect in these cases.

Also prevents infinite loop if a single polygon has too many vertices to fit in the batch buffer.

(cherry picked from commit d08cf5f)

(cherry picked from commit ccc375f)

(cherry picked from commit decdf4f)

(cherry picked from commit 4311c2f)

The min requirement was upped by godotengine#45618 to have proper support for C++14.

Related to godotengine#48222.

(cherry picked from commit 8851fa7)

After further testing it seems to work fine now when building binaries with GCC 5
on Ubuntu 16.04 (previously we were using GCC 9 on Ubuntu 14.04).

Follow-up to godotengine#45629.

(cherry picked from commit aa15ad7)

We still use Emscripten 1.39.9 for official Mono builds so ideally we want to test
against an old Emscripten version to ensure we don't break compatibility.

But then google-closure-compiler-linux broke compatibility for us and is not properly
pinned, so we need to use a more recent version for now to fix CI.

Cf. emscripten-core/emsdk#802

(cherry picked from commit 9571ae3)

(cherry picked from commit 7501c7f)

(cherry picked from commit a980bad)

Cf. godotengine#48269.

(cherry picked from commit 562c6bd)

(cherry picked from commit d311c48)

Now correctly computes the timeout value in milliseconds.

(cherry picked from commit 46f7b0f)

It seems 30.0.1 had issues with compatibility with JDK 8 and 11,
which appear to be solved in 30.0.3 as per godotengine/godot-docs#4796.

(cherry picked from commit d88e1f0)

fixes godotengine#30229

(cherry picked from commit bab36f1)

…13 or later

(cherry picked from commit b77925d)

Fixes godotengine/godot-headers#89.

(cherry picked from commit 6ba10c6)

Add SkeletonIK function documentation

(cherry picked from commit 84e603e)

…ials

(cherry picked from commit 8df0e61)

(cherry picked from commit fd7141f)

(cherry picked from commit 0477256)

Library suffix should be `.a`, the `EXTRA_` in
`EXTRA_EXPORTED_RUNTIME_METHODS` is deprecated.

(cherry picked from commit b0f6dec)

(cherry picked from commit 2757728)

(cherry picked from commit 7516ff3)

…thread to avoid race condition.

(cherry picked from commit 301bedd)

All my earlier test cases for software skinning had the polys parent transform to be identity. This works fine until you had cases where the user had moved the transform of the parent nodes of skinned polys.

This PR fixes this situation by taking into account the final (concatenated) transform of the polys RELATIVE to the skeleton base transform. It does this by applying the inverse skeleton base transform to the poly final transform.

(cherry picked from commit f33e220)

(cherry picked from commit 05ad089)

…le is selected

(cherry picked from commit a1b9030)

(cherry picked from commit 3f1b95c)

(cherry picked from commit b4cc8ed)

Fix for a regression from software skinning support:
instance_attach_skeleton wasn't called in set_mesh before, and it's
causing issues when the mesh instance is loaded from a thread.
1. Call from a thread queues instance_attach_skeleton with RID() in the
visual server.
2. Call from the main thread when entering tree calls
instance_attach_skeleton immediately with a valid skeleton
3. Queued instance_attach_skeleton resets the attached skeleton

This change prevents that to happen by making sure
instance_attach_skeleton is not called on set_mesh as it was doing
before, but there might be a more general problem to solve in how
visual server commands are executed when resources are loaded from
a different thread.

(cherry picked from commit feee9f9)

(cherry picked from commit 67987be)

(cherry picked from commit f04a964)

(cherry picked from commit 2c64008)

…ct all the content

(cherry picked from commit 74b3021)

(cherry picked from commit 0bb40df)

Since we clone the environments to build thirdparty code, we don't get an
explicit dependency on the build objects produced by that environment.

So when we update thirdparty code, Godot code using it is not necessarily
rebuilt (I think it is for changed headers, but not for changed .c/.cpp files),
which can lead to an invalid compilation output (linking old Godot .o files
with a newer, potentially ABI breaking version of thirdparty code).

This was only seen as really problematic with bullet updates (leading to
crashes when rebuilding Godot after a bullet update without cleaning .o files),
but it's safer to fix it everywhere, even if it's a LOT of hacky boilerplate.

(cherry picked from commit c7b53c0)
(cherry picked from commit e94161d)

This will enforce that PRs properly sync the class reference templates to match
their changes to the public API, and help notice binding bugs in the process
(e.g. missing enum bindings, unexpected API changes or missing argument names).

This should also serve as a reminder to contributors that their changes impact
the scripting API and might warrant actually filling the descriptions for the
new methods/properties/etc.

(cherry picked from commit b388412)

(cherry picked from commit 73e2ccd)

Fixes godotengine#48482.

(cherry picked from commit e53422c)

(cherry picked from commit 2071799)

Changes based on fix in godotengine#46898

(cherry picked from commit 57e3f35)

File system dock previews will now be generated for 3D scenes when no
editor feature profile is set.

(cherry picked from commit 16304aa)

…odot

(cherry picked from commit 5f098d6)

Can be useful for custom drawing of physics shapes without having to add
a collision object node to the tree.

(cherry picked from commit 0ba5001)

(cherry picked from commit 94d0c41)

(cherry picked from commit 7624051)

(cherry picked from commit 0ad0f71)

(cherry picked from commit 2c4aa50)

… without overrides

(cherry picked from commit c1bc87e)

There's still some fishy recursive relationship between `load_interactive` and
`load` which needs to be investigated here, but this patch solves the crash
when returning an error code in user-defined `load`.

Fixes godotengine#48463.

(cherry picked from commit bf9f288)

(cherry picked from commit 3dd2e5d)

(cherry picked from commit eed4655)

(cherry picked from commit b90adec)

For consistency with the native one, and the documentation.

(cherry picked from commit 6243835)

Fixes godotengine#48514 by moving the visibility of these buttons into their own if statement that depends on if scene tree editing is allowed. Previously it was under the script editing setting which is unexpected as it works with nodes and the scene tree.

(cherry picked from commit 10d5d4d)

Removes an extra separator when Scene Tree Editing is disabled. Discussed in godotengine#48518

(cherry picked from commit e168baf)

No longer used in 3.3+.

(cherry picked from commit 3faf8d6)

The custom editor theme is only visible after restarting the editor.

(cherry picked from commit 027301f)

We don't get updates when the window is unfocused/minimized, so we must
detect the situation where the counted ticks start drifting away
resulting in more frames drawn than needed.
This commit adds a check to ensure that the target ticks do not drift
away more than one second.

(cherry picked from commit a1fe6d6)

(cherry picked from commit 0b47f1b)

(cherry picked from commit 7350f90)

When using a negative contrast value, the base color will be lightened
to create the derivative colors instead of being darkened.

This can lead to better-looking themes, especially for light themes.

(cherry picked from commit e7e2ef0)

Supersedes godotengine#47321.
Fixes godotengine#47313.

(cherry picked from commit ee86dc3)

Adds another key shortcut to instance a scene in the scentree dock. Complements ctrl+a to add a node.

(cherry picked from commit ea54456)

(cherry picked from commit 60ee8c9)

Fix doc issues