diff options
| author | Michael Levin <risujin@fastmail.fm> | 2009-10-03 11:26:51 +0000 |
|---|---|---|
| committer | Tim Angus <tim@ngus.net> | 2013-01-03 00:15:00 +0000 |
| commit | 0cf04fe37fef2e827a95bb19926a3cbf8e98c581 (patch) | |
| tree | 93ac01309f47edb27be26fb31e3886f6082579b1 /ui/ingame_options.menu | |
| parent | d9709deb95375f2462e5ca9fc98ebf92fd91ce04 (diff) | |
* Added charge meter to the UI, can be disabled via GUI
* Trample and Lucifer Cannon charging reworked and moved to PMove
* Can no longer "cancel" a charging Lucifer Cannon
* STAT_MISC2 is now unused, booster and charge information can be inferred elsewhere (STAT_UNUSED)
* Trying to fire an empty weapon makes a clicking noise (also a bugfix, apparently the server would spam EV_NOAMMO which did nothing but is now used for the clicking noise -- audible to all players)
* Created an alternate, muffled Lucifer Cannon warning noise for other people's Lucifer Cannons
* Fixed bug which prevented players from switching to a different player while spectating someone in the spawn queue
* Spectators are now properly moved to the lock view position when spectating a player in the spawn queue
Diffstat (limited to 'ui/ingame_options.menu')
| -rw-r--r-- | ui/ingame_options.menu | 22 |
1 files changed, 21 insertions, 1 deletions
diff --git a/ui/ingame_options.menu b/ui/ingame_options.menu index ac08995b..e4b68229 100644 --- a/ui/ingame_options.menu +++ b/ui/ingame_options.menu @@ -13,7 +13,7 @@ #define TOPBUTT_H 30 #define CONTENT_X BORDER -#define CONTENT_Y ((2*BORDER)+TOPBUTT_H) +#define CONTENT_Y ((1.5*BORDER)+TOPBUTT_H) #define CONTENT_W (W-(2*BORDER)) #define CONTENT_OFF (0-(CONTENT_W/2)) @@ -402,6 +402,26 @@ } } + itemDef + { + name game + group optionsGrp + type ITEM_TYPE_YESNO + text "Show Charge Bar:" + cvar "cg_drawChargeBar" + rect CONTENT_X (CONTENT_Y+(13*ELEM_H)) CONTENT_W ELEM_H + textalign ALIGN_RIGHT + textvalign VALIGN_CENTER + textalignx CONTENT_OFF + textscale .25 + forecolor 1 1 1 1 + visible MENU_FALSE + action + { + play "sound/misc/menu1.wav"; + } + } + //////// CONTROLS //Controls menu |