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

[4.2] Backport miscellaneous changes that can't be cherry-picked #1460

Merged
merged 1 commit into from
May 9, 2024

Conversation

dsnopek
Copy link
Collaborator

@dsnopek dsnopek commented May 8, 2024

PRs #1374 and #1450 can't be cherry-picked (because they are for things only in Godot 4.3), but there's two little changes that could be included in 4.2 and 4.1.

Since we still cherry-pick so much to the 4.2 and 4.1 branches, I'd like them to remain as synchronized as possible, in order to avoid creating conflicts that make future cherry-picks harder.

So, this PR just brings these two little miscellaneous changes to 4.2, which should cherry-pick fine to 4.1 too.

(I kind of regret not splitting these out into their own PRs so they could be cherry-picked like normal, but they are so tiny, I think this is probably fine)

@dsnopek dsnopek added bug This has been identified as a bug cherrypick:4.1 labels May 8, 2024
@dsnopek dsnopek requested a review from a team as a code owner May 8, 2024 21:58
Copy link
Member

@AThousandShips AThousandShips left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks safe

@AThousandShips AThousandShips added this to the 4.2 milestone May 9, 2024
@dsnopek
Copy link
Collaborator Author

dsnopek commented May 9, 2024

Thanks for the review!

@dsnopek dsnopek merged commit b28098e into godotengine:4.2 May 9, 2024
12 checks passed
@dsnopek
Copy link
Collaborator Author

dsnopek commented May 17, 2024

Cherry-picked for 4.1 in PR #1466

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
bug This has been identified as a bug
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants