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.1) - 1st batch #79297

Merged
merged 77 commits into from
Jul 11, 2023

Conversation

YuriSizov
Copy link
Contributor

Not including changelog for now.

Daylily-Zeleen and others added 30 commits July 10, 2023 17:11
…escape`"

This reverts commit 7f547fc.

(cherry picked from commit bfa7497)
(cherry picked from commit fc40ba2)
Previously the call was executed every time, because in the
`_drop_mouse_over();` a few lines above, `gui.mouse_over = nullptr;`
was set.

(cherry picked from commit 37a96d3)
This does not fix Camera3D::project_ray_normal().
Adds Camera3D::get_camera_projection() and exposes it to GDScript

(cherry picked from commit 47e63bc)
(cherry picked from commit d17c522)
(cherry picked from commit d667402)
@YuriSizov YuriSizov requested review from a team as code owners July 10, 2023 16:16
Copy link
Member

@akien-mga akien-mga left a comment

Choose a reason for hiding this comment

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

Looks good to me. Pre-emptively approving, though I'm aware Yuri will add a couple cherry-picks from PRs merged today (also approved by me).

timothyqiu and others added 6 commits July 11, 2023 12:21
We can't rely on the error code from `gio` or `kioclient5`, in my
rudimentary testing they return `1` for both missing files and other
situations like not having a Trash can on the mounted volume.

Fixes godotengine#79108.

(cherry picked from commit a6e75f3)
CHANGELOG.md Outdated Show resolved Hide resolved
CHANGELOG.md Outdated Show resolved Hide resolved
CHANGELOG.md Outdated Show resolved Hide resolved
CHANGELOG.md Outdated Show resolved Hide resolved
@YuriSizov YuriSizov merged commit e709ad4 into godotengine:4.1 Jul 11, 2023
@YuriSizov YuriSizov deleted the 4.1-cherrypicks branch July 11, 2023 13:56
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.