Merge with develop

This commit is contained in:
emb
2015-07-27 12:52:59 -05:00
20 changed files with 485 additions and 85 deletions

View File

@@ -11,8 +11,56 @@ back = Escape
quit = Q
# See below for a list of key codes that can be used for configuring the controls:
##############################################################################
MOUSE CODES
###################### ######################################################
# Code # Description
###################### ######################################################
# mouseButtonLeft Left mouse click
# mouseButtonMiddle Middle mouse click
# mouseButtonRight Right mouse click
# mouseButtonX1 ?
# mouseButtonX2 ?
##############################################################################
JOYSTICK/GAMEPAD CODES
###################### ######################################################
# Code # Description
###################### ######################################################
# X is joypad number (0 is first joystick/gamepad)
# joyXHatYLeftUp Y=hat number (0 is the first dpad) (example joy0Hat0Up)
# joyXHatYLeft
# joyXHatYLeftDown
# joyXHatYUp
# joyXHatYDown
# joyXHatYRightUp
# joyXHatYRight
# joyXHatYRightDown
# joyXButtonY Y is button number (0 is first button)
# Example: joy1button7 -> second joystick, 8th button
# Open up the gamepad control panel in windows or use
# "jstest" in linux
#
# joyXAxis0+ First POV stick, first axis positive direction
# (axis 0 is usually x)
# joyXAxis0- First POV stick, first axis positive direction
# (axis 0 is usually x)
# joyXAxis1+ First POV stick, second axis positive direction
# (axis 0 is usually y)
#joyXAxis1- First POV stick, second axis positive direction
# (axis 0 is usually y)
#
# joyXAxis2+ Second POV stick, first axis positive direction
# (axis 2 is usually x)
# joyXAxis2- Second POV stick, first axis positive direction
# (axis 2 is usually x)
# joyXAxis3+ Second POV stick, second axis positive direction
# (axis 3 is usually y)
# joyXAxis3- Second POV stick, second axis positive direction
# (axis 3 is usually y)
##############################################################################
KEYBOARD CODES
###################### ######################################################
# Code # Description
###################### ######################################################

View File

@@ -12,8 +12,8 @@
# Display
#######################################
fullscreen = no
horizontal = stretch # or enter in the screen pixel width (i.e 1024)
vertical = stretch # or enter in the screen pixel width (i.e 768)
horizontal = 400 # or enter in the screen pixel width (i.e 1024)
vertical = 300 # or enter in the screen pixel width (i.e 768)
layout = Default 16x9
hideMouse = yes
showParenthesis = yes