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

Resolved all button mappings for Xbox 360 Controller + fixed any invalid mappings found #1748

Merged
merged 1 commit into from Nov 10, 2012

Conversation

rowanborder
Copy link
Contributor

Resolved all button mappings for a Microsoft Xbox 360 Controller and added documentation for reference at the start of the file. Corrected all invalid button mappings found.

@elupus
Copy link
Contributor

elupus commented Nov 7, 2012

Rebase squash and force push to same branch again.

@rowanborder
Copy link
Contributor Author

Sorry, I'm really new to GitHub and the XBMC Project. What does that mean exactly? :)

@jmarshallnz
Copy link
Contributor

git rebase -i HEAD~8

Follow the instructions.

@rowanborder
Copy link
Contributor Author

Is that fully rebased now?

@elupus
Copy link
Contributor

elupus commented Nov 7, 2012

Rebased yes, squashed no. You still have two commits (you want a HEAD~2 on that rebase now), and your commit comment is duplicated several times so you need to correct the text when it asks for the commit string.

@jmarshallnz
Copy link
Contributor

git commit --amend will alter the top commit message (seems to only be one left now).

@elupus
Copy link
Contributor

elupus commented Nov 7, 2012

Ok, sorry.. it's squashed now to one commit. but text string is still messy. HEAD~1 for the rebase, and only ask to re-word.

@rowanborder
Copy link
Contributor Author

Ok think I've got it sorted now. Sorry I'm a real newbie to this and working with TortoiseGit on Windows not in Linux command line. Thanks.

…added documentation for reference at the start of the file. Corrected all invalid button mappings found. Added all known altnames for Xbox 360 Controllers as suggested by natethomas in the thread:

http://forum.xbmc.org/showthread.php?tid=144713

Signed-off-by: Rowan Border <rowanjborder@gmail.com>
jmarshallnz added a commit that referenced this pull request Nov 10, 2012
Resolved all button mappings for Xbox 360 Controller + fixed any invalid mappings found
@jmarshallnz jmarshallnz merged commit 492e262 into xbmc:master Nov 10, 2012
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.

None yet

3 participants