Cherry-picks for the 4.1 branch (future 4.1.4) - 1st batch #87514
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
…ditor When the name suffix grows, the old name is used if it is obtained first. Fix the case where the following error message would appear when renaming an animation. ``` ERROR: Animation '' doesn't exist. at: get_frame_count (scene/resources/sprite_frames.cpp:71) ``` (cherry picked from commit e9cd29c)
This would cause `updown.png` to be ignored in our default theme in 3.x. These ignores were added in godotengine#36800 for godotengine#36572 (see that PR for usage instructions). From a quick test, using `--output-file` for `lcov` and `--output-directory` for genhtml let us output the files in a way that won't conflict with the Git repository (e.g. in `bin/`, or outside the Git repo). (cherry picked from commit 5c38e42)
(cherry picked from commit 90f3992)
(cherry picked from commit c48b189)
(cherry picked from commit c1c4a09)
…collection. (cherry picked from commit a5a0e48)
Implements the {project} placeholder, available when setting an external editor
in the project settings, via Editor > Editor Settings > Text Editor > External
for the c# external editor, under Editor > Editor Settings > Dotnet > Editor,
This allows passing the project folder as a command line argument when using a
custom external editor that isn't one of the available options.
Fixes godotengine#81845
(cherry picked from commit c01a478)
For example, searching for ".func" will now match in "a.func" even with Whole Words enabled. (cherry picked from commit 676627e)
(cherry picked from commit 5cd7ca0)
`Input::joy_axis` converts trigger values to be between 0.0f to 1.0f by default. This is not needed for Android, as values are already within that range, as per Android documentation: https://developer.android.com/reference/android/view/MotionEvent#AXIS_RTRIGGER This patch prevents this conversion on Android, which caused L2 and R2 triggers to get stuck pressed. godotengine#79263 (cherry picked from commit d413a02)
The documentation stated the track was added to this, instead of `to_animation` (cherry picked from commit 9d23956)
… path issue reference [godotengine#81769] - adding a nullptr check on a Node pointer obtained from get_node(NodePath) in case it is null now we wont execute the next instruction > ClassDB::get_property_info(nd->get_class(), prop, &prop_info); Which then prevents the crash (cherry picked from commit e7a35d1)
(cherry picked from commit d53529f)
(cherry picked from commit f721b34)
(cherry picked from commit cbb39f4)
(cherry picked from commit ce421da)
Invalidly returned `true` on the non-matched path (cherry picked from commit b04cf84)
(cherry picked from commit 704f085)
Documents that these notifications are only sent for touch events. (cherry picked from commit 44f62a4)
…ntly (cherry picked from commit a0253e5)
GitHub Actions output is not considered a TTY, so colored output must be forced. (cherry picked from commit dec26e1)
Invalidly returned `true` on the non-matched path (cherry picked from commit 3ef6314)
(cherry picked from commit 0573122)
(cherry picked from commit 6099d9f)
(cherry picked from commit 173e2c7)
- Enabling newly created addons can show a warning dialog, doing so before hiding the `ProjectSettingsEditor` dialog causes rendering glitches. - Remove unused `PuginConfigDialog` in `EditorNode`. The one actually being used is an instance in `EditorPluginSettings`. (cherry picked from commit 7b34fa8)
"Export as dedicated server" now uses a less confusing heading. (cherry picked from commit 73c1b21)
(cherry picked from commit 210461f)
(cherry picked from commit a3172ae)
(cherry picked from commit a675599)
AThousandShips
approved these changes
Jan 24, 2024
|
That's more than enough for me :) |
akien-mga
approved these changes
Jan 24, 2024
|
Well that was timely! :D Thanks for reviews |
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 is the first batch of two for the 4.1 branch. It includes
almostevery PR has been marked for cherry-picking and which is already included in 4.2:https://github.com/godotengine/godot/pulls?q=is%3Apr+is%3Amerged+label%3Acherrypick%3A4.1+-label%3Acherrypick%3A4.2+sort%3Aupdated-asc+
There are two more PRs fitting this criteria, but I need some help deciding on them. Can include them later, if we decide to pick them.The second batch is going to include all PRs which are currently marked for cherry-picking for both 4.1 and 4.2. After that we can start building RC1.