From d9d4a8c3cb1fb226738278923cf8d5ba2b74efdf Mon Sep 17 00:00:00 2001
From: Michael Levin <risujin@fastmail.fm>
Date: Sat, 3 Oct 2009 11:13:10 +0000
Subject: Added armour files to version control.

---
 ui/ingame.txt               |  1 +
 ui/ingame_options.menu      | 21 +++++++++++++++++++++
 ui/say.menu                 |  7 ++++---
 ui/tremulous_common_hud.h   |  9 +++++----
 ui/tremulous_human_hud.menu |  1 +
 5 files changed, 32 insertions(+), 7 deletions(-)

(limited to 'ui')

diff --git a/ui/ingame.txt b/ui/ingame.txt
index 251aa779..a71be329 100644
--- a/ui/ingame.txt
+++ b/ui/ingame.txt
@@ -5,4 +5,5 @@
   loadMenu { "ui/ingame_game.menu" }
   loadMenu { "ui/ingame_options.menu" }
   loadMenu { "ui/ingame_leave.menu" }
+  loadMenu { "ui/fonttest.menu" }
 }
diff --git a/ui/ingame_options.menu b/ui/ingame_options.menu
index fe8c5e37..f80c311c 100644
--- a/ui/ingame_options.menu
+++ b/ui/ingame_options.menu
@@ -360,6 +360,27 @@
       }
     }
 
+    itemDef
+    {
+      name game
+      group optionsGrp
+      type ITEM_TYPE_MULTI
+      text "Crosshair Size:"
+      cvar "cg_crosshairSize"
+      cvarFloatList { "Normal" 1 "Small" 0.75 "Tiny" 0.5 "Huge" 1.25 }
+      rect CONTENT_X (CONTENT_Y+(11*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
diff --git a/ui/say.menu b/ui/say.menu
index dea298c9..bf20d38d 100644
--- a/ui/say.menu
+++ b/ui/say.menu
@@ -6,7 +6,7 @@
 
 #define X         BORDER
 #define Y         200
-#define W         (640-(2*BORDER))
+#define W         (600-(2*BORDER))
 #define H         40
 
   menuDef
@@ -34,8 +34,9 @@
       rect 0 0 W H
       textalign ALIGN_LEFT
       textvalign VALIGN_CENTER
-      textscale .5
-      forecolor 1 1 1 1
+      textstyle ITEM_TEXTSTYLE_SHADOWED
+      textscale .4
+      forecolor 0.93 0.93 0.92 1
       visible MENU_TRUE
       onTextEntry
       {
diff --git a/ui/tremulous_common_hud.h b/ui/tremulous_common_hud.h
index 3bc62ba1..d7e497de 100644
--- a/ui/tremulous_common_hud.h
+++ b/ui/tremulous_common_hud.h
@@ -17,11 +17,11 @@ itemDef
   style WINDOW_STYLE_EMPTY
   visible MENU_TRUE
   decoration
-  forecolor 1 1 1 1
+  forecolor 0.93 0.93 0.92 1
   textalign ALIGN_LEFT
   textvalign VALIGN_TOP
-  textscale 0.4
-  textstyle ITEM_TEXTSTYLE_NORMAL
+  textscale 0.35
+  textstyle ITEM_TEXTSTYLE_SHADOWED
   ownerdraw CG_CONSOLE
 }
 
@@ -37,7 +37,7 @@ itemDef
   forecolor 1 1 1 0.35
   textalign ALIGN_LEFT
   textvalign VALIGN_TOP
-  textscale 0.3
+  textscale 0.4
   textstyle ITEM_TEXTSTYLE_NORMAL
   ownerdraw CG_TUTORIAL
 }
@@ -158,4 +158,5 @@ itemDef
   decoration
   textScale .5
   ownerdraw CG_PLAYER_CROSSHAIRNAMES
+  textstyle ITEM_TEXTSTYLE_SHADOWED
 }
diff --git a/ui/tremulous_human_hud.menu b/ui/tremulous_human_hud.menu
index a2bdb82d..3d527608 100644
--- a/ui/tremulous_human_hud.menu
+++ b/ui/tremulous_human_hud.menu
@@ -242,6 +242,7 @@
       decoration
       textScale .5
       ownerdraw CG_PLAYER_SELECTTEXT
+      textstyle ITEM_TEXTSTYLE_SHADOWED
     }
 
     //AMMO
-- 
cgit