[nexuiz-commits] r7645 - in trunk/data: . gfx/menu/blueplastic 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
DONOTREPLY at icculus.org
DONOTREPLY at icculus.org
Sat Sep 5 09:09:17 EDT 2009
Author: div0
Date: 2009-09-05 09:09:17 -0400 (Sat, 05 Sep 2009)
New Revision: 7645
Modified:
trunk/data/gfx/menu/blueplastic/skinvalues.txt
trunk/data/gfx/menu/default/skinvalues.txt
trunk/data/gfx/menu/silver/skinvalues.txt
trunk/data/gfx/menu/simplygray/skinvalues.txt
trunk/data/gfx/menu/wickedblack/skinvalues.txt
trunk/data/gfx/menu/wickedblue/skinvalues.txt
trunk/data/gfx/menu/wickedgreen/skinvalues.txt
trunk/data/gfx/menu/wickedred/skinvalues.txt
trunk/data/gfx/menu/wickedwhite/skinvalues.txt
trunk/data/gfx/menu/wickedyellow/skinvalues.txt
trunk/data/gfx/menu/wickedz/skinvalues.txt
trunk/data/gfx/menu/xaw/skinvalues.txt
trunk/data/qcsrc/menu/menu.qc
trunk/data/qcsrc/menu/skin-customizables.inc
trunk/data/weapons.cfg
trunk/data/weaponsHavoc.cfg
Log:
new property for menu skins: ALIGN_BACKGROUND
it's a string of the form "57915"
each number is an alignment of a background image
first layer in the string is background.tga, then background_l2.tga, then background_l3.tga etc.
Modified: trunk/data/gfx/menu/blueplastic/skinvalues.txt
===================================================================
--- trunk/data/gfx/menu/blueplastic/skinvalues.txt 2009-09-05 12:40:57 UTC (rev 7644)
+++ trunk/data/gfx/menu/blueplastic/skinvalues.txt 2009-09-05 13:09:17 UTC (rev 7645)
@@ -51,6 +51,8 @@
// general
// uses "background" images
// uses "background_ingame" images
+ALIGN_BACKGROUND 5
+ALIGN_BACKGROUND_INGAME 5
ALPHA_BACKGROUND_INGAME 0.7
ALPHA_DISABLED 0.4
ALPHA_BEHIND 0.5
Modified: trunk/data/gfx/menu/default/skinvalues.txt
===================================================================
--- trunk/data/gfx/menu/default/skinvalues.txt 2009-09-05 12:40:57 UTC (rev 7644)
+++ trunk/data/gfx/menu/default/skinvalues.txt 2009-09-05 13:09:17 UTC (rev 7645)
@@ -50,6 +50,8 @@
// general
// uses "background" images
// uses "background_ingame" images
+ALIGN_BACKGROUND 5
+ALIGN_BACKGROUND_INGAME 5
ALPHA_BACKGROUND_INGAME 0.7
ALPHA_DISABLED 0.2
ALPHA_BEHIND 0.5
Modified: trunk/data/gfx/menu/silver/skinvalues.txt
===================================================================
--- trunk/data/gfx/menu/silver/skinvalues.txt 2009-09-05 12:40:57 UTC (rev 7644)
+++ trunk/data/gfx/menu/silver/skinvalues.txt 2009-09-05 13:09:17 UTC (rev 7645)
@@ -50,6 +50,8 @@
// general
// uses "background" images
// uses "background_ingame" images
+ALIGN_BACKGROUND 5
+ALIGN_BACKGROUND_INGAME 5
ALPHA_BACKGROUND_INGAME 0.4
ALPHA_DISABLED 0.2
ALPHA_BEHIND 0.4
Modified: trunk/data/gfx/menu/simplygray/skinvalues.txt
===================================================================
--- trunk/data/gfx/menu/simplygray/skinvalues.txt 2009-09-05 12:40:57 UTC (rev 7644)
+++ trunk/data/gfx/menu/simplygray/skinvalues.txt 2009-09-05 13:09:17 UTC (rev 7645)
@@ -50,6 +50,8 @@
// general
// uses "background" images
// uses "background_ingame" images
+ALIGN_BACKGROUND 5
+ALIGN_BACKGROUND_INGAME 5
ALPHA_BACKGROUND_INGAME 0.7
ALPHA_DISABLED 0.2
ALPHA_BEHIND 0.5
Modified: trunk/data/gfx/menu/wickedblack/skinvalues.txt
===================================================================
--- trunk/data/gfx/menu/wickedblack/skinvalues.txt 2009-09-05 12:40:57 UTC (rev 7644)
+++ trunk/data/gfx/menu/wickedblack/skinvalues.txt 2009-09-05 13:09:17 UTC (rev 7645)
@@ -50,6 +50,8 @@
// general
// uses "background" images
// uses "background_ingame" images
+ALIGN_BACKGROUND 5
+ALIGN_BACKGROUND_INGAME 5
ALPHA_BACKGROUND_INGAME 0.7
ALPHA_DISABLED 0.2
ALPHA_BEHIND 0.5
Modified: trunk/data/gfx/menu/wickedblue/skinvalues.txt
===================================================================
--- trunk/data/gfx/menu/wickedblue/skinvalues.txt 2009-09-05 12:40:57 UTC (rev 7644)
+++ trunk/data/gfx/menu/wickedblue/skinvalues.txt 2009-09-05 13:09:17 UTC (rev 7645)
@@ -50,6 +50,8 @@
// general
// uses "background" images
// uses "background_ingame" images
+ALIGN_BACKGROUND 5
+ALIGN_BACKGROUND_INGAME 5
ALPHA_BACKGROUND_INGAME 0.7
ALPHA_DISABLED 0.2
ALPHA_BEHIND 0.5
Modified: trunk/data/gfx/menu/wickedgreen/skinvalues.txt
===================================================================
--- trunk/data/gfx/menu/wickedgreen/skinvalues.txt 2009-09-05 12:40:57 UTC (rev 7644)
+++ trunk/data/gfx/menu/wickedgreen/skinvalues.txt 2009-09-05 13:09:17 UTC (rev 7645)
@@ -50,6 +50,8 @@
// general
// uses "background" images
// uses "background_ingame" images
+ALIGN_BACKGROUND 5
+ALIGN_BACKGROUND_INGAME 5
ALPHA_BACKGROUND_INGAME 0.7
ALPHA_DISABLED 0.2
ALPHA_BEHIND 0.5
Modified: trunk/data/gfx/menu/wickedred/skinvalues.txt
===================================================================
--- trunk/data/gfx/menu/wickedred/skinvalues.txt 2009-09-05 12:40:57 UTC (rev 7644)
+++ trunk/data/gfx/menu/wickedred/skinvalues.txt 2009-09-05 13:09:17 UTC (rev 7645)
@@ -50,6 +50,8 @@
// general
// uses "background" images
// uses "background_ingame" images
+ALIGN_BACKGROUND 5
+ALIGN_BACKGROUND_INGAME 5
ALPHA_BACKGROUND_INGAME 0.7
ALPHA_DISABLED 0.2
ALPHA_BEHIND 0.5
Modified: trunk/data/gfx/menu/wickedwhite/skinvalues.txt
===================================================================
--- trunk/data/gfx/menu/wickedwhite/skinvalues.txt 2009-09-05 12:40:57 UTC (rev 7644)
+++ trunk/data/gfx/menu/wickedwhite/skinvalues.txt 2009-09-05 13:09:17 UTC (rev 7645)
@@ -50,6 +50,8 @@
// general
// uses "background" images
// uses "background_ingame" images
+ALIGN_BACKGROUND 5
+ALIGN_BACKGROUND_INGAME 5
ALPHA_BACKGROUND_INGAME 0.7
ALPHA_DISABLED 0.2
ALPHA_BEHIND 0.5
Modified: trunk/data/gfx/menu/wickedyellow/skinvalues.txt
===================================================================
--- trunk/data/gfx/menu/wickedyellow/skinvalues.txt 2009-09-05 12:40:57 UTC (rev 7644)
+++ trunk/data/gfx/menu/wickedyellow/skinvalues.txt 2009-09-05 13:09:17 UTC (rev 7645)
@@ -50,6 +50,8 @@
// general
// uses "background" images
// uses "background_ingame" images
+ALIGN_BACKGROUND 5
+ALIGN_BACKGROUND_INGAME 5
ALPHA_BACKGROUND_INGAME 0.7
ALPHA_DISABLED 0.2
ALPHA_BEHIND 0.5
Modified: trunk/data/gfx/menu/wickedz/skinvalues.txt
===================================================================
--- trunk/data/gfx/menu/wickedz/skinvalues.txt 2009-09-05 12:40:57 UTC (rev 7644)
+++ trunk/data/gfx/menu/wickedz/skinvalues.txt 2009-09-05 13:09:17 UTC (rev 7645)
@@ -64,6 +64,8 @@
// general
// uses "background" images
// uses "background_ingame" images
+ALIGN_BACKGROUND 5
+ALIGN_BACKGROUND_INGAME 5
ALPHA_BACKGROUND_INGAME 0.7
ALPHA_DISABLED 0.2
ALPHA_BEHIND 0.5
Modified: trunk/data/gfx/menu/xaw/skinvalues.txt
===================================================================
--- trunk/data/gfx/menu/xaw/skinvalues.txt 2009-09-05 12:40:57 UTC (rev 7644)
+++ trunk/data/gfx/menu/xaw/skinvalues.txt 2009-09-05 13:09:17 UTC (rev 7645)
@@ -50,6 +50,8 @@
// general
// uses "background" images
// uses "background_ingame" images
+ALIGN_BACKGROUND 5
+ALIGN_BACKGROUND_INGAME 5
ALPHA_BACKGROUND_INGAME 0
ALPHA_DISABLED 0.2
ALPHA_BEHIND 1
Modified: trunk/data/qcsrc/menu/menu.qc
===================================================================
--- trunk/data/qcsrc/menu/menu.qc 2009-09-05 12:40:57 UTC (rev 7644)
+++ trunk/data/qcsrc/menu/menu.qc 2009-09-05 13:09:17 UTC (rev 7645)
@@ -201,10 +201,14 @@
if(key == K_SHIFT) menuShiftState |= S_SHIFT;
};
-void(string img, float a) drawBackground =
+void(string img, float a, float algn) drawBackground =
{
vector sz;
vector isz;
+ vector tl, ce, br;
+ vector v;
+ string s;
+ float i, f;
sz = draw_PictureSize(img);
// keep aspect of image
if(sz_x * draw_scale_y >= sz_y * draw_scale_x)
@@ -221,10 +225,36 @@
isz_x = 1;
isz_y = isz_x * (sz_y / sz_x) * (draw_scale_x / draw_scale_y);
}
- draw_Picture('0.5 0.5 0' - 0.5 * isz, img, isz, '1 1 1', a);
+ tl = '0 0 0';
+ ce = '0.5 0.5 0' - 0.5 * isz;
+ br = '1 1 0' - isz;
+
+ s = ftos(algn);
+ v_z = 0;
+ for(i = 0; i < strlen(s); ++i)
+ {
+ f = stof(substring(s, i, 1));
+ switch(f)
+ {
+ case 1: case 4: case 7: v_x = tl_x; break;
+ case 2: case 5: case 8: v_x = ce_x; break;
+ case 3: case 6: case 9: v_x = br_x; break;
+ default: v_x = tl_x + (br_x - tl_x) * random(); break;
+ }
+ switch(f)
+ {
+ case 7: case 8: case 9: v_y = tl_y; break;
+ case 4: case 5: case 6: v_y = ce_y; break;
+ case 1: case 2: case 3: v_y = br_y; break;
+ default: v_y = tl_y + (br_y - tl_y) * random(); break;
+ }
+ if(i == 0)
+ draw_Picture(v, img, isz, '1 1 1', a);
+ else
+ draw_Picture(v, strcat(img, "_l", ftos(i+1)), isz, '1 1 1', a);
+ }
}
-
vector menuTooltipAveragedMousePos;
entity menuTooltipItem;
vector menuTooltipOrigin;
@@ -533,7 +563,7 @@
{
if(menuLogoAlpha > 0)
{
- drawBackground(SKINGFX_BACKGROUND, bound(0, menuLogoAlpha, 1));
+ drawBackground(SKINGFX_BACKGROUND, bound(0, menuLogoAlpha, 1), SKINALIGN_BACKGROUND);
if(menuAlpha <= 0 && SKINALPHA_CURSOR_INTRO > 0)
{
draw_alpha = SKINALPHA_CURSOR_INTRO * bound(0, menuLogoAlpha, 1);
@@ -545,7 +575,7 @@
else if(SKINALPHA_BACKGROUND_INGAME)
{
if(menuAlpha > 0)
- drawBackground(SKINGFX_BACKGROUND_INGAME, menuAlpha * SKINALPHA_BACKGROUND_INGAME);
+ drawBackground(SKINGFX_BACKGROUND_INGAME, menuAlpha * SKINALPHA_BACKGROUND_INGAME, SKINALIGN_BACKGROUND_INGAME);
}
draw_reset();
Modified: trunk/data/qcsrc/menu/skin-customizables.inc
===================================================================
--- trunk/data/qcsrc/menu/skin-customizables.inc 2009-09-05 12:40:57 UTC (rev 7644)
+++ trunk/data/qcsrc/menu/skin-customizables.inc 2009-09-05 13:09:17 UTC (rev 7645)
@@ -82,6 +82,8 @@
// general
SKINSTRING(GFX_BACKGROUND, "background");
SKINSTRING(GFX_BACKGROUND_INGAME, "background_ingame");
+ SKINFLOAT(ALIGN_BACKGROUND, 5);
+ SKINFLOAT(ALIGN_BACKGROUND_INGAME, 5);
SKINFLOAT(ALPHA_BACKGROUND_INGAME, 0.7);
SKINFLOAT(ALPHA_DISABLED, 0.2);
SKINFLOAT(ALPHA_BEHIND, 0.5);
Modified: trunk/data/weapons.cfg
===================================================================
--- trunk/data/weapons.cfg 2009-09-05 12:40:57 UTC (rev 7644)
+++ trunk/data/weapons.cfg 2009-09-05 13:09:17 UTC (rev 7645)
@@ -3,7 +3,7 @@
//
// And... don't forget to edit weaponsHavoc.cfg too.
-set cvar_check_weapons 8271730261e4587fe8af3ac306d38fd0
+set cvar_check_weapons d8c27ad261a5506934d70968b6a47244
// NOTE: this only replaces weapons on the map
// use g_start_weapon_* to also replace the on-startup weapons!
Modified: trunk/data/weaponsHavoc.cfg
===================================================================
--- trunk/data/weaponsHavoc.cfg 2009-09-05 12:40:57 UTC (rev 7644)
+++ trunk/data/weaponsHavoc.cfg 2009-09-05 13:09:17 UTC (rev 7645)
@@ -1,4 +1,4 @@
-set cvar_check_weapons 8271730261e4587fe8af3ac306d38fd0
+set cvar_check_weapons d8c27ad261a5506934d70968b6a47244
// NOTE: this only replaces weapons on the map
// use g_start_weapon_* to also replace the on-startup weapons!
More information about the nexuiz-commits
mailing list