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

doom: Fix key_menu_forward in Crispness menu #1112

Merged
merged 1 commit into from
Nov 22, 2023
Merged

doom: Fix key_menu_forward in Crispness menu #1112

merged 1 commit into from
Nov 22, 2023

Conversation

mikeday0
Copy link
Collaborator

@mikeday0 mikeday0 commented Nov 22, 2023

key_menu_forward should behave like key_menu_right for enum items in the Crispness menu.

Trying to correct a dumb oversight from the last time I touched this code. 🤦‍♂️ Better late than never!

key_menu_forward should behave like key_menu_right for enum items in the
Crispness menu.
@fabiangreffrath
Copy link
Owner

Thanks for this! While at it, I had a hard time merging your latest changes to joystick input from chocolate-doom/master lately and still couldn't get it to finish. So, if you wouldn't mind helping to merge these changes into Crispy, that'd be appreciated.

@turol
Copy link
Collaborator

turol commented Nov 22, 2023

@mikeday0 mikeday0 merged commit 2bb67ed into master Nov 22, 2023
6 checks passed
@mikeday0 mikeday0 deleted the crispyenter branch November 22, 2023 13:16
@mikeday0
Copy link
Collaborator Author

Thanks for this! While at it, I had a hard time merging your latest changes to joystick input from chocolate-doom/master lately and still couldn't get it to finish. So, if you wouldn't mind helping to merge these changes into Crispy, that'd be appreciated.

Sure, I'll give it a go.

@mikeday0
Copy link
Collaborator Author

I've got all the joystick/gamepad and other changes merged locally and everything seems to be working correctly. I wanted to check with you about the CI changes - are those okay to merge? msys2.yml gets deleted and all of its contents are instead incorporated into main.yml. Also there are two main.yml conflicts needing resolution:

  1. name is 'Continuous Integration' in upsteam, 'build' in Crispy
  2. "**.yml" is removed from paths-ignore in upstream.

Any suggestions?

@fabiangreffrath
Copy link
Owner

@rfomin can we take over all CI changes from upstream into Crispy?

@rfomin
Copy link
Collaborator

rfomin commented Nov 23, 2023

@rfomin can we take over all CI changes from upstream into Crispy?

Yes, sure. I can make a PR.

@rfomin
Copy link
Collaborator

rfomin commented Nov 23, 2023

name is 'Continuous Integration' in upsteam, 'build' in Crispy

I think it should be named 'Continuous Integration'.

"**.yml" is removed from paths-ignore in upstream.

I have edited workflow files many times in a row and made this exception and then forgot to remove it. So I think that the "**.yml" exception should be removed.

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.

4 participants