r5320 - in trunk/data: gfx/menu/default gfx/menu/silver gfx/menu/simplygray gfx/menu/wickedblack gfx/menu/wickedblue gfx/menu/wickedgreen gfx/menu/wickedred gfx/menu/wickedwhite gfx/menu/wickedyellow gfx/menu/wickedz gfx/menu/xaw qcsrc/menu/nexuiz

[DONOTREPLY at icculus.org]

Author: div0
Date: 2008-12-26 12:08:44 -0500 (Fri, 26 Dec 2008)
New Revision: 5320

Added:
   trunk/data/gfx/menu/default/colorpicker_m.tga
   trunk/data/gfx/menu/silver/colorpicker_m.tga
   trunk/data/gfx/menu/simplygray/colorpicker_m.tga
   trunk/data/gfx/menu/wickedblack/colorpicker_m.tga
   trunk/data/gfx/menu/wickedblue/colorpicker_m.tga
   trunk/data/gfx/menu/wickedgreen/colorpicker_m.tga
   trunk/data/gfx/menu/wickedred/colorpicker_m.tga
   trunk/data/gfx/menu/wickedwhite/colorpicker_m.tga
   trunk/data/gfx/menu/wickedyellow/colorpicker_m.tga
   trunk/data/gfx/menu/wickedz/colorpicker_m.tga
   trunk/data/gfx/menu/xaw/colorpicker_m.tga
Modified:
   trunk/data/qcsrc/menu/nexuiz/colorpicker.c
Log:
allow a mask for the color picker brightening/darkening for textshadow/brightness


Added: trunk/data/gfx/menu/default/colorpicker_m.tga
===================================================================
(Binary files differ)


Property changes on: trunk/data/gfx/menu/default/colorpicker_m.tga
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/data/gfx/menu/silver/colorpicker_m.tga
===================================================================
(Binary files differ)


Property changes on: trunk/data/gfx/menu/silver/colorpicker_m.tga
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/data/gfx/menu/simplygray/colorpicker_m.tga
===================================================================
(Binary files differ)


Property changes on: trunk/data/gfx/menu/simplygray/colorpicker_m.tga
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/data/gfx/menu/wickedblack/colorpicker_m.tga
===================================================================
(Binary files differ)


Property changes on: trunk/data/gfx/menu/wickedblack/colorpicker_m.tga
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/data/gfx/menu/wickedblue/colorpicker_m.tga
===================================================================
(Binary files differ)


Property changes on: trunk/data/gfx/menu/wickedblue/colorpicker_m.tga
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/data/gfx/menu/wickedgreen/colorpicker_m.tga
===================================================================
(Binary files differ)


Property changes on: trunk/data/gfx/menu/wickedgreen/colorpicker_m.tga
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/data/gfx/menu/wickedred/colorpicker_m.tga
===================================================================
(Binary files differ)


Property changes on: trunk/data/gfx/menu/wickedred/colorpicker_m.tga
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/data/gfx/menu/wickedwhite/colorpicker_m.tga
===================================================================
(Binary files differ)


Property changes on: trunk/data/gfx/menu/wickedwhite/colorpicker_m.tga
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/data/gfx/menu/wickedyellow/colorpicker_m.tga
===================================================================
(Binary files differ)


Property changes on: trunk/data/gfx/menu/wickedyellow/colorpicker_m.tga
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/data/gfx/menu/wickedz/colorpicker_m.tga
===================================================================
--- trunk/data/gfx/menu/wickedz/colorpicker_m.tga	                        (rev 0)
+++ trunk/data/gfx/menu/wickedz/colorpicker_m.tga	2008-12-26 17:08:44 UTC (rev 5320)
@@ -0,0 +1 @@
+           
 
  ÿ
\ No newline at end of file


Property changes on: trunk/data/gfx/menu/wickedz/colorpicker_m.tga
___________________________________________________________________
Name: svn:mergeinfo
   + 

Added: trunk/data/gfx/menu/xaw/colorpicker_m.tga
===================================================================
(Binary files differ)


Property changes on: trunk/data/gfx/menu/xaw/colorpicker_m.tga
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Modified: trunk/data/qcsrc/menu/nexuiz/colorpicker.c
===================================================================
--- trunk/data/qcsrc/menu/nexuiz/colorpicker.c	2008-12-26 16:55:57 UTC (rev 5319)
+++ trunk/data/qcsrc/menu/nexuiz/colorpicker.c	2008-12-26 17:08:44 UTC (rev 5320)
@@ -114,6 +114,7 @@
 void drawNexuizColorpicker(entity me)
 {
 	drawImage(me);
+
 	float B, C, aC;
 	C = cvar("r_textcontrast");
 	B = cvar("r_textbrightness");
@@ -127,7 +128,7 @@
 
 	aC = 1 - C / (1 - B);
 
-	draw_Fill('0 0 0', '1 1 0', '0 0 0', aC);
-	draw_Fill('0 0 0', '1 1 0', '1 1 1', B);
+	draw_Picture(me.imgOrigin, strcat(me.src, "_m"), me.imgSize, '0 0 0', aC);
+	draw_Picture(me.imgOrigin, strcat(me.src, "_m"), me.imgSize, me.color, B);
 }
 #endif