From 7b05bdbb2a351ead507677c9245f45118ec41fb3 Mon Sep 17 00:00:00 2001
From: enneract <trem.redman@gmail.com>
Date: Sun, 7 Dec 2014 02:23:02 +0100
Subject: Improve HUD layout.

---
 assets/ui/assets/bp-bg.tga                | Bin 10989 -> 0 bytes
 assets/ui/assets/neutral/stagebar.tga     | Bin 0 -> 13458 bytes
 assets/ui/assets/neutral/stagebar_add.jpg | Bin 0 -> 5787 bytes
 assets/ui/tremulous_common_hud.h          |  27 ++++++++-------------------
 4 files changed, 8 insertions(+), 19 deletions(-)
 delete mode 100644 assets/ui/assets/bp-bg.tga
 create mode 100644 assets/ui/assets/neutral/stagebar.tga
 create mode 100644 assets/ui/assets/neutral/stagebar_add.jpg

(limited to 'assets/ui')

diff --git a/assets/ui/assets/bp-bg.tga b/assets/ui/assets/bp-bg.tga
deleted file mode 100644
index 04b71bf..0000000
Binary files a/assets/ui/assets/bp-bg.tga and /dev/null differ
diff --git a/assets/ui/assets/neutral/stagebar.tga b/assets/ui/assets/neutral/stagebar.tga
new file mode 100644
index 0000000..a21ec7e
Binary files /dev/null and b/assets/ui/assets/neutral/stagebar.tga differ
diff --git a/assets/ui/assets/neutral/stagebar_add.jpg b/assets/ui/assets/neutral/stagebar_add.jpg
new file mode 100644
index 0000000..a8b0a33
Binary files /dev/null and b/assets/ui/assets/neutral/stagebar_add.jpg differ
diff --git a/assets/ui/tremulous_common_hud.h b/assets/ui/tremulous_common_hud.h
index 9892243..cecd114 100644
--- a/assets/ui/tremulous_common_hud.h
+++ b/assets/ui/tremulous_common_hud.h
@@ -207,19 +207,20 @@ itemDef
 
 itemDef
 {
-  name "stage_add"
+  name "bpbackground"
   style WINDOW_STYLE_SHADER
-  rect 343 -1 160 35
+  rect 160 -5 320 40
   aspectBias ALIGN_CENTER
   visible 1
-  background "scripts/stage_add"
+  foreColor 1 1 1 0.5
+  background "ui/assets/neutral/stagebar"
   decoration
 }
 
 itemDef
 {
   name "stagereport"
-  rect 300 2 240 25
+  rect 200 11 240 25
   foreColor 1 1 1 1
   aspectBias ALIGN_CENTER
   textalign ALIGN_CENTER
@@ -231,22 +232,10 @@ itemDef
   ownerdraw CG_STAGE_REPORT_TEXT
 }
 
-itemDef
-{
-  name "bpbackground"
-  style WINDOW_STYLE_SHADER
-  rect 140 -5 160 40
-  aspectBias ALIGN_CENTER
-  visible 1
-  foreColor 1 1 1 0.5
-  background "ui/assets/bp-bg.tga"
-  decoration
-}
-
 itemDef
 {
   name "bpalien"
-  rect 185.5 8.5 20 25
+  rect 194 8.5 20 25
   foreColor  1 0 0 1
   aspectBias ALIGN_CENTER
   textalign ALIGN_RIGHT
@@ -262,8 +251,8 @@ itemDef
 itemDef
 {
   name "bphuman"
-  rect 238 8.5 20 25
-  foreColor 0 0.8 1 1
+  rect 430 8.5 20 25
+  foreColor 0.5 0.9 1 1
   aspectBias ALIGN_CENTER
   textalign ALIGN_LEFT
   textvalign VALIGN_TOP
-- 
cgit