diff options
| author | Simon Howard | 2015-04-11 22:54:00 -0400 |
|---|---|---|
| committer | Simon Howard | 2015-04-11 22:54:00 -0400 |
| commit | 19f2e55200a8a9fb12faa99cd5ed424ad5a10391 (patch) | |
| tree | 025fea4dbd75c4b1ea9c817cd4c21118f8a479ad /src | |
| parent | 5ddb558a635208d9c08210be8283c83a8d45278f (diff) | |
| parent | 72d926022a4903df4cb2bb4822fd308cae797af1 (diff) | |
| download | chocolate-doom-19f2e55200a8a9fb12faa99cd5ed424ad5a10391.tar.gz chocolate-doom-19f2e55200a8a9fb12faa99cd5ed424ad5a10391.tar.bz2 chocolate-doom-19f2e55200a8a9fb12faa99cd5ed424ad5a10391.zip | |
Merge pull request #521 from chungy/xbone-pad
setup: add support for the Xbox One controller on Linux
Diffstat (limited to 'src')
| -rw-r--r-- | src/setup/joystick.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/src/setup/joystick.c b/src/setup/joystick.c index db4ad258..07beadcd 100644 --- a/src/setup/joystick.c +++ b/src/setup/joystick.c @@ -352,6 +352,13 @@ static const known_joystick_t known_joysticks[] = xbox360_controller_linux, }, + // Xbox One controller as it appears on Linux. + { + "Microsoft X-Box One pad", + 6, 11, 1, + xbox360_controller_linux, + }, + { "Logitech Dual Action", 4, 12, 1, |