r5321 - in branches/nexuiz-2.0: . data/gfx/menu/default data/gfx/menu/silver data/gfx/menu/simplygray data/gfx/menu/wickedblack data/gfx/menu/wickedblue data/gfx/menu/wickedgreen data/gfx/menu/wickedred data/gfx/menu/wickedwhite data/gfx/menu/wickedyellow data/gfx/menu/wickedz data/gfx/menu/xaw data/qcsrc/menu/nexuiz

[DONOTREPLY at icculus.org]

Author: div0
Date: 2008-12-26 12:09:24 -0500 (Fri, 26 Dec 2008)
New Revision: 5321

Added:
   branches/nexuiz-2.0/data/gfx/menu/default/colorpicker_m.tga
   branches/nexuiz-2.0/data/gfx/menu/silver/colorpicker_m.tga
   branches/nexuiz-2.0/data/gfx/menu/simplygray/colorpicker_m.tga
   branches/nexuiz-2.0/data/gfx/menu/wickedblack/colorpicker_m.tga
   branches/nexuiz-2.0/data/gfx/menu/wickedblue/colorpicker_m.tga
   branches/nexuiz-2.0/data/gfx/menu/wickedgreen/colorpicker_m.tga
   branches/nexuiz-2.0/data/gfx/menu/wickedred/colorpicker_m.tga
   branches/nexuiz-2.0/data/gfx/menu/wickedwhite/colorpicker_m.tga
   branches/nexuiz-2.0/data/gfx/menu/wickedyellow/colorpicker_m.tga
   branches/nexuiz-2.0/data/gfx/menu/wickedz/colorpicker_m.tga
   branches/nexuiz-2.0/data/gfx/menu/xaw/colorpicker_m.tga
Modified:
   branches/nexuiz-2.0/.patchsets
   branches/nexuiz-2.0/data/qcsrc/menu/nexuiz/colorpicker.c
Log:
r5320 | div0 | 2008-12-26 18:08:44 +0100 (Fri, 26 Dec 2008) | 2 lines
allow a mask for the color picker brightening/darkening for textshadow/brightness

Modified: branches/nexuiz-2.0/.patchsets
===================================================================
--- branches/nexuiz-2.0/.patchsets	2008-12-26 17:08:44 UTC (rev 5320)
+++ branches/nexuiz-2.0/.patchsets	2008-12-26 17:09:24 UTC (rev 5321)
@@ -1,2 +1,2 @@
 master = svn://svn.icculus.org/nexuiz/trunk
-revisions_applied = 1-5318
+revisions_applied = 1-5320

Copied: branches/nexuiz-2.0/data/gfx/menu/default/colorpicker_m.tga (from rev 5320, trunk/data/gfx/menu/default/colorpicker_m.tga)
===================================================================
(Binary files differ)

Copied: branches/nexuiz-2.0/data/gfx/menu/silver/colorpicker_m.tga (from rev 5320, trunk/data/gfx/menu/silver/colorpicker_m.tga)
===================================================================
(Binary files differ)

Copied: branches/nexuiz-2.0/data/gfx/menu/simplygray/colorpicker_m.tga (from rev 5320, trunk/data/gfx/menu/simplygray/colorpicker_m.tga)
===================================================================
(Binary files differ)

Copied: branches/nexuiz-2.0/data/gfx/menu/wickedblack/colorpicker_m.tga (from rev 5320, trunk/data/gfx/menu/wickedblack/colorpicker_m.tga)
===================================================================
(Binary files differ)

Copied: branches/nexuiz-2.0/data/gfx/menu/wickedblue/colorpicker_m.tga (from rev 5320, trunk/data/gfx/menu/wickedblue/colorpicker_m.tga)
===================================================================
(Binary files differ)

Copied: branches/nexuiz-2.0/data/gfx/menu/wickedgreen/colorpicker_m.tga (from rev 5320, trunk/data/gfx/menu/wickedgreen/colorpicker_m.tga)
===================================================================
(Binary files differ)

Copied: branches/nexuiz-2.0/data/gfx/menu/wickedred/colorpicker_m.tga (from rev 5320, trunk/data/gfx/menu/wickedred/colorpicker_m.tga)
===================================================================
(Binary files differ)

Copied: branches/nexuiz-2.0/data/gfx/menu/wickedwhite/colorpicker_m.tga (from rev 5320, trunk/data/gfx/menu/wickedwhite/colorpicker_m.tga)
===================================================================
(Binary files differ)

Copied: branches/nexuiz-2.0/data/gfx/menu/wickedyellow/colorpicker_m.tga (from rev 5320, trunk/data/gfx/menu/wickedyellow/colorpicker_m.tga)
===================================================================
(Binary files differ)

Copied: branches/nexuiz-2.0/data/gfx/menu/wickedz/colorpicker_m.tga (from rev 5320, trunk/data/gfx/menu/wickedz/colorpicker_m.tga)
===================================================================
--- branches/nexuiz-2.0/data/gfx/menu/wickedz/colorpicker_m.tga	                        (rev 0)
+++ branches/nexuiz-2.0/data/gfx/menu/wickedz/colorpicker_m.tga	2008-12-26 17:09:24 UTC (rev 5321)
@@ -0,0 +1 @@
+           
 
  ÿ
\ No newline at end of file

Copied: branches/nexuiz-2.0/data/gfx/menu/xaw/colorpicker_m.tga (from rev 5320, trunk/data/gfx/menu/xaw/colorpicker_m.tga)
===================================================================
(Binary files differ)

Modified: branches/nexuiz-2.0/data/qcsrc/menu/nexuiz/colorpicker.c
===================================================================
--- branches/nexuiz-2.0/data/qcsrc/menu/nexuiz/colorpicker.c	2008-12-26 17:08:44 UTC (rev 5320)
+++ branches/nexuiz-2.0/data/qcsrc/menu/nexuiz/colorpicker.c	2008-12-26 17:09:24 UTC (rev 5321)
@@ -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