diff options
| author | Tim Angus <tim@ngus.net> | 2007-10-02 21:29:25 +0000 |
|---|---|---|
| committer | Tim Angus <tim@ngus.net> | 2007-10-02 21:29:25 +0000 |
| commit | dd0dd03f6f94a15b8764973e4c893526d8cfd722 (patch) | |
| tree | 4a3989e08a16d58e6b4f9fda7380e20ba05b8a28 /ui/joinserver.menu | |
| parent | e6513f95705560250f00f1ccc0707e01e318192f (diff) | |
* Merge of ioq3-r1189
+ Fix bug that prevented key up events getting to cgame/ui when not in game
+ Use Key_[GS]etCatcher everywhere to set keycatcher
+ Clear all key states when the catcher changes
* Slim down client userinfo somewhat
* Remove some redundant client autocomplete commands
* Actually make use of "menuStack" in the UI module
+ No longer close all menus when exiting one, instead reverting to the
next one on the stack
+ Cleanup the menu activation functions a little
* Truncate text in list columns if it exceeds the column width
* Remove maxChars field from columns member of ITEM_TYPE_LISTBOX
* Revert r992 due to more general and less buggy/hacky fix from ioq3
Diffstat (limited to 'ui/joinserver.menu')
| -rw-r--r-- | ui/joinserver.menu | 16 |
1 files changed, 6 insertions, 10 deletions
diff --git a/ui/joinserver.menu b/ui/joinserver.menu index 35439e1c..499348dd 100644 --- a/ui/joinserver.menu +++ b/ui/joinserver.menu @@ -20,7 +20,6 @@ show accept; hide back_alt; show back; - hide grpmessage; uiScript UpdateFilter } @@ -295,10 +294,10 @@ outlinecolor 0.1 0.1 0.1 0.5 visible 1 columns 4 - 2 40 80 ITEM_ALIGN_LEFT - 375 40 20 ITEM_ALIGN_LEFT - 500 5 10 ITEM_ALIGN_LEFT - 560 20 20 ITEM_ALIGN_LEFT + 2 355 ITEM_ALIGN_LEFT + 375 100 ITEM_ALIGN_LEFT + 500 40 ITEM_ALIGN_LEFT + 560 30 ITEM_ALIGN_LEFT doubleClick { uiScript JoinServer } } @@ -568,7 +567,6 @@ action { play "sound/misc/menu1.wav"; - close joinserver; open createserver } } @@ -586,8 +584,7 @@ action { play "sound/misc/menu4.wav"; - close joinserver; - open main + close joinserver } mouseEnter @@ -623,8 +620,7 @@ action { play "sound/misc/menu4.wav"; - close joinserver; - open main + close joinserver } } |