Gumby's stuff. Ownerdrawn weapon selection

7 files changed, 148 insertions, 87 deletions

diff --git a/ui/tremulous_alienbuild.menu b/ui/tremulous_alienbuild.menu
index c82063a2..2be8631b 100644
--- a/ui/tremulous_alienbuild.menu
+++ b/ui/tremulous_alienbuild.menu
@@ -7,17 +7,20 @@
     visible 0
     fullscreen 0
     outOfBoundsClick
-    rect 120 140 400 200
-    focusColor 1 .75 0 1
+    rect 112 111 400 247
+    focusColor 0.835294 0.784314 0.85098 1
     style WINDOW_STYLE_FILLED
     disableColor .5 .5 .5 0
-    backcolor 0 .5 0 .25
+    backcolor 0.235294 0.184314 0.25098 .25
+    border WINDOW_BORDER_FULL
+    borderSize 1
+    bordercolor 0.835294 0.784314 0.85098 .25
     onOpen { uiScript LoadAlienBuilds }
 
     itemDef
     {
       name "list"
-      rect 10 10 150 180
+      rect 8 8 136 231
       type ITEM_TYPE_LISTBOX
       style WINDOW_STYLE_FILLED
       elementwidth 120
@@ -26,7 +29,7 @@
       elementtype LISTBOX_TEXT
       feeder FEEDER_TREMALIENBUILD
       forecolor 1 1 1 1
-      backcolor 0 0 .5 .25
+      backcolor 0.235294 0.184314 0.25098 .25
       outlinecolor .1 .1 .7 .5
       visible 1
     }
@@ -37,10 +40,10 @@
       ownerdraw UI_ABUILDINFOPANE
       textstyle ITEM_TEXTSTYLE_NORMAL
       style WINDOW_STYLE_FILLED	
-      rect 170 10 220 155
+      rect 161 8 231 204
       textscale .3
       forecolor 1 1 1 1
-      backcolor .5 0 0 .25
+      backcolor 0.235294 0.184314 0.25098 .25
       visible 1 
       decoration
     }
@@ -51,10 +54,10 @@
       text "OK"
       type ITEM_TYPE_BUTTON
       style WINDOW_STYLE_FILLED
-      rect 320 176 20 14
+      rect 319 218 34 21
       textalign ITEM_ALIGN_LEFT
-      textalignx 5
-      textaligny 12
+      textalignx 12.5
+      textaligny 16
       textscale .25
       forecolor 1 1 1 1
       backcolor .5 0 0 .25
@@ -68,10 +71,10 @@
       text "Cancel"
       type ITEM_TYPE_BUTTON
       style WINDOW_STYLE_FILLED
-      rect 350 176 40 14
+      rect 358 218 34 21
       textalign ITEM_ALIGN_LEFT
-      textalignx 6
-      textaligny 12
+      textalignx 3.8
+      textaligny 16
       textscale .25
       forecolor 1 1 1 1
       backcolor .5 0 0 .25
diff --git a/ui/tremulous_alienclass.menu b/ui/tremulous_alienclass.menu
index 6b9b1e9d..d10d6191 100644
--- a/ui/tremulous_alienclass.menu
+++ b/ui/tremulous_alienclass.menu
@@ -7,17 +7,20 @@
     visible 1
     fullscreen 0
     outOfBoundsClick
-    rect 120 140 400 200
-    focusColor 1 .75 0 1
+    rect 112 111 400 247
+    focusColor 0.835294 0.784314 0.85098 1
     style WINDOW_STYLE_FILLED
     disableColor .5 .5 .5 0
