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/options.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/options.menu')
| -rw-r--r-- | ui/options.menu | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/ui/options.menu b/ui/options.menu index c6cc01c1..6ce80d57 100644 --- a/ui/options.menu +++ b/ui/options.menu @@ -15,8 +15,8 @@ popup onEsc { - close simple_options; - open main + play "sound/misc/menu1.wav"; + close simple_options } itemDef @@ -264,7 +264,7 @@ action { play "sound/misc/menu1.wav"; - close simple_options; + close simple_options } } |