* Some grammar touch ups to infopanes.def

* Added grenade infopane
* Fiddled with the ingame main menu to fit the new splash screen model
* Changed "Use Object:" in bindings to "Use Object/Evolve:"
* Corrected cursor load
* Moved heartbeat.wav to correct location
* Splash screen touch ups
* Credits implemented
* Scanner plane reintroduced

6 files changed, 405 insertions, 23 deletions

diff --git a/ui/ingame.menu b/ui/ingame.menu
index 0f1c630a..a19d529d 100644
--- a/ui/ingame.menu
+++ b/ui/ingame.menu
@@ -39,15 +39,16 @@
     itemDef
     {
       name splashmodel
-      rect 0 0 640 56 
+      rect 0 -10 640 66 
       type ITEM_TYPE_MODEL
-      style WINDOW_STYLE_EMPTY
+      style WINDOW_STYLE_FILLED
       asset_model "models/splash/splash_screen.md3"
       model_fovx 32.0
-      model_fovy 2.8
+      model_fovy 3.8
       model_angle 180
       visible 1
       decoration
+      backcolor 0 0 0 1
     }
 
     itemdef
diff --git a/ui/ingame_options.menu b/ui/ingame_options.menu
index 801dca38..67e7c4aa 100644
--- a/ui/ingame_options.menu
+++ b/ui/ingame_options.menu
@@ -1016,7 +1016,7 @@
       name misc
       group optionsGrp
       type ITEM_TYPE_BIND
-      text "Use Object:"
+      text "Use Object/Evolve:"
       cvar "+button7"
       rect 96 125 192 15
       textalign ITEM_ALIGN_RIGHT