-    backcolor 0 .5 0 .25
+    backcolor 0.235294 0.184314 0.25098 .25
+    border WINDOW_BORDER_FULL
+    borderSize 1
+    bordercolor 0.835294 0.784314 0.85098 .25
     onOpen { uiScript LoadAlienClasses }
 
     itemDef
     {
       name "list"
-      rect 10 10 150 180
+      rect 8 8 136 231
       type ITEM_TYPE_LISTBOX
       style WINDOW_STYLE_FILLED
       elementwidth 120
@@ -26,7 +29,7 @@
       elementtype LISTBOX_TEXT
       feeder FEEDER_TREMALIENCLASSES
       forecolor 1 1 1 1
-      backcolor 0 0 .5 .25
+      backcolor 0.235294 0.184314 0.25098 .25
       outlinecolor .1 .1 .7 .5
       visible 1
     }
@@ -37,10 +40,10 @@
       ownerdraw UI_ACLASSINFOPANE
       textstyle ITEM_TEXTSTYLE_NORMAL
       style WINDOW_STYLE_FILLED	
-      rect 170 10 220 155
+      rect 161 8 231 204
       textscale .3
       forecolor 1 1 1 1
-      backcolor .5 0 0 .25
+      backcolor 0.235294 0.184314 0.25098 .25
       visible 1 
       decoration
     }
@@ -51,10 +54,10 @@
       text "< Back"
       type ITEM_TYPE_BUTTON
       style WINDOW_STYLE_FILLED
-      rect 170 176 40 14
+      rect 161 218 34 21
       textalign ITEM_ALIGN_LEFT
-      textalignx 5
-      textaligny 12
+      textalignx 3
+      textaligny 16
       textscale .25
       forecolor 1 1 1 1
       backcolor .5 0 0 .25
@@ -68,10 +71,10 @@
       text "OK"
       type ITEM_TYPE_BUTTON
       style WINDOW_STYLE_FILLED
-      rect 320 176 20 14
+      rect 319 218 34 21
       textalign ITEM_ALIGN_LEFT
-      textalignx 5
-      textaligny 12
+      textalignx 12.5
+      textaligny 16
       textscale .25
       forecolor 1 1 1 1
       backcolor .5 0 0 .25
@@ -85,10 +88,10 @@
       text "Cancel"
       type ITEM_TYPE_BUTTON
       style WINDOW_STYLE_FILLED
-      rect 350 176 40 14
+      rect 358 218 34 21
       textalign ITEM_ALIGN_LEFT
-      textalignx 6
-      textaligny 12
+      textalignx 3.8
+      textaligny 16
       textscale .25
       forecolor 1 1 1 1
       backcolor .5 0 0 .25
diff --git a/ui/tremulous_alienupgrade.menu b/ui/tremulous_alienupgrade.menu
index 5b8c7c98..98d35b3d 100644
--- a/ui/tremulous_alienupgrade.menu
+++ b/ui/tremulous_alienupgrade.menu
@@ -7,17 +7,20 @@
     visible 1
     fullscreen 0
     outOfBoundsClick
-    rect 120 140 400 200
-    focusColor 1 .75 0 1
+    rect 112 111 400 247
+    focusColor 0.835294 0.784314 0.85098 1
     style WINDOW_STYLE_FILLED
     disableColor .5 .5 .5 0
-    backcolor 0 .5 0 .25
+    backcolor 0.235294 0.184314 0.25098 .25
+    border WINDOW_BORDER_FULL
+    borderSize 1
+    bordercolor 0.835294 0.784314 0.85098 .25
     onOpen { uiScript LoadAlienUpgrades }
 
     itemDef
     {
       name "list"
-      rect 10 10 150 180
+      rect 8 8 136 231
       type ITEM_TYPE_LISTBOX
       style WINDOW_STYLE_FILLED
       elementwidth 120
@@ -26,7 +29,7 @@
       elementtype LISTBOX_TEXT
       feeder FEEDER_TREMALIENUPGRADE
       forecolor 1 1 1 1
-      backcolor 0 0 .5 .25
+      backcolor 0.235294 0.184314 0.25098 .25
       outlinecolor .1 .1 .7 .5
       visible 1
     }
@@ -37,10 +40,10 @@
       ownerdraw UI_AUPGRADEINFOPANE
       textstyle ITEM_TEXTSTYLE_NORMAL
       style WINDOW_STYLE_FILLED	
