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.2 branch (future 4.2.3) - 1st batch #91156

Merged
merged 6 commits into from
Apr 29, 2024

Conversation

akien-mga
Copy link
Member

@akien-mga akien-mga commented Apr 25, 2024

Very early, I'll add more commits. But making a draft PR already so I don't forget the ones already cherry-picked.

Edit: Will merge this small batch already to fix CI.

akien-mga and others added 4 commits April 25, 2024 12:54
No change for the files we include.

(cherry picked from commit afe64bb)
When travel is high enough, keep the global position resulting from the
move_and_collide call, and set the motion to the remainder from the
move_and_collide call. This ensures travel is taken into account once,
rather than twice.

(cherry picked from commit 80c600d)
Creates a universal build, to catch discrepancies on different
architectures

(cherry picked from commit 24ad73b)
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.

I think it'd be good to get at least the CI fixes in to help any PRs on 4.2

In some cases it can happen, that the order of input events and
window events is not followed, when input buffering or input accumulation
is active.

The display server order `InputEvent` => window-event gets changed to
window-event => `InputEvent` which becomes problematic in certain
situations.

This PR makes sure, that the order is adhered to by flushing input events
before a window event is sent.
Previously this problem was mitigated by discarding these delayed events.
But this solution was problematic in the setting of android input events.

(cherry picked from commit 945babc)
@akien-mga akien-mga marked this pull request as ready for review April 29, 2024 08:24
@akien-mga akien-mga requested review from a team as code owners April 29, 2024 08:24
@akien-mga akien-mga merged commit 190cbcf into godotengine:4.2 Apr 29, 2024
15 checks passed
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.

4 participants