diff options
| author | Christopher Schwarz <lakitu7@gmail.com> | 2009-10-21 22:46:15 +0000 |
|---|---|---|
| committer | Tim Angus <tim@ngus.net> | 2013-01-03 00:16:59 +0000 |
| commit | aa7a0ecd771b337400b7a7f34ff5c64f678757ea (patch) | |
| tree | 4349dad516b8d533e50d29aedc2c727e258082e7 /assets | |
| parent | e83ed6ee76cb7884bfc12e8c96920f9de0f70809 (diff) | |
* Move teamoverlay out of the common_hud and into the team common huds. Prevents showing when dead (use deadspec for this) and showing in white-on-white colors
* Hide teamoverlay when the scoreboard is displayed
Diffstat (limited to 'assets')
| -rw-r--r-- | assets/ui/tremulous_alien_common_hud.h | 13 | ||||
| -rw-r--r-- | assets/ui/tremulous_common_hud.h | 13 | ||||
| -rw-r--r-- | assets/ui/tremulous_human_hud.menu | 13 |
3 files changed, 26 insertions, 13 deletions
diff --git a/assets/ui/tremulous_alien_common_hud.h b/assets/ui/tremulous_alien_common_hud.h index 68bc8f36..8f06a153 100644 --- a/assets/ui/tremulous_alien_common_hud.h +++ b/assets/ui/tremulous_alien_common_hud.h @@ -258,3 +258,16 @@ itemDef textStyle ITEM_TEXTSTYLE_SHADOWED ownerdraw CG_FOLLOW } + +//TEAM OVERLAY +itemDef +{ + name "teamoverlay" + rect BORDER 120 160 128 + style WINDOW_STYLE_EMPTY + visible MENU_TRUE + decoration + forecolor COMMON_HUD_R COMMON_HUD_G COMMON_HUD_B 0.75 + textscale 1.0 + ownerdraw CG_TEAMOVERLAY +} diff --git a/assets/ui/tremulous_common_hud.h b/assets/ui/tremulous_common_hud.h index 6208f167..4ef4dbb9 100644 --- a/assets/ui/tremulous_common_hud.h +++ b/assets/ui/tremulous_common_hud.h @@ -165,19 +165,6 @@ itemDef background "ui/assets/forwardarrow.tga" } -//TEAM OVERLAY -itemDef -{ - name "teamoverlay" - rect BORDER 120 160 128 - style WINDOW_STYLE_EMPTY - visible MENU_TRUE - decoration - forecolor COMMON_HUD_R COMMON_HUD_G COMMON_HUD_B 0.75 - textscale 1.0 - ownerdraw CG_TEAMOVERLAY -} - //SNAPSHOT itemDef { diff --git a/assets/ui/tremulous_human_hud.menu b/assets/ui/tremulous_human_hud.menu index e5fe27bf..707fb7b6 100644 --- a/assets/ui/tremulous_human_hud.menu +++ b/assets/ui/tremulous_human_hud.menu @@ -378,5 +378,18 @@ textStyle ITEM_TEXTSTYLE_SHADOWED ownerdraw CG_FOLLOW } + + //TEAM OVERLAY + itemDef + { + name "teamoverlay" + rect BORDER 120 160 128 + style WINDOW_STYLE_EMPTY + visible MENU_TRUE + decoration + forecolor COMMON_HUD_R COMMON_HUD_G COMMON_HUD_B 0.75 + textscale 1.0 + ownerdraw CG_TEAMOVERLAY + } } } |