Closed Gabe-Mitnick closed 6 years ago
fixed a merge conflict where i had changed some names referenced in lines which were newly commented out. now the pull request has those lines commented out, but with the new names.
now it has the left and right joystick axes too. (before i just did buttons.)
@Gabe-Mitnick can you resolve the conflicts in your fork and then re-commit and push so that we can merge cleanly?
@brettle it's good to go
also fix naming naming of some buttons and change "outake" to "outtake"