-      rect 170 10 220 155
+      rect 161 8 231 204
       textscale .3
       forecolor 1 1 1 1
-      backcolor .5 0 0 .25
+      backcolor 0.235294 0.184314 0.25098 .25
       visible 1 
       decoration
     }
@@ -51,10 +54,10 @@
       text "OK"
       type ITEM_TYPE_BUTTON
       style WINDOW_STYLE_FILLED
-      rect 320 176 20 14
+      rect 319 218 34 21
       textalign ITEM_ALIGN_LEFT
-      textalignx 5
-      textaligny 12
+      textalignx 12.5
+      textaligny 16
       textscale .25
       forecolor 1 1 1 1
       backcolor .5 0 0 .25
@@ -68,10 +71,10 @@
       text "Cancel"
       type ITEM_TYPE_BUTTON
       style WINDOW_STYLE_FILLED
-      rect 350 176 40 14
+      rect 358 218 34 21
       textalign ITEM_ALIGN_LEFT
-      textalignx 6
-      textaligny 12
+      textalignx 3.8
+      textaligny 16
       textscale .25
       forecolor 1 1 1 1
       backcolor .5 0 0 .25
diff --git a/ui/tremulous_human_hud.menu b/ui/tremulous_human_hud.menu
index e860a1b6..5d3b5411 100644
--- a/ui/tremulous_human_hud.menu
+++ b/ui/tremulous_human_hud.menu
@@ -96,5 +96,26 @@
       forecolor 1 1 1 1
       ownerdraw CG_PLAYER_HEALTH
     }
+    
+    // SELECT
+    itemDef
+    {
+      name "select"
+      rect 200 420 160 32
+      visible 1
+      decoration
+      ownerdraw CG_PLAYER_SELECT
+    }
+    
+    // SELECT TEXT
+    itemDef
+    {
+      name "selecttext"
+      rect 200 20 240 40
+      visible 1
+      decoration
+      textScale .5
+      ownerdraw CG_PLAYER_SELECTTEXT
+    }
   }
 }
diff --git a/ui/tremulous_humanbuild.menu b/ui/tremulous_humanbuild.menu
index ad90bc61..faf0dbc5 100644
--- a/ui/tremulous_humanbuild.menu
+++ b/ui/tremulous_humanbuild.menu
@@ -7,17 +7,20 @@
     visible 0
     fullscreen 0
     outOfBoundsClick
-    rect 120 140 400 200
-    focusColor 1 .75 0 1
+    rect 112 111 400 247
+    focusColor 0.6784314 0.74902 0.82549 1
     style WINDOW_STYLE_FILLED
     disableColor .5 .5 .5 0
-    backcolor 0 .5 0 .25
+    backcolor 0.0784314 0.14902 0.32549 .25
+    border WINDOW_BORDER_FULL
+    borderSize 1
+    bordercolor 0.6784314 0.74902 0.82549 .25
     onOpen { uiScript LoadHumanBuilds }
 
     itemDef
     {
       name "list"
-      rect 10 10 150 180
+      rect 8 8 136 231
       type ITEM_TYPE_LISTBOX
       style WINDOW_STYLE_FILLED
       elementwidth 120
@@ -26,7 +29,7 @@
       elementtype LISTBOX_TEXT
       feeder FEEDER_TREMHUMANBUILD
       forecolor 1 1 1 1
-      backcolor 0 0 .5 .25
+      backcolor 0.0784314 0.14902 0.32549 .25
       outlinecolor .1 .1 .7 .5
       visible 1
     }
@@ -37,10 +40,10 @@
       ownerdraw UI_HBUILDINFOPANE
       textstyle ITEM_TEXTSTYLE_NORMAL
       style WINDOW_STYLE_FILLED	
-      rect 170 10 220 155
+      rect 161 8 231 204
       textscale .3
       forecolor 1 1 1 1
