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

Add Joystick "Back" Button #2407

Merged
merged 7 commits into from
Oct 2, 2022
Merged

Conversation

jefetienne
Copy link
Contributor

I have rebased #2367 to fix conflicts from upstream and also applied a couple other needed fixes for the pull request.

@argonius2 I assume you want to have credit as well which is why I have kept your commits!

argonius2 and others added 7 commits August 11, 2022 21:25
Adding a new button action that allows players to back out of UI screens with a button on the controller, just like how the escape key is used to back out of UI screens on the keyboard.
Key binding can be set in the joystick controller configuration dialog.
Pause key binding renamed in code so it isn't confused with the UI exit binding.
* Renaming the UiExit key binding to Back
* extending the joystickUICache to hold the Back Key
* moving key checking functions to be closer to the other similar mouse functions in inputmanager
* ensuring that the controller is enabled before checking the back button is pressed
Renaming GetBackKey functions to GetBackButton since the name Button makes more sense for a controller button.
- Issue caused by renaming 'Escape' Action enum to 'Pause'
- Unused in game so far, but could be used by modders
- The DFU method was accidentally considering secondary keybind equivalents which is unnecessary + causes overhead
- Turns out we did need that function after all
@Interkarma
Copy link
Owner

Thank you @jefetienne. I'll finish review on this one soon and aim to merge ahead of next release. Cheers! :)

@Interkarma Interkarma merged commit e98af05 into Interkarma:master Oct 2, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants