summaryrefslogtreecommitdiff
path: root/ui/ingame_options.menu
diff options
context:
space:
mode:
authorTim Angus <tim@ngus.net>2007-11-02 20:42:47 +0000
committerTim Angus <tim@ngus.net>2007-11-02 20:42:47 +0000
commit3289f089c3b6f6196fe9508e7d3d48b32a42d10d (patch)
tree00284abb075f2df331988b7398dbc82cf54352d8 /ui/ingame_options.menu
parent580693963c553ca1b63fb62f70e3f048a3666991 (diff)
* s/ui_loading/ui_hideCursor/
* Hide cursor when using edit fields and binding keys * Remove client side chat handling, moving it to UI module * Remove target and last attacker message modes * Add ui_developer cvar * Fix edit field bug where cvar changes under it * Add onTextEntry UI script event * Give the user some feedback when binding keys * Stop doing a UI refresh when primed (and remove cgame ui_loading sets) * Move cg_drawSnapshot to bottom of the screen
Diffstat (limited to 'ui/ingame_options.menu')
-rw-r--r--ui/ingame_options.menu48
1 files changed, 4 insertions, 44 deletions
diff --git a/ui/ingame_options.menu b/ui/ingame_options.menu
index 74a42f76..3f2978a4 100644
--- a/ui/ingame_options.menu
+++ b/ui/ingame_options.menu
@@ -1182,49 +1182,9 @@
name misc
group optionsGrp
type ITEM_TYPE_BIND
- text "Target Chat:"
- cvar "messagemode3"
- rect SCONTENT_X (SCONTENT_Y+(8*ELEM_H)) SCONTENT_W ELEM_H
- textalign ITEM_ALIGN_RIGHT
- textvalign ITEM_VALIGN_CENTER
- textalignx SCONTENT_OFF
- textscale .25
- forecolor 1 1 1 1
- visible MENU_FALSE
- action
- {
- play "sound/misc/menu1.wav";
- }
- }
-
- itemDef
- {
- name misc
- group optionsGrp
- type ITEM_TYPE_BIND
- text "Attack Chat:"
- cvar "messagemode4"
- rect SCONTENT_X (SCONTENT_Y+(9*ELEM_H)) SCONTENT_W ELEM_H
- textalign ITEM_ALIGN_RIGHT
- textvalign ITEM_VALIGN_CENTER
- textalignx SCONTENT_OFF
- textscale .25
- forecolor 1 1 1 1
- visible MENU_FALSE
- action
- {
- play "sound/misc/menu1.wav";
- }
- }
-
- itemDef
- {
- name misc
- group optionsGrp
- type ITEM_TYPE_BIND
text "Vote Yes:"
cvar "vote yes"
- rect SCONTENT_X (SCONTENT_Y+(10*ELEM_H)) SCONTENT_W ELEM_H
+ rect SCONTENT_X (SCONTENT_Y+(8*ELEM_H)) SCONTENT_W ELEM_H
textalign ITEM_ALIGN_RIGHT
textvalign ITEM_VALIGN_CENTER
textalignx SCONTENT_OFF
@@ -1244,7 +1204,7 @@
type ITEM_TYPE_BIND
text "Vote No:"
cvar "vote no"
- rect SCONTENT_X (SCONTENT_Y+(11*ELEM_H)) SCONTENT_W ELEM_H
+ rect SCONTENT_X (SCONTENT_Y+(9*ELEM_H)) SCONTENT_W ELEM_H
textalign ITEM_ALIGN_RIGHT
textvalign ITEM_VALIGN_CENTER
textalignx SCONTENT_OFF
@@ -1264,7 +1224,7 @@
type ITEM_TYPE_BIND
text "Team Vote Yes:"
cvar "teamvote yes"
- rect SCONTENT_X (SCONTENT_Y+(12*ELEM_H)) SCONTENT_W ELEM_H
+ rect SCONTENT_X (SCONTENT_Y+(10*ELEM_H)) SCONTENT_W ELEM_H
textalign ITEM_ALIGN_RIGHT
textvalign ITEM_VALIGN_CENTER
textalignx SCONTENT_OFF
@@ -1284,7 +1244,7 @@
type ITEM_TYPE_BIND
text "Team Vote No:"
cvar "teamvote no"
- rect SCONTENT_X (SCONTENT_Y+(13*ELEM_H)) SCONTENT_W ELEM_H
+ rect SCONTENT_X (SCONTENT_Y+(11*ELEM_H)) SCONTENT_W ELEM_H
textalign ITEM_ALIGN_RIGHT
textvalign ITEM_VALIGN_CENTER
textalignx SCONTENT_OFF