Merge remote branch 'refs/remotes/origin/fruitiex/newpanelhud'

diff --git a/gfx/hud/luminos/ammo_bullets.tga b/gfx/hud/luminos/ammo_bullets.tga
index 8f3739d4821b01512a2a769f08c4212cc61fc3ce..c06e9949189639ca79afd384a388e8cf9e8550c7 100644 (file)
Binary files a/gfx/hud/luminos/ammo_bullets.tga and b/gfx/hud/luminos/ammo_bullets.tga differ

diff --git a/gfx/hud/luminos/ammo_cells.tga b/gfx/hud/luminos/ammo_cells.tga
index 4850763419258e81c8edb738f4f6178ef19e8868..eda3e46f268892be5d6019c40e5aa23e007a69af 100644 (file)
Binary files a/gfx/hud/luminos/ammo_cells.tga and b/gfx/hud/luminos/ammo_cells.tga differ

diff --git a/gfx/hud/luminos/ammo_fuel.tga b/gfx/hud/luminos/ammo_fuel.tga
index 4a3a2d5563a733f4fd0895a5eda3636d8f33fc16..3f3a8918f07171a8018a7a1074127ae7e363d408 100644 (file)
Binary files a/gfx/hud/luminos/ammo_fuel.tga and b/gfx/hud/luminos/ammo_fuel.tga differ

diff --git a/gfx/hud/luminos/ammo_rockets.tga b/gfx/hud/luminos/ammo_rockets.tga
index 9b34ea79389418aa3d65dc2a089bb3301a18a1ba..a7bf03e4162ac16055a1cd317d2cc678c093e86b 100644 (file)
Binary files a/gfx/hud/luminos/ammo_rockets.tga and b/gfx/hud/luminos/ammo_rockets.tga differ

diff --git a/gfx/hud/luminos/ammo_shells.tga b/gfx/hud/luminos/ammo_shells.tga
index f62c715625b7a3ca69e2c082fdf03c0f138503c8..5fe646987136016599a177e583825ebb4ab4b18f 100644 (file)
Binary files a/gfx/hud/luminos/ammo_shells.tga and b/gfx/hud/luminos/ammo_shells.tga differ

diff --git a/gfx/hud/luminos/armor.tga b/gfx/hud/luminos/armor.tga
index f9e47011aa7c1a5631bcadd1a2778e0aaeffe705..b52445d539903983f71711189d4cacfe33f9723c 100644 (file)
Binary files a/gfx/hud/luminos/armor.tga and b/gfx/hud/luminos/armor.tga differ

diff --git a/gfx/hud/luminos/health.tga b/gfx/hud/luminos/health.tga
index 26e40865c992fd6acf42e027b4480b896b057485..d19db5095f66be5874d02c3800473a54a695f23a 100644 (file)
Binary files a/gfx/hud/luminos/health.tga and b/gfx/hud/luminos/health.tga differ

diff --git a/gfx/hud/luminos/nexball_carrying.tga b/gfx/hud/luminos/nexball_carrying.tga
new file mode 100644 (file)
index 0000000..2f993e0
Binary files /dev/null and b/gfx/hud/luminos/nexball_carrying.tga differ

diff --git a/gfx/hud/luminos/notify_telefrag.tga b/gfx/hud/luminos/notify_telefrag.tga
new file mode 100644 (file)
index 0000000..279910f
Binary files /dev/null and b/gfx/hud/luminos/notify_telefrag.tga differ

diff --git a/qcsrc/client/hud.qh b/qcsrc/client/hud.qh
index 89f5edbdcc3228d8d128d4a1b69f87dbf80181fc..bdc533edbd7e818a56c7b473cf7c63980a124e1c 100644 (file)
--- a/qcsrc/client/hud.qh
+++ b/qcsrc/client/hud.qh
@@ -33,7 +33,6 @@ float last_weapon;
 float weapontime;
 
 float teamnagger;
-float hud_fg_alpha;
 float hud_accuracy_hud;
 float hud_border_thickness;
 float hud_accuracy_border_thickness;

diff --git a/qcsrc/client/mapvoting.qc b/qcsrc/client/mapvoting.qc
index c352cacaea05af16daa4feb922bcc4b8d81bc472..7c3bcecc50d22be197f696b15a60b05036dd466f 100644 (file)
--- a/qcsrc/client/mapvoting.qc
+++ b/qcsrc/client/mapvoting.qc
@@ -249,7 +249,7 @@ void MapVote_Draw()
                MapVote_DrawAbstain(pos, isize, xmax - xmin, tmp, i);
        }
 
-       drawpic(mv_mousepos, strcat("gfx/menu/", cvar_string("menu_skin"), "/cursor.tga"), '32 32 0', '1 1 1', hud_fg_alpha, DRAWFLAG_NORMAL);
+       drawpic(mv_mousepos, strcat("gfx/menu/", cvar_string("menu_skin"), "/cursor.tga"), '32 32 0', '1 1 1', autocvar_hud_panel_fg_alpha, DRAWFLAG_NORMAL);
 }
 
 void Cmd_MapVote_MapDownload(float argc)

diff --git a/qcsrc/client/waypointsprites.qc b/qcsrc/client/waypointsprites.qc
index db0fdb83fd81a3dd46293211d9eca60df94157ad..d7b9ee9d01960829aa3992dcebec4eb6bb7e84c8 100644 (file)
--- a/qcsrc/client/waypointsprites.qc
+++ b/qcsrc/client/waypointsprites.qc
@@ -166,7 +166,7 @@ void Draw_WaypointSprite()
        dist = vlen(self.origin - view_origin);
        
        float a;
-       a = self.alpha * hud_fg_alpha;
+       a = self.alpha * autocvar_hud_panel_fg_alpha;
 
        if(self.maxdistance > waypointsprite_normdistance)
                a *= pow(bound(0, (self.maxdistance - dist) / (self.maxdistance - waypointsprite_normdistance), 1), waypointsprite_distancealphaexponent);