mirror of
https://github.com/Q3Rally-Team/q3rally.git
synced 2025-02-16 09:11:11 +00:00
fixed "bug" where you can select opposite buttons for the same function like left and right arrow for turn left. now you can define only one button for the selected funktion.
This commit is contained in:
q3rally
parent
a88c9f1746
commit
d7a7cbce6a
5 changed files with 24 additions and 39 deletions
|
|
@ -67,6 +67,6 @@ aifile bots/liz_c.c
|
|||
{
|
||||
name Paul
|
||||
model sidepipe/blue
|
||||
aifile bots/grism_c.c
|
||||
aifile bots/major_c.c
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -319,15 +319,24 @@ static bind_t g_bindings[] =
|
|||
{"+right", "turn right", ID_RIGHT, ANIM_TURNRIGHT, K_RIGHTARROW, -1, -1, -1},
|
||||
{"+strafe", "sidestep / turn", ID_STRAFE, ANIM_IDLE, K_ALT, -1, -1, -1},
|
||||
*/
|
||||
|
||||
/*
|
||||
{"+forward", "accelerate", ID_ACCEL, ANIM_WALK, K_UPARROW, -1, -1, -1},
|
||||
{"+back", "brake", ID_BRAKE, ANIM_BACK, K_DOWNARROW, -1, -1, -1},
|
||||
*/
|
||||
{"+forward", "accelerate", ID_ACCEL, ANIM_WALK, K_UPARROW, -1, -1},
|
||||
{"+back", "brake", ID_BRAKE, ANIM_BACK, K_DOWNARROW, -1, -1},
|
||||
{"+button14", "handbrake", ID_HANDBRAKE, ANIM_BACK, K_SPACE, -1, -1, -1},
|
||||
{"+speed", "turbo", ID_TURBO, ANIM_TURBO, K_SHIFT, -1, -1, -1},
|
||||
{"+moveup", "up", ID_MOVEUP, ANIM_JUMP, 'x', -1, -1, -1},
|
||||
{"+movedown", "down", ID_MOVEDOWN, ANIM_CROUCH, 'c', -1, -1, -1},
|
||||
{"+hud", "show HUD", ID_SHOWHUD2, 0, 'q', -1, -1, -1},
|
||||
{"+left", "turn left", ID_LEFT, ANIM_TURNLEFT, K_LEFTARROW, -1, -1},
|
||||
{"+right", "turn right", ID_RIGHT, ANIM_TURNRIGHT, K_RIGHTARROW, -1, -1},
|
||||
/*
|
||||
{"+left", "turn left", ID_LEFT, ANIM_TURNLEFT, K_LEFTARROW, -1, -1, -1},
|
||||
{"+right", "turn right", ID_RIGHT, ANIM_TURNRIGHT, K_RIGHTARROW, -1, -1, -1},
|
||||
*/
|
||||
{"+button12", "rear attack", ID_REARATTACK, ANIM_REARATTACK, K_KP_INS, -1, -1, -1},
|
||||
// END
|
||||
{"+lookup", "look up", ID_LOOKUP, ANIM_LOOKUP, K_PGDN, -1, -1, -1},
|
||||
|
|
|
|||
|
|
@ -294,7 +294,7 @@ static void UI_RemoveBotsMenu_Init( void ) {
|
|||
removeBotsMenuInfo.delete.generic.flags = QMF_LEFT_JUSTIFY|QMF_PULSEIFFOCUS;
|
||||
removeBotsMenuInfo.delete.generic.id = ID_DELETE;
|
||||
removeBotsMenuInfo.delete.generic.callback = UI_RemoveBotsMenu_DeleteEvent;
|
||||
removeBotsMenuInfo.delete.generic.x = 320+128;
|
||||
removeBotsMenuInfo.delete.generic.x = 320+64;
|
||||
removeBotsMenuInfo.delete.generic.y = 256+128-64;
|
||||
removeBotsMenuInfo.delete.string = "DELETE";
|
||||
removeBotsMenuInfo.delete.color = color_orange;
|
||||
|
|
@ -304,7 +304,7 @@ static void UI_RemoveBotsMenu_Init( void ) {
|
|||
removeBotsMenuInfo.back.generic.flags = QMF_RIGHT_JUSTIFY|QMF_PULSEIFFOCUS;
|
||||
removeBotsMenuInfo.back.generic.id = ID_BACK;
|
||||
removeBotsMenuInfo.back.generic.callback = UI_RemoveBotsMenu_BackEvent;
|
||||
removeBotsMenuInfo.back.generic.x = 320-128;
|
||||
removeBotsMenuInfo.back.generic.x = 320-64;
|
||||
removeBotsMenuInfo.back.generic.y = 256+128-64;
|
||||
removeBotsMenuInfo.back.string = "< BACK";
|
||||
removeBotsMenuInfo.back.color = color_orange;
|
||||
|
|
|
|||
|
|
@ -55,7 +55,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
|
|||
#define BASETA "missionpack"
|
||||
|
||||
#ifndef PRODUCT_VERSION
|
||||
#define PRODUCT_VERSION "v0.0.0.4 r148"
|
||||
#define PRODUCT_VERSION "v0.0.0.4 r151"
|
||||
#endif
|
||||
|
||||
#define Q3_VERSION PRODUCT_NAME " " PRODUCT_VERSION
|
||||
|
|
|
|||
|
|
@ -753,12 +753,12 @@ q3rallycode
|
|||
engine\misc\msvc\quake3.vcproj
|
||||
engine\misc\msvc\ui.def
|
||||
engine\misc\msvc\ui.vcproj
|
||||
+nsis
|
||||
-nsis
|
||||
engine\misc\nsis\Makefile
|
||||
engine\misc\nsis\q3rally.nsi.in
|
||||
engine\misc\nsis\q3rally-q3ctc.nsi
|
||||
+osxfe
|
||||
+ioquake3fe
|
||||
-osxfe
|
||||
-ioquake3fe
|
||||
-English.lproj
|
||||
engine\misc\osxfe\ioquake3fe\English.lproj\ErrorWindow.xib
|
||||
engine\misc\osxfe\ioquake3fe\English.lproj\InfoPlist.strings
|
||||
|
|
@ -779,11 +779,11 @@ q3rallycode
|
|||
engine\misc\osxfe\ioquake3fe\ioquake3.icns
|
||||
engine\misc\osxfe\ioquake3fe\ioquake3fe_Prefix.pch
|
||||
engine\misc\osxfe\ioquake3fe\main.m
|
||||
+setup
|
||||
+MacOSX
|
||||
-setup
|
||||
-MacOSX
|
||||
engine\misc\setup\MacOSX\SLA-dmg.sh
|
||||
+pkg
|
||||
+ioquake3
|
||||
-ioquake3
|
||||
engine\misc\setup\pkg\ioquake3\depend
|
||||
engine\misc\setup\pkg\ioquake3\pkginfo.template
|
||||
engine\misc\setup\pkg\ioquake3\postinstall
|
||||
|
|
@ -858,37 +858,13 @@ q3rallycode
|
|||
engine\cross-make-mingw64.sh
|
||||
[Open project files]
|
||||
0=engine\code\qcommon\q_shared.h
|
||||
1=engine\code\q3_ui\ui_addbots.c
|
||||
2=engine\code\q3_ui\ui_removebots.c
|
||||
3=engine\ui\hud.txt
|
||||
4=engine\ui\hud2.txt
|
||||
5=engine\ui\ingame.txt
|
||||
6=engine\code\q3_ui\ui_rally_credits.c
|
||||
7=engine\code\q3_ui\ui_rally_tools.c
|
||||
1=engine\code\q3_ui\ui_rally_controls.c
|
||||
[Selected Project Files]
|
||||
Main=
|
||||
Selected=engine\code\q3_ui\ui_rally_tools.c
|
||||
Selected=engine\code\q3_ui\ui_rally_controls.c
|
||||
[engine\code\qcommon\q_shared.h]
|
||||
TopLine=40
|
||||
Caret=39,58
|
||||
[engine\code\q3_ui\ui_addbots.c]
|
||||
TopLine=353
|
||||
Caret=21,373
|
||||
[engine\code\q3_ui\ui_removebots.c]
|
||||
TopLine=277
|
||||
Caret=51,308
|
||||
[engine\ui\hud.txt]
|
||||
TopLine=1
|
||||
Caret=1,1
|
||||
[engine\ui\hud2.txt]
|
||||
TopLine=1
|
||||
Caret=1,1
|
||||
[engine\ui\ingame.txt]
|
||||
TopLine=1
|
||||
Caret=1,1
|
||||
[engine\code\q3_ui\ui_rally_credits.c]
|
||||
TopLine=3
|
||||
Caret=1,1
|
||||
[engine\code\q3_ui\ui_rally_tools.c]
|
||||
TopLine=87
|
||||
Caret=1,1
|
||||
[engine\code\q3_ui\ui_rally_controls.c]
|
||||
TopLine=316
|
||||
Caret=81,335
|
||||
|
|
|
|||
Loading…
Reference in a new issue