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

[3.x] Prevent double input events on gamepad when running through steam input #79706

Merged
merged 1 commit into from
Aug 2, 2023

Conversation

puzzud
Copy link

@puzzud puzzud commented Jul 20, 2023

Backported request #76045 from Eoin-ONeill-Yokai/steaminput-fix to branch 3.x.

@puzzud puzzud requested review from a team as code owners July 20, 2023 12:46
@AThousandShips AThousandShips added this to the 3.x milestone Jul 20, 2023
@AThousandShips AThousandShips requested a review from a team July 20, 2023 12:52
@AThousandShips AThousandShips removed their request for review July 20, 2023 12:59
@YuriSizov YuriSizov changed the title 3.x backport of request #76045 from Eoin-ONeill-Yokai/steaminput-fix [3.x] Prevent double input events on gamepad when running through steam input Jul 20, 2023
@AThousandShips
Copy link
Member

Since this largely copies the code from that PR I'd suggest attributation in the commit itself

@YuriSizov
Copy link
Contributor

Please squash commits into one as well. Make sure that the final commit has a short but descriptive message (the title of this PR is a good option). See this documentation, if you need help with squashing.

For the attribution you can use the Co-authored-by: syntax at the end of your commit message body.

@puzzud
Copy link
Author

puzzud commented Jul 20, 2023

Please squash commits

@YuriSizov, squashed, reworked commit message with attribution.

@AThousandShips
Copy link
Member

AThousandShips commented Jul 20, 2023

Needs to be with the GitHub email of the user to work, and put it on a separate line, you can find it in the git log if you check the original commit

@puzzud
Copy link
Author

puzzud commented Jul 20, 2023

Needs to be with the GitHub email of the user to work, and put it on a separate line, you can find it in the git log if you check the original commit

@AThousandShips, updated.

@AThousandShips
Copy link
Member

AThousandShips commented Jul 20, 2023

Still doesn't work, I think you need to add the user name and email, with parentheses around the email

Edit: with <> around the email, like so Eoin-ONeill-Yokai <[email protected]>

@puzzud
Copy link
Author

puzzud commented Jul 20, 2023

Still doesn't work, I think you need to add the user name and email, with parentheses around the email

@AThousandShips, okie doke. Done. Hopefully, it works.

@AThousandShips
Copy link
Member

Still no, try adding a space after :

@puzzud
Copy link
Author

puzzud commented Jul 20, 2023

@AThousandShips, what are we looking for? So I might look to know. Is there some hypertext that should be observed somewhere?

@Sauermann
Copy link
Contributor

You can find documentation about co-authoring here:
https://docs.github.com/en/pull-requests/committing-changes-to-your-project/creating-and-editing-commits/creating-a-commit-with-multiple-authors

@AThousandShips
Copy link
Member

AThousandShips commented Jul 20, 2023

It should have their icon show up by the commit, and say that they authored it by your name, unsure what breaks here, they might have changed their email on their profile

@puzzud
Copy link
Author

puzzud commented Jul 20, 2023

unsure what breaks here, they might have changed their email on their profile

I see. Looking at another commit I'm not seeing usage of the suffix "Yokai" in my desktop git application.
image

However, looking through github I do. An example of their commits: 8de98db

@Eoin-ONeill-Yokai, have you experienced git having issues with that name as such?

@AThousandShips
Copy link
Member

AThousandShips commented Jul 20, 2023

If you use the command line you'll see the exact usage in the log, it is Eoin O'Neill <[email protected]>

@puzzud
Copy link
Author

puzzud commented Jul 20, 2023

@AThousandShips, good catch. No dice, as far as I can tell.

@AThousandShips
Copy link
Member

AThousandShips commented Jul 20, 2023

See the instructions, needs two blank lines, sorry missed that myself

Tip: If you're using a text editor on the command line to type your commit message, ensure there are two newlines between the end of your commit description and the Co-authored-by: commit trailer.

@AThousandShips
Copy link
Member

Success!

@Eoin-ONeill-Yokai
Copy link
Contributor

Thanks for doing this on my behalf! I got a bit busy and forgot about Godot 3 :)

@puzzud
Copy link
Author

puzzud commented Jul 22, 2023

Thanks for doing this on my behalf! I got a bit busy and forgot about Godot 3 :)

@Eoin-ONeill-Yokai, thanks for doing it to begin with.

puzzud added a commit to puzzud/godot that referenced this pull request Jul 27, 2023
Copy link
Member

@lawnjelly lawnjelly left a comment

Choose a reason for hiding this comment

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

Looks like this got forgotten. It looks to match the master PR and looks fairly sensible, I'm assuming author has tested.

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.

@akien-mga akien-mga modified the milestones: 3.x, 3.6 Aug 2, 2023
@puzzud
Copy link
Author

puzzud commented Aug 2, 2023

I'm assuming author has tested.

Tested.

@akien-mga akien-mga merged commit dfed698 into godotengine:3.x Aug 2, 2023
13 checks passed
@akien-mga
Copy link
Member

Thanks! And congrats for your first merged Godot contribution 🎉

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.

7 participants