-      backcolor .5 0 0 .25
+      backcolor 0.0784314 0.14902 0.32549 .25
       visible 1 
       decoration
     }
@@ -51,10 +54,10 @@
       text "OK"
       type ITEM_TYPE_BUTTON
       style WINDOW_STYLE_FILLED
-      rect 320 176 20 14
+      rect 319 218 34 21
       textalign ITEM_ALIGN_LEFT
-      textalignx 5
-      textaligny 12
+      textalignx 12.5
+      textaligny 16
       textscale .25
       forecolor 1 1 1 1
       backcolor .5 0 0 .25
@@ -68,10 +71,10 @@
       text "Cancel"
       type ITEM_TYPE_BUTTON
       style WINDOW_STYLE_FILLED
-      rect 350 176 40 14
+      rect 358 218 34 21
       textalign ITEM_ALIGN_LEFT
-      textalignx 6
-      textaligny 12
+      textalignx 3.8
+      textaligny 16
       textscale .25
       forecolor 1 1 1 1
       backcolor .5 0 0 .25
diff --git a/ui/tremulous_humanitem.menu b/ui/tremulous_humanitem.menu
index c4169034..e1cd0ca5 100644
--- a/ui/tremulous_humanitem.menu
+++ b/ui/tremulous_humanitem.menu
@@ -7,17 +7,20 @@
     visible 0
     fullscreen 0
     outOfBoundsClick
-    rect 120 140 400 200
-    focusColor 1 .75 0 1
+    rect 112 111 400 247
+    focusColor 0.6784314 0.74902 0.82549 1
     style WINDOW_STYLE_FILLED
     disableColor .5 .5 .5 0
-    backcolor 0 .5 0 .25
+    backcolor 0.0784314 0.14902 0.32549 .25
+    border WINDOW_BORDER_FULL
+    borderSize 1
+    bordercolor 0.6784314 0.74902 0.82549 .25
     onOpen { uiScript LoadHumanItems }
 
     itemDef
     {
       name "list"
-      rect 10 10 150 180
+      rect 8 8 136 231
       type ITEM_TYPE_LISTBOX
       style WINDOW_STYLE_FILLED
       elementwidth 120
@@ -26,7 +29,7 @@
       elementtype LISTBOX_TEXT
       feeder FEEDER_TREMHUMANITEMS
       forecolor 1 1 1 1
-      backcolor 0 0 .5 .25
+      backcolor 0.0784314 0.14902 0.32549 .25
       outlinecolor .1 .1 .7 .5
       visible 1
     }
@@ -37,10 +40,10 @@
       ownerdraw UI_HITEMINFOPANE
       textstyle ITEM_TEXTSTYLE_NORMAL
       style WINDOW_STYLE_FILLED	
-      rect 170 10 220 155
+      rect 161 8 231 204
       textscale .3
       forecolor 1 1 1 1
-      backcolor .5 0 0 .25
+      backcolor 0.0784314 0.14902 0.32549 .25
       visible 1 
       decoration
     }
@@ -51,10 +54,10 @@
       text "< Back"
       type ITEM_TYPE_BUTTON
       style WINDOW_STYLE_FILLED
-      rect 170 176 40 14
+      rect 161 218 34 21
       textalign ITEM_ALIGN_LEFT
-      textalignx 5
-      textaligny 12
+      textalignx 3
+      textaligny 16
       textscale .25
       forecolor 1 1 1 1
       backcolor .5 0 0 .25
@@ -68,10 +71,10 @@
       text "OK"
       type ITEM_TYPE_BUTTON
       style WINDOW_STYLE_FILLED
-      rect 320 176 20 14
+      rect 319 218 34 21
       textalign ITEM_ALIGN_LEFT
-      textalignx 5
-      textaligny 12
+      textalignx 12.5
+      textaligny 16
       textscale .25
       forecolor 1 1 1 1
       backcolor .5 0 0 .25
@@ -85,10 +88,10 @@
       text "Cancel"
       type ITEM_TYPE_BUTTON
       style WINDOW_STYLE_FILLED
