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

Added Xbox One S controller mappings #645

Merged
merged 2 commits into from Apr 26, 2017
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
26 changes: 25 additions & 1 deletion jme3-core/src/main/resources/joystick-mapping.properties
Expand Up @@ -72,6 +72,7 @@ Controller\ (XBOX\ 360\ For\ Windows).ry=rz
# requires custom code to support trigger buttons but this
# keeps it from confusing the .rx mapping.
Controller\ (XBOX\ 360\ For\ Windows).z=trigger
Controller\ (XBOX\ 360\ For\ Windows).rz=rtrigger

# XBOX 360 Controller connected to Android using
# the USB dongle
Expand Down Expand Up @@ -110,6 +111,7 @@ Gamepad\ F310\ (Controller).ry=rz
# requires custom code to support trigger buttons but this
# keeps it from confusing the .rx mapping.
Gamepad\ F310\ (Controller).z=trigger
Gamepad\ F310\ (Controller).rz=rtrigger

# Logitech F310 gamepad with dip switch XInput for Windows 10
Controller\ (Gamepad\ F310).0=2
Expand All @@ -129,6 +131,7 @@ Controller\ (Gamepad\ F310).ry=rz
# requires custom code to support trigger buttons but this
# keeps it from confusing the .rx mapping.
Controller\ (Gamepad\ F310).z=trigger
Controller\ (Gamepad\ F310).rz=rtrigger

# Alternate version of the XBOX 360 controller
XBOX\ 360\ For\ Windows\ (Controller).0=2
Expand All @@ -148,6 +151,27 @@ XBOX\ 360\ For\ Windows\ (Controller).ry=rz
# requires custom code to support trigger buttons but this
# keeps it from confusing the .rx mapping.
XBOX\ 360\ For\ Windows\ (Controller).z=trigger
XBOX\ 360\ For\ Windows\ (Controller).rz=rtrigger

#Xbox One S controller
Microsoft\ X-Box\ One\ S\ pad.0=2
Microsoft\ X-Box\ One\ S\ pad.1=1
Microsoft\ X-Box\ One\ S\ pad.2=3
Microsoft\ X-Box\ One\ S\ pad.3=0

Microsoft\ X-Box\ One\ S\ pad.6=8
Microsoft\ X-Box\ One\ S\ pad.7=9

Microsoft\ X-Box\ One\ S\ pad.8=10
Microsoft\ X-Box\ One\ S\ pad.9=11

Microsoft\ X-Box\ One\ S\ pad.rx=z
Microsoft\ X-Box\ One\ S\ pad.ry=rz

# requires custom code to support trigger buttons but this
# keeps it from confusing the .rx mapping.
Microsoft\ X-Box\ One\ S\ pad.z=trigger
Microsoft\ X-Box\ One\ S\ pad.rz=rtrigger

# from : Freebox controller as "DragonRise Inc. Generic USB Joystick"
DragonRise\ Inc.\ \ \ Generic\ \ \ USB\ \ Joystick.x=rx
Expand All @@ -174,4 +198,4 @@ GASIA\ CORP.\ PLAYSTATION(R)3\ Controller.2=11
GASIA\ CORP.\ PLAYSTATION(R)3\ Controller.5=POV +X
GASIA\ CORP.\ PLAYSTATION(R)3\ Controller.6=POV -Y
GASIA\ CORP.\ PLAYSTATION(R)3\ Controller.7=POV -X
GASIA\ CORP.\ PLAYSTATION(R)3\ Controller.4=POV +Y
GASIA\ CORP.\ PLAYSTATION(R)3\ Controller.4=POV +Y