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

Jump to bottom

Android: Separate GameCube overlay refresh logic #8739

Merged
merged 1 commit into from Jun 21, 2020
Merged

Android: Separate GameCube overlay refresh logic #8739

merged 1 commit into from Jun 21, 2020

Conversation

Ebola16
Copy link
Member

@Ebola16 Ebola16 commented Apr 12, 2020 •
edited

Wii overlay changes will be made in a subsequent PR.

Other minor changes:

  • Renamed emulation menu's "Configure Controls" to "Overlay Controls", since the former could be misinterpreted as applying to all players.
  • Added a "None" controller. It is primarily used for disabled controllers and real controllers (as an overlay is useless if Player 1 is using a real controller).

@Ebola16 Ebola16 force-pushed the GCOVERLAY branch 2 times, most recently from 61fca65 to 5d0e06c Compare April 17, 2020 09:47
@Ebola16
Copy link
Member Author

Ebola16 commented Apr 17, 2020

#8735 has been merged so this is ready for review.

@Ebola16
Copy link
Member Author

Ebola16 commented May 2, 2020

Any feedback on this? I'd like to get this merged as it's needed for future PRs.

@JosJuice
Copy link
Member

JosJuice commented May 3, 2020

If I'm reading the code right, enabling/disabling a GameCube controller in the settings activity or simply just running a GameCube game will make it so that the overlay controller used for Wii games becomes a GameCube controller. It doesn't make sense to me that Dolphin would change the controller type like that automatically. Or did I misread the code?

@Ebola16 Ebola16 changed the title Android: GameCube overlay controller enables controller and vice versa Android: Separate GameCube overlay refresh logic May 3, 2020
@Ebola16
Copy link
Member Author

Ebola16 commented May 3, 2020 •
edited

You read the code correctly. I think I found a way to accomplish the same thing without touching SharedPreferences.

@Ebola16
Copy link
Member Author

Ebola16 commented May 4, 2020

Fixed a typo that caused problems with the Nunchuk overlay.

@Ebola16
Copy link
Member Author

Ebola16 commented May 10, 2020

Did I take care of @JosJuice's concerns?

@Ebola16
Copy link
Member Author

Ebola16 commented May 18, 2020

Is there anything holding this PR back?

@Ebola16
Copy link
Member Author

Ebola16 commented May 26, 2020

Can this PR be merged? I don't think there's any drawbacks to it anymore.

@Ebola16
Copy link
Member Author

Ebola16 commented Jun 11, 2020

Can this PR be merged?

JosJuice
JosJuice approved these changes Jun 16, 2020
View reviewed changes
Copy link
Member

@JosJuice JosJuice left a comment

Choose a reason for hiding this comment

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

Untested, but the code seems fine now.

@Ebola16
Copy link
Member Author

Ebola16 commented Jun 21, 2020 •
edited

Wii Overlay PR is almost complete and this is required (likely along with #8803 to give users the option to disable GC Player 1 emulated controller when enabling the emulated wii remote and vice versa). Please merge these PRs.

@JosJuice JosJuice merged commit 08c93ad into dolphin-emu:master Jun 21, 2020
@Ebola16 Ebola16 deleted the GCOVERLAY branch June 21, 2020 16:21
@Ebola16 Ebola16 mentioned this pull request Jun 22, 2020
Closed
3 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@JosJuice JosJuice JosJuice approved these changes

Assignees
No one assigned
Labels
None yet
Milestone
No milestone
2 participants
@Ebola16 @JosJuice