Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Cherry-picks for the 4.1 branch (future 4.1.4) - 3rd batch #89340

Merged
merged 69 commits into from
Mar 12, 2024

Conversation

akien-mga
Copy link
Member

Conservative subset of #89339.

bruvzg and others added 8 commits March 9, 2024 23:30
Prevents errors with input being invalid format strings

(cherry picked from commit 6da378a)
(cherry picked from commit 2696fee)
When using proxy_to_pthread we add BIGINT support (to support exchanging
64 bits integers between wasm and JS).

Bigint though, is part of ECMAScript 2020, and the closure compiler was
using ECMAScript 6 instead.

This commit update the CC configuration to use ECMAScript 2020 instead.

(cherry picked from commit e9df955)
adamscott and others added 17 commits March 11, 2024 15:01
…hare the same database

SConscript("some SCsub path") calls create a new context where a relative path
to the .sconsign file is interpreted as being next to the currently executing
SCsub, and not the one at the root. This breaks incremental build detection
because scons can't find the build information of dependent files outside of the
SCsub directory and just rebuilds everything every time.

(cherry picked from commit 0b43b01)
(cherry picked from commit ad8d3cf)
We had a slightly older version of it for UWP, as the wincrypt API isn't allowed there.
We removed this with UWP in godotengine#81416, but since this was enabled inconditionally before,
this actually changed behavior for Windows compared to Godot 4.1 and earlier.

This change is also needed to properly supported Windows Store.

(cherry picked from commit b9d008d)
(cherry picked from commit ab14dec)
(cherry picked from commit 41268d7)
LaunchImages are deprecated, and Storyboard is supported on all currently
supported iOS versions, so this should be the default.

LaunchImages support was removed in 4.3 with godotengine#86312.

(cherry picked from commit 91c5d1e)
Global position doesn't get adjusted within `InputEventMouse::xformed_by()`.

(cherry picked from commit 8de3991)
…y backend

Compile the unlit version by default to save on both cache size and compile time

(cherry picked from commit f1781fe)
(cherry picked from commit 207bd34)
bruvzg and others added 7 commits March 11, 2024 23:42
The auth implementation was treating any received packet as a remote
confirmation after the peer was confirmed locally.

It now correctly awaits for the remote confirmation packet before
admitting new peers.

(cherry picked from commit 754036f)
@clayjohn
Copy link
Member

Looks fine to me!

@akien-mga akien-mga marked this pull request as ready for review March 11, 2024 23:18
@akien-mga akien-mga requested review from a team as code owners March 11, 2024 23:18
Mickeon added 2 commits March 12, 2024 00:37
(cherry picked from commit 38cd13c)
Co-Authored-By: Aaron Franke <arnfranke@yahoo.com>
(cherry picked from commit 58ddd84)
@akien-mga akien-mga merged commit fbc4a7e into godotengine:4.1 Mar 12, 2024
14 checks passed
@akien-mga akien-mga deleted the 4.1-cherrypicks branch March 12, 2024 21:44
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.