diff options
Diffstat (limited to 'assets')
| -rw-r--r-- | assets/scripts/system_ui.shader | 13 | ||||
| -rw-r--r-- | assets/ui/assets/alien/build_pool_bar.tga | bin | 0 -> 9757 bytes | |||
| -rw-r--r-- | assets/ui/assets/human/build_pool_bar.tga | bin | 0 -> 8222 bytes | |||
| -rw-r--r-- | assets/ui/assets/neutral/build_pool_bg.tga | bin | 0 -> 13458 bytes | |||
| -rw-r--r-- | assets/ui/assets/neutral/stagebar.tga | bin | 13458 -> 0 bytes | |||
| -rw-r--r-- | assets/ui/assets/neutral/stagebar_add.jpg | bin | 5787 -> 0 bytes | |||
| -rw-r--r-- | assets/ui/menudef.h | 1 | ||||
| -rw-r--r-- | assets/ui/tremulous_common_hud.h | 15 |
8 files changed, 14 insertions, 15 deletions
diff --git a/assets/scripts/system_ui.shader b/assets/scripts/system_ui.shader index 2f9ef9b..4650ee0 100644 --- a/assets/scripts/system_ui.shader +++ b/assets/scripts/system_ui.shader @@ -189,16 +189,3 @@ ui/assets/neutral/squad_v } } -ui/assets/neutral/stagebar -{ - nomipmaps - { - map ui/assets/neutral/stagebar.tga - blendFunc blend - } - { - map ui/assets/neutral/stagebar_add.jpg - blendFunc add - } -} - diff --git a/assets/ui/assets/alien/build_pool_bar.tga b/assets/ui/assets/alien/build_pool_bar.tga Binary files differnew file mode 100644 index 0000000..38fad1a --- /dev/null +++ b/assets/ui/assets/alien/build_pool_bar.tga diff --git a/assets/ui/assets/human/build_pool_bar.tga b/assets/ui/assets/human/build_pool_bar.tga Binary files differnew file mode 100644 index 0000000..08b2b4d --- /dev/null +++ b/assets/ui/assets/human/build_pool_bar.tga diff --git a/assets/ui/assets/neutral/build_pool_bg.tga b/assets/ui/assets/neutral/build_pool_bg.tga Binary files differnew file mode 100644 index 0000000..458511b --- /dev/null +++ b/assets/ui/assets/neutral/build_pool_bg.tga diff --git a/assets/ui/assets/neutral/stagebar.tga b/assets/ui/assets/neutral/stagebar.tga Binary files differdeleted file mode 100644 index a21ec7e..0000000 --- a/assets/ui/assets/neutral/stagebar.tga +++ /dev/null diff --git a/assets/ui/assets/neutral/stagebar_add.jpg b/assets/ui/assets/neutral/stagebar_add.jpg Binary files differdeleted file mode 100644 index a8b0a33..0000000 --- a/assets/ui/assets/neutral/stagebar_add.jpg +++ /dev/null diff --git a/assets/ui/menudef.h b/assets/ui/menudef.h index 30ce6a2..411f987 100644 --- a/assets/ui/menudef.h +++ b/assets/ui/menudef.h @@ -198,6 +198,7 @@ enum CG_STAGE_REPORT_TEXT, CG_ALIEN_BUILD_POOL, CG_HUMAN_BUILD_POOL, + CG_BUILD_POOL_BARS, CG_ALIENS_SCORE_LABEL, CG_HUMANS_SCORE_LABEL, CG_DEMO_PLAYBACK, diff --git a/assets/ui/tremulous_common_hud.h b/assets/ui/tremulous_common_hud.h index cecd114..5c0029a 100644 --- a/assets/ui/tremulous_common_hud.h +++ b/assets/ui/tremulous_common_hud.h @@ -213,12 +213,23 @@ itemDef aspectBias ALIGN_CENTER visible 1 foreColor 1 1 1 0.5 - background "ui/assets/neutral/stagebar" + background "ui/assets/neutral/build_pool_bg" decoration } itemDef { + name "bpbars" + rect 160 -5 320 40 + aspectBias ALIGN_CENTER + visible 1 + foreColor 1 1 1 0.5 + decoration + ownerDraw CG_BUILD_POOL_BARS +} + +itemDef +{ name "stagereport" rect 200 11 240 25 foreColor 1 1 1 1 @@ -228,7 +239,7 @@ itemDef visible 1 decoration textScale .22 - textStyle ITEM_TEXTSTYLE_NORMAL + textStyle ITEM_TEXTSTYLE_SHADOWED ownerdraw CG_STAGE_REPORT_TEXT } |