-      rect 350 176 40 14
+      rect 358 218 34 21
       textalign ITEM_ALIGN_LEFT
-      textalignx 6
-      textaligny 12
+      textalignx 3.8
+      textaligny 16
       textscale .25
       forecolor 1 1 1 1
       backcolor .5 0 0 .25
diff --git a/ui/tremulous_teamselect.menu b/ui/tremulous_teamselect.menu
index 364bfbe9..9684aa77 100644
--- a/ui/tremulous_teamselect.menu
+++ b/ui/tremulous_teamselect.menu
@@ -7,17 +7,17 @@
     visible 0
     fullscreen 0
     outOfBoundsClick
-    rect 120 140 400 200
-    focusColor 1 .75 0 1
+    rect 112 111 400 247
+    focusColor .6 .6 1 1
     style WINDOW_STYLE_FILLED
     disableColor .5 .5 .5 0
-    backcolor 0 .5 0 .25
+    backcolor 0 0 .5 .25
     onOpen { uiScript LoadTeams }
 
     itemDef
     {
       name "list"
-      rect 10 10 150 180
+      rect 8 8 136 231
       type ITEM_TYPE_LISTBOX
       style WINDOW_STYLE_FILLED
       elementwidth 120
@@ -26,7 +26,7 @@
       elementtype LISTBOX_TEXT
       feeder FEEDER_TREMTEAMS
       forecolor 1 1 1 1
-      backcolor 0 0 .5 .25
+      backcolor 0 0 .5 .5
       outlinecolor .1 .1 .7 .5
       visible 1
     }
@@ -36,11 +36,12 @@
       name infopane
       ownerdraw UI_TEAMINFOPANE
       textstyle ITEM_TEXTSTYLE_NORMAL
-      style WINDOW_STYLE_FILLED	
-      rect 170 10 220 155
+      style WINDOW_STYLE_FILLED
+      //background "ui/screen1" // textures/base_trim/proto_comp  textures/base_wall/comp3	
+      rect 161 8 231 204
       textscale .3
       forecolor 1 1 1 1
-      backcolor .5 0 0 .25
+      backcolor 0 0 .5 .5
       visible 1 
       decoration
     }
@@ -51,12 +52,12 @@
       text "OK"
       type ITEM_TYPE_BUTTON
       style WINDOW_STYLE_FILLED
-      rect 320 176 20 14
+      rect 319 218 34 21
       textalign ITEM_ALIGN_LEFT
-      textalignx 5
-      textaligny 12
+      textalignx 12.5
+      textaligny 16
       textscale .25
-      forecolor 1 1 1 1
+      forecolor .8 .8 1 1
       backcolor .5 0 0 .25
       visible 1
       action { uiScript JoinTeam; close tremulous_teamselect }
@@ -68,15 +69,39 @@
       text "Cancel"
       type ITEM_TYPE_BUTTON
       style WINDOW_STYLE_FILLED
-      rect 350 176 40 14
+      rect 358 218 34 21
       textalign ITEM_ALIGN_LEFT
-      textalignx 6
-      textaligny 12
+      textalignx 3.8
+      textaligny 16
       textscale .25
-      forecolor 1 1 1 1
+      forecolor .8 .8 1 1
       backcolor .5 0 0 .25
       visible 1 
       action { close tremulous_teamselect }
     }
+
+    itemDef
+    {
+      name "weaponmodel"
+      type ITEM_TYPE_MODEL
+      asset_model "models/weapons2/plasma/plasma.md3"
+      rect 177 100 200 100
+      style WINDOW_STYLE_FILLED
+      forecolor 1 1 1 1
+      backcolor 0 0 0 .5
+      decoration
+      visible 1
+      model_origin 100 .01 .01
+      model_fovx 90
+      model_fovy 90
+      model_angle 90
+      model_rotation 20
+    }
+  }
+}
+ model_fovy 90
+      model_angle 90
+      model_rotation 20
+    }
   }
 }