diff --git a/ui/loading.menu b/ui/loading.menu
index b48938fa..80718529 100644
--- a/ui/loading.menu
+++ b/ui/loading.menu
@@ -3,7 +3,7 @@
 {
   assetGlobalDef
   {
-    cursor "ui/assets/3_cursor2"      // cursor 
+    cursor "ui/assets/3_cursor3"      // cursor 
     gradientBar "ui/assets/gradientbar2.tga"  // gradient bar
     fadeClamp 1.0         // sets the fadeup alpha
     fadeCycle 1         // how often fade happens in milliseconds
diff --git a/ui/main.menu b/ui/main.menu
index 35a0b633..c367bb00 100644
--- a/ui/main.menu
+++ b/ui/main.menu
@@ -29,17 +29,18 @@
     visible MENU_TRUE       // Visible on open
     focusColor 1 .75 0 1        // Menu focus color for text and items
 
-    onOpen { uiScript stopRefresh ; playlooped "sounds/ui/heartbeat.wav" }	
+    onOpen { uiScript stopRefresh ; playlooped "sound/ui/heartbeat.wav" }	
     onESC { open quit_popmenu }
   
     itemDef
     {
       name background
       rect 0 0 640 480
-      style WINDOW_STYLE_FILLED
+      style WINDOW_STYLE_SHADER
       backcolor 0 0 0 1
       visible 1
       decoration
+      background "ui/assets/mainmenu.jpg"
     }
 
     itemDef
@@ -59,7 +60,7 @@
     itemDef
     {
       name mainmenu
-      text "Play!"
+      text "Play"
       type ITEM_TYPE_BUTTON
       style WINDOW_STYLE_EMPTY
       textstyle ITEM_TEXTSTYLE_NORMAL 
@@ -124,10 +125,10 @@
     itemDef
     {
       name copyright
-      text "Q3A (C) 2000 Id Software Inc. Tremulous (C) 2003 Us."
+      text "Tremulous (C) 2005 darklegion development"
       style WINDOW_STYLE_EMPTY
       textstyle ITEM_TEXTSTYLE_NORMAL
-      textscale .15
+      textscale .25
       rect 0 440 640 40
       textalign 1 
       textaligny 32
diff --git a/ui/quitcredit.menu b/ui/quitcredit.menu
index cd9cff97..a6646364 100644
--- a/ui/quitcredit.menu
+++ b/ui/quitcredit.menu
@@ -20,11 +20,12 @@
     itemDef
     {
       name exitclickbox
-      style WINDOW_STYLE_FILLED
+      style WINDOW_STYLE_SHADER
       rect 0 0 640 480
       type ITEM_TYPE_BUTTON
       visible 1
       backcolor 0 0 0 1
+      background "ui/assets/credits_splash.jpg"
       action
       {
         play "sound/misc/nomenu.wav";
@@ -32,21 +33,399 @@
         uiScript "quit"
       }
     }
+    
+    itemDef
+    {
+      name topstripe
+      style WINDOW_STYLE_FILLED
+      rect -5 -5 645 64
+      visible 1
+      backcolor 0 0 0 1
+      
+      border WINDOW_BORDER_FULL
+      borderSize 1.5
+      borderColor 1 0 0 1
+    }
 
+    itemDef
+    {
+      name bottomstripe
+      style WINDOW_STYLE_FILLED
+      rect -5 416 645 485
+      visible 1
+      backcolor 0 0 0 1
+      
+      border WINDOW_BORDER_FULL
+      borderSize 1.5
+      borderColor 1 0 0 1
+    }
+
+    itemDef
+    {
+      name        "creditstitle"
+      group       grpidcredit
+      style       WINDOW_STYLE_EMPTY
+      rect        320 48 1 1
+      textalign   ITEM_ALIGN_CENTER
+      textalignx  0
+      textaligny  0
+      textscale   0.75
+      textstyle   ITEM_TEXTSTYLE_NORMAL
+      text        "CREDITS"
+      forecolor   1 1 1 1
+      backcolor   1 0 0 1
+      visible     1
+      decoration 
+    }
     
     itemDef
     {
-      name programming
-      group grpidcredit
-      rect 0 160 640 30
-      textalign 1
-      textalignx 320
-      textaligny 10
-      textscale .35
-      text "INSERT CREDITS HERE"
-      forecolor  1 1 1 1
+      name        "credit1left"
+      group       grpidcredit
+      style       WINDOW_STYLE_EMPTY
+      rect        10 96 1 1
+      textalign   ITEM_ALIGN_LEFT
+      textalignx  0
+      textaligny  10
+      textscale   0.50
+      textstyle   ITEM_TEXTSTYLE_NORMAL
+      text        "Tim 'Timbo' Angus"
+      forecolor   1 1 1 1
+      backcolor   1 0 0 1
+      visible     1
+      decoration 
+    }
+    itemDef
+    {
+      name        "credit1right"
+      group       grpidcredit
+      style       WINDOW_STYLE_EMPTY
+      rect        630 96 1 1
+      textalign   ITEM_ALIGN_RIGHT
+      textalignx  0
+      textaligny  10
+      textscale   0.50
+      textstyle   ITEM_TEXTSTYLE_NORMAL
+      text        "Programming and Direction"
+      forecolor   1 1 1 1
+      backcolor   0 1 0 1
+      visible     1
+      decoration 
+    }
+
+    itemDef
+    {
+      name        "credit2left"
+      group       grpidcredit
+      style       WINDOW_STYLE_EMPTY
+      rect        10 128 1 1
+      textalign   ITEM_ALIGN_LEFT
+      textalignx  0
+      textaligny  10
+      textscale   0.50
+      textstyle   ITEM_TEXTSTYLE_NORMAL
+      text        "Nick 'jex' Jansens"
+      forecolor   1 1 1 1
+      backcolor   1 0 0 1
+      visible     1
+      decoration 
+    }
+    itemDef
+    {
+      name        "credit2right"
+      group       grpidcredit
+      style       WINDOW_STYLE_EMPTY
+      rect        630 128 1 1
+      textalign   ITEM_ALIGN_RIGHT
+      textalignx  0
+      textaligny  10
+      textscale   0.50
+      textstyle   ITEM_TEXTSTYLE_NORMAL
+      text        "Mapping, texturing and 2D artwork"
+      forecolor   1 1 1 1
+      backcolor   0 1 0 1
+      visible     1
+      decoration 
+    }
+
+    itemDef
+    {
+      name        "credit3left"
+      group       grpidcredit
+      style       WINDOW_STYLE_EMPTY
+      rect        10 160 1 1
+      textalign   ITEM_ALIGN_LEFT
+      textalignx  0
+      textaligny  10
+      textscale   0.50
+      textstyle   ITEM_TEXTSTYLE_NORMAL
+      text        "Robin 'OverFlow' Marshall"
+      forecolor   1 1 1 1
+      backcolor   1 0 0 1
+      visible     1
+      decoration 
+    }
+    itemDef
+    {
+      name        "credit3right"
+      group       grpidcredit
+      style       WINDOW_STYLE_EMPTY
+      rect        630 160 1 1
+      textalign   ITEM_ALIGN_RIGHT
+      textalignx  0
+      textaligny  10
+      textscale   0.50
+      textstyle   ITEM_TEXTSTYLE_NORMAL
+      text        "Modelling, animation and mapping"
+      forecolor   1 1 1 1
+      backcolor   0 1 0 1
+      visible     1
+      decoration 
+    }
+
+    itemDef
+    {
+      name        "credit4left"
+      group       grpidcredit
+      style       WINDOW_STYLE_EMPTY
+      rect        10 192 1 1
+      textalign   ITEM_ALIGN_LEFT
+      textalignx  0
+      textaligny  10
+      textscale   0.50
+      textstyle   ITEM_TEXTSTYLE_NORMAL
+      text        "Jan 'Stannum' van der Weg"
+      forecolor   1 1 1 1
+      backcolor   1 0 0 1
+      visible     1
+      decoration 
+    }
+    itemDef
+    {
+      name        "credit4right"
+      group       grpidcredit
+      style       WINDOW_STYLE_EMPTY
+      rect        630 192 1 1
+      textalign   ITEM_ALIGN_RIGHT
+      textalignx  0
+      textaligny  10
+      textscale   0.50
+      textstyle   ITEM_TEXTSTYLE_NORMAL
+      text        "Texturing and mapping"
+      forecolor   1 1 1 1
+      backcolor   0 1 0 1
+      visible     1
+      decoration 
+    }
+
+    itemDef
+    {
+      name        "credit5left"
+      group       grpidcredit
+      style       WINDOW_STYLE_EMPTY
+      rect        10 224 1 1
+      textalign   ITEM_ALIGN_LEFT
+      textalignx  0
+      textaligny  10
+      textscale   0.50
+      textstyle   ITEM_TEXTSTYLE_NORMAL
+      text        "Mike 'Veda' McInnerney"
+      forecolor   1 1 1 1
+      backcolor   1 0 0 1
+      visible     1
+      decoration 
+    }
+    itemDef
+    {
+      name        "credit5right"
+      group       grpidcredit
+      style       WINDOW_STYLE_EMPTY
+      rect        630 224 1 1
+      textalign   ITEM_ALIGN_RIGHT
+      textalignx  0
+      textaligny  10
+      textscale   0.50
+      textstyle   ITEM_TEXTSTYLE_NORMAL
+      text        "Modelling and texturing"
+      forecolor   1 1 1 1
+      backcolor   0 1 0 1
+      visible     1
+      decoration 
+    }
+
+    itemDef
+    {
+      name        "credit6left"
+      group       grpidcredit
+      style       WINDOW_STYLE_EMPTY
+      rect        10 256 1 1
+      textalign   ITEM_ALIGN_LEFT
+      textalignx  0
+      textaligny  10
+      textscale   0.50
+      textstyle   ITEM_TEXTSTYLE_NORMAL
+      text        "Gordon 'Godmil' Miller"
+      forecolor   1 1 1 1
+      backcolor   1 0 0 1
+      visible     1
+      decoration 
+    }
+    itemDef
+    {
+      name        "credit6right"
+      group       grpidcredit
+      style       WINDOW_STYLE_EMPTY
+      rect        630 256 1 1
+      textalign   ITEM_ALIGN_RIGHT
+      textalignx  0
+      textaligny  10
+      textscale   0.50
+      textstyle   ITEM_TEXTSTYLE_NORMAL
+      text        "Mapping"
+      forecolor   1 1 1 1
+      backcolor   0 1 0 1
+      visible     1
+      decoration 
+    }
+
+    itemDef
+    {
+      name        "credit7left"
+      group       grpidcredit
+      style       WINDOW_STYLE_EMPTY
+      rect        10 288 1 1
+      textalign   ITEM_ALIGN_LEFT
+      textalignx  0
+      textaligny  10
+      textscale   0.50
+      textstyle   ITEM_TEXTSTYLE_NORMAL
+      text        "'Who-[Soup]'"
+      forecolor   1 1 1 1
+      backcolor   1 0 0 1
+      visible     1
+      decoration 
+    }
+    itemDef
+    {
+      name        "credit7right"
+      group       grpidcredit
+      style       WINDOW_STYLE_EMPTY
+      rect        630 288 1 1
+      textalign   ITEM_ALIGN_RIGHT
+      textalignx  0
+      textaligny  10
+      textscale   0.50
+      textstyle   ITEM_TEXTSTYLE_NORMAL
+      text        "Mapping"
+      forecolor   1 1 1 1
+      backcolor   0 1 0 1
+      visible     1
+      decoration 
+    }
+
+    itemDef
+    {
+      name        "credit8left"
+      group       grpidcredit
+      style       WINDOW_STYLE_EMPTY
+      rect        10 320 1 1
+      textalign   ITEM_ALIGN_LEFT
+      textalignx  0
+      textaligny  10
+      textscale   0.50
+      textstyle   ITEM_TEXTSTYLE_NORMAL
+      text        "Tristan 'jhrx' Blease"
+      forecolor   1 1 1 1
+      backcolor   1 0 0 1
+      visible     1
+      decoration 
+    }
+    itemDef
+    {
+      name        "credit8right"
+      group       grpidcredit
+      style       WINDOW_STYLE_EMPTY
+      rect        630 320 1 1
+      textalign   ITEM_ALIGN_RIGHT
+      textalignx  0
+      textaligny  10
+      textscale   0.50
+      textstyle   ITEM_TEXTSTYLE_NORMAL
+      text        "Mapping"
+      forecolor   1 1 1 1
+      backcolor   0 1 0 1
+      visible     1
+      decoration 
+    }
+
+    itemDef
+    {
+      name        "credit9left"
+      group       grpidcredit
+      style       WINDOW_STYLE_EMPTY
+      rect        10 352 1 1
+      textalign   ITEM_ALIGN_LEFT
+      textalignx  0
+      textaligny  10
+      textscale   0.50
+      textstyle   ITEM_TEXTSTYLE_NORMAL
+      text        "Paul 'MoP' Greveson"
+      forecolor   1 1 1 1
+      backcolor   1 0 0 1
+      visible     1
+      decoration 
+    }
+    itemDef
+    {
+      name        "credit9right"
+      group       grpidcredit
+      style       WINDOW_STYLE_EMPTY
+      rect        630 352 1 1
+      textalign   ITEM_ALIGN_RIGHT
+      textalignx  0
+      textaligny  10
+      textscale   0.50
+      textstyle   ITEM_TEXTSTYLE_NORMAL
+      text        "Modelling and texturing"
+      forecolor   1 1 1 1
+      backcolor   0 1 0 1
+      visible     1
+      decoration 
+    }
+    
+    itemDef
+    {
+      name        "credit10left"
+      group       grpidcredit
+      style       WINDOW_STYLE_EMPTY
+      rect        10 384 1 1
+      textalign   ITEM_ALIGN_LEFT
+      textalignx  0
+      textaligny  10
+      textscale   0.50
+      textstyle   ITEM_TEXTSTYLE_NORMAL
+      text        "Chris 'Dolby' McCarthy"
+      forecolor   1 1 1 1
+      backcolor   1 0 0 1
+      visible     1
+      decoration 
+    }
+    itemDef
+    {
+      name        "credit10right"
+      group       grpidcredit
+      style       WINDOW_STYLE_EMPTY
+      rect        630 384 1 1
+      textalign   ITEM_ALIGN_RIGHT
+      textalignx  0
+      textaligny  10
+      textscale   0.50
+      textstyle   ITEM_TEXTSTYLE_NORMAL
+      text        "Sound"
+      forecolor   1 1 1 1
+      backcolor   0 1 0 1
+      visible     1
       decoration 
-      visible 1
     }
   }
 }
diff --git a/ui/tremulous_human_hud.menu b/ui/tremulous_human_hud.menu
index a7e24a5b..59faf981 100644
--- a/ui/tremulous_human_hud.menu
+++ b/ui/tremulous_human_hud.menu
@@ -349,10 +349,11 @@
     itemDef
     {
       name "scanner"
-      rect 60 300 520 120
+      rect 164 340 312 72
       visible 1
       decoration
-      background "textures/common/invisible" //FIXME: change to a bunch on concentric circles
+      forecolor 0.0 0.8 1.0 .5
+      background "ui/assets/human/scanner.tga"
       ownerdraw CG_PLAYER_HUMAN_SCANNER
     }