-
-
Notifications
You must be signed in to change notification settings - Fork 21.6k
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
[3.x] Fix game controllers ignoring the last listed button #48934
Merged
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
For reference, this will be the mapping between SDL outputs and the enum values with this PR:
This is the current mapping:
This was the mapping prior to #45798:
This is the mapping on master:
|
akien-mga
reviewed
Jun 3, 2021
akien-mga
approved these changes
Jun 3, 2021
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Aside from my comment, seems good 👍
Thanks! |
Cherry-picked for 3.3.3. |
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.
Fixes #47579.
Addresses godotengine/godot-demo-projects#597 (comment).
Godot is missing the last listed button on the joypad. Until #45798, this was the
guide
button, a.k.a. the Home button on Xbox controllers and the PS button on DualShock controllers. With #45798 (included in 3.3) this is now thetouchpad
button. However, it also means that the newenum
s formisc1
,paddle1
,paddle2
,paddle3
,paddle4
, andtouchpad
introduced in #47598 are wrong too.This PR increases the value for
JOY_BUTTON_MAX
to 23, adds the missingenum
and corrects the values for theenum
s added in #45798. Technically this breaks compat, but, since theenum
s are new, no more so than #45798 itself and the Joypads Demo project was updated to support it already in godotengine/godot-demo-projects#597; so probably worth cherry-picking for 3.3.2.Note: This was fixed in 4.0 in #38151.