+11 −0

settingtypes.txt

builtin/settingtypes.txt

+1 −0

CMakeLists.txt

src/client/CMakeLists.txt

+19 −1

clientlauncher.cpp

src/client/clientlauncher.cpp

+13 −0

inputhandler.h

src/client/inputhandler.h

+179 −0

joystick_controller.cpp

src/client/joystick_controller.cpp

+163 −0

joystick_controller.h

src/client/joystick_controller.h

+85 −0

keys.h

src/client/keys.h

+3 −1

content_cao.cpp

src/content_cao.cpp

+3 −0

defaultsettings.cpp

src/defaultsettings.cpp

+227 −183

game.cpp

src/game.cpp

+4 −0

game.h

src/game.h

+2 −0

guiEngine.cpp

src/guiEngine.cpp

+2 −1

guiEngine.h

src/guiEngine.h

+34 −8

guiFormSpecMenu.cpp

src/guiFormSpecMenu.cpp

+9 −4

guiFormSpecMenu.h

src/guiFormSpecMenu.h

+11 −6

localplayer.cpp

src/localplayer.cpp

+9 −1

player.h

src/player.h