Merge commit godotengine/godot@ad9abe8 #960
Merged
+498,014
−149,351
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Some tests have been removed since there's no way to guarantee they will pass. Other tests have been refactored to ensure proper waiting, and taking into account potential out-of-order delivery (which is unlikely in test scenarios but expecting a specific order on a UDP socket is wrong and OSes makes no promises of ordered delivery on localhost).
Clarify that the callback must take **exactly one array argument**.
Following the "compiling for mac" tutorial one will eventually end with a Godot.app package inside the repo folder. To prevent it from being tracked by git, it has been added to gitignore.
Co-authored-by: Hugo Locurcio <[email protected]>
Also remove unused `UavCrossPlatform_piece_all.glsl`.
Co-authored-by: Tomasz Chabora <[email protected]>
This reverts commit fd5fc9f. This caused significant regressions which are worse than the bug that #96499 aimed to address. - Reverts #96499. - Reopens #95909. - Supersedes #102063. - Fixes #99006. - Fixes #101615.
This reverts commit c91c604. This caused a critical regression: - Fixes #102374.
…ernal, this triggers a ClassDB bug Fixes #99534.
Use `editing_integer` so that editor has step buttons
…crash Fix crash when assigning wrong shader to particle process material
Display correct symbol in warning when unique name is used without @onready annotation
Navigate to folder when double-clicking favorite
Fix mouse input on popup shadows misbehaving with `content_scale_factor`
Wayland: Unstuck keys with same keycode
Revert finalizing `GodotHost#getCommandLine()` public API
2D: Fix free of invalid ID
…imation_node Prevent off-thread errors when generating resource previews for animation nodes
…to_break_your_selection Don't select invisible items in FileSystem dock
[Web] Remove position pool system and return false when done instead
Clarify the behavior of `Control.layout_direction` in the documentation
CI: Remove outdated reference to ubuntu-20.04
Skip `Object::to_string` when Jolt Physics is on separate thread
Remove problematic file from SCU
Spartan322
force-pushed
the
merge/ad9abe8
branch
2 times, most recently
from
1048c31 to
180365a
Compare
Spartan322
force-pushed
the
merge/ad9abe8
branch
from
180365a to
e2d0cc2
Compare
mcdubhghlas
approved these changes
Feb 12, 2025
decryptedchaos
approved these changes
Feb 12, 2025
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This resets everything in doc/translations to Godot's version of them as it is unmanageable to deal with conflicts there. We need to maintain a separated manageable doc translations directory.