Functional online keyconfiguration, and a raft of bugfixes it entailed

git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@2435 8092fc87-c524-0410-9efc-e669fe64eaf9
This commit is contained in:
mcmartin
2006-09-10 18:39:32 +00:00
parent 9d7cc6c100
commit 75fcdcf915
10 changed files with 378 additions and 132 deletions
+7 -1
View File
@@ -478,6 +478,7 @@ Return to control set selection screen.
Incomplete
Keyconfig header
Editkey header
Editkey dialog
#(LABEL_0)
This part of the configuration
@@ -490,7 +491,12 @@ To view or edit key controls,
select the option below:
#(LABEL_2)
Controls
Press Return to edit, or Delete to remove
#(LABEL_3)
Please press the key, button,
or joystick direction you wish
to assign to this action.
#(TEXT_ENTRIES)
Name
+67 -75
View File
@@ -1,7 +1,7 @@
# Default UQM input configuration file.
# This is a VCONTROL version 3 config file (UQM 0.5.1 or later).
version 3
# This is a VCONTROL version 4 config file (UQM 0.5.3 or later).
version 4
# Keyboard control definitions follow this point. Most keys can be
# described in a straightforward manner; consult the name table in
@@ -63,57 +63,56 @@ Exit: key F10
# Super Melee and the player in the full game. Again, the player has
# the option of using either the number pad or the arrow keys.
Keyboard-1-Up: key Up
Keyboard-1-Down: key Down
Keyboard-1-Left: key Left
Keyboard-1-Right: key Right
Keyboard-1-Weapon: key RightControl
Keyboard-1-Special: key RightShift
Template-1-Up: key Up
Template-1-Down: key Down
Template-1-Left: key Left
Template-1-Right: key Right
Template-1-Weapon: key RightControl
Template-1-Special: key RightShift
Keyboard-1-Up: key Keypad-8
Keyboard-1-Down: key Keypad-2
Keyboard-1-Left: key Keypad-4
Keyboard-1-Right: key Keypad-6
Keyboard-1-Weapon: key Keypad-Enter
Keyboard-1-Special: key Keypad-0
Template-1-Up: key Keypad-8
Template-1-Down: key Keypad-2
Template-1-Left: key Keypad-4
Template-1-Right: key Keypad-6
Template-1-Weapon: key Keypad-Enter
Template-1-Special: key Keypad-0
Keyboard-1-Escape: key Escape
Template-1-Escape: key Escape
# WASD for Player 2's default flight controls. We add the key 'd' to
# let him move down in the super-melee ship selection.
Keyboard-2-Up: key w
Keyboard-2-Down: key s
Keyboard-2-Left: key a
Keyboard-2-Right: key d
Keyboard-2-Weapon: key v
Keyboard-2-Special: key b
Keyboard-2-Escape: key Escape
Template-2-Up: key w
Template-2-Down: key s
Template-2-Left: key a
Template-2-Right: key d
Template-2-Weapon: key v
Template-2-Special: key b
Template-2-Escape: key Escape
# Control Scheme 3: Variant Arrow keys with brackets for firing.
Keyboard-3-Up: key Keypad-8
Keyboard-3-Down: key Keypad-2
Keyboard-3-Left: key Keypad-4
Keyboard-3-Right: key Keypad-6
Keyboard-3-Up: key Up
Keyboard-3-Down: key Down
Keyboard-3-Left: key Left
Keyboard-3-Right: key Right
Keyboard-3-Weapon: key ]
Keyboard-3-Special: key [
Keyboard-3-Escape: key Escape
Template-3-Up: key Keypad-8
Template-3-Down: key Keypad-2
Template-3-Left: key Keypad-4
Template-3-Right: key Keypad-6
Template-3-Up: key Up
Template-3-Down: key Down
Template-3-Left: key Left
Template-3-Right: key Right
Template-3-Weapon: key ]
Template-3-Special: key [
Template-3-Escape: key Escape
# Control Scheme 4: Shifted WASD keys.
Joystick-1-Up: key e
Joystick-1-Down: key d
Joystick-1-Left: key s
Joystick-1-Right: key f
Joystick-1-Weapon: key q
Joystick-1-Special: key a
Joystick-1-Escape: key Escape
Template-4-Up: key e
Template-4-Down: key d
Template-4-Left: key s
Template-4-Right: key f
Template-4-Weapon: key q
Template-4-Special: key a
Template-4-Escape: key Escape
# This is a sample joystick configuration. This is intended to work
# primarily under WinXP with a USB analog/digital gamepad. The
@@ -125,19 +124,19 @@ Joystick-1-Escape: key Escape
joystick 0 threshold 10000 # How far to move before it counts; 0-30000
Joystick-2-Up: joystick 0 axis 1 negative
Joystick-2-Down: joystick 0 axis 1 positive
Joystick-2-Left: joystick 0 axis 0 negative
Joystick-2-Right: joystick 0 axis 0 positive
Template-5-Up: joystick 0 axis 1 negative
Template-5-Down: joystick 0 axis 1 positive
Template-5-Left: joystick 0 axis 0 negative
Template-5-Right: joystick 0 axis 0 positive
Joystick-2-Up: joystick 0 hat 0 up
Joystick-2-Down: joystick 0 hat 0 down
Joystick-2-Left: joystick 0 hat 0 left
Joystick-2-Right: joystick 0 hat 0 right
Template-5-Up: joystick 0 hat 0 up
Template-5-Down: joystick 0 hat 0 down
Template-5-Left: joystick 0 hat 0 left
Template-5-Right: joystick 0 hat 0 right
Joystick-2-Weapon: joystick 0 button 1
Joystick-2-Special: joystick 0 button 0
Joystick-2-Escape: joystick 0 button 6
Template-5-Weapon: joystick 0 button 0
Template-5-Special: joystick 0 button 1
Template-5-Escape: key Escape
Menu-Up: joystick 0 axis 1 negative
Menu-Down: joystick 0 axis 1 positive
@@ -149,28 +148,25 @@ Menu-Down: joystick 0 hat 0 down
Menu-Left: joystick 0 hat 0 left
Menu-Right: joystick 0 hat 0 right
Menu-Cancel: joystick 0 button 0
Menu-Select: joystick 0 button 1
Menu-Page-Up: joystick 0 button 4
Menu-Page-Down: joystick 0 button 5
Menu-Zoom-In: joystick 0 button 6
Menu-Zoom-Out: joystick 0 button 7
Menu-Cancel: joystick 0 button 1
Menu-Select: joystick 0 button 0
joystick 1 threshold 10000 # How far to move before it counts; 0-30000
Joystick-3-Up: joystick 1 axis 1 negative
Joystick-3-Down: joystick 1 axis 1 positive
Joystick-3-Left: joystick 1 axis 0 negative
Joystick-3-Right: joystick 1 axis 0 positive
Template-6-Up: joystick 1 axis 1 negative
Template-6-Down: joystick 1 axis 1 positive
Template-6-Left: joystick 1 axis 0 negative
Template-6-Right: joystick 1 axis 0 positive
Joystick-3-Up: joystick 1 hat 0 up
Joystick-3-Down: joystick 1 hat 0 down
Joystick-3-Left: joystick 1 hat 0 left
Joystick-3-Right: joystick 1 hat 0 right
Template-6-Up: joystick 1 hat 0 up
Template-6-Down: joystick 1 hat 0 down
Template-6-Left: joystick 1 hat 0 left
Template-6-Right: joystick 1 hat 0 right
Joystick-3-Weapon: joystick 1 button 1
Joystick-3-Special: joystick 1 button 0
Joystick-3-Escape: joystick 1 button 6
Template-6-Weapon: joystick 1 button 0
Template-6-Special: joystick 1 button 1
Template-6-Escape: key Escape
Menu-Up: joystick 1 axis 1 negative
Menu-Down: joystick 1 axis 1 positive
@@ -182,9 +178,5 @@ Menu-Down: joystick 1 hat 0 down
Menu-Left: joystick 1 hat 0 left
Menu-Right: joystick 1 hat 0 right
Menu-Cancel: joystick 1 button 0
Menu-Select: joystick 1 button 1
Menu-Page-Up: joystick 1 button 4
Menu-Page-Down: joystick 1 button 5
Menu-Zoom-In: joystick 1 button 6
Menu-Zoom-Out: joystick 1 button 7
Menu-Cancel: joystick 1 button 1
Menu-Select: joystick 1 button 0