Merge branch 'master' into sev/luma_revisions

diff --git a/_hud_descriptions.cfg b/_hud_descriptions.cfg
index 8bbe38942d196b630559e110e85b8c0f1e0a6fbd..0a1c1d4bc3fe093be7b37a31f0b478d32a8b589a 100644 (file)
--- a/_hud_descriptions.cfg
+++ b/_hud_descriptions.cfg
@@ -64,6 +64,8 @@ seta hud_panel_weapons_label_scale "" "scale of the weapon text label"
 seta hud_panel_weapons_accuracy "" "show accuracy color as the weapon icon background; colors can be configured with accuracy_color* cvars"
 seta hud_panel_weapons_ammo "" "show ammo as a status bar"
 seta hud_panel_weapons_onlyowned "" "show only owned weapons"
+seta hud_panel_weapons_noncurrent_alpha "" "alpha of noncurrent weapons"
+seta hud_panel_weapons_noncurrent_scale "" "scale of noncurrent weapons, relative to the current weapon"
 
 seta hud_panel_ammo "" "enable/disable this panel"
 seta hud_panel_ammo_pos "" "position of this panel"

diff --git a/gfx/crosshair55.tga b/gfx/crosshair55.tga
index adf195049ef4385f99bfc01b9e9030319e33e91a..8709b58ccac52e006f6989f6b0248ad0c5ae3585 100644 (file)
Binary files a/gfx/crosshair55.tga and b/gfx/crosshair55.tga differ

diff --git a/gfx/hud/luma/border_shadow_east.tga b/gfx/hud/luma/border_shadow_east.tga
new file mode 100644 (file)
index 0000000..4a420e7
Binary files /dev/null and b/gfx/hud/luma/border_shadow_east.tga differ

diff --git a/gfx/hud/luma/border_shadow_north.tga b/gfx/hud/luma/border_shadow_north.tga
new file mode 100644 (file)
index 0000000..9574660
Binary files /dev/null and b/gfx/hud/luma/border_shadow_north.tga differ

diff --git a/gfx/hud/luma/border_shadow_south.tga b/gfx/hud/luma/border_shadow_south.tga
new file mode 100644 (file)
index 0000000..7eea1ea
Binary files /dev/null and b/gfx/hud/luma/border_shadow_south.tga differ

diff --git a/gfx/hud/luma/border_shadow_west.tga b/gfx/hud/luma/border_shadow_west.tga
new file mode 100644 (file)
index 0000000..f5378ec
Binary files /dev/null and b/gfx/hud/luma/border_shadow_west.tga differ

diff --git a/gfx/hud/luma/border_tab_east.tga b/gfx/hud/luma/border_tab_east.tga
index 974fb6bb8752b159e3d08f8feddb0bebb41de04b..8cd0ede0c3df3106a3c9799670e53524b5834cb1 100644 (file)
Binary files a/gfx/hud/luma/border_tab_east.tga and b/gfx/hud/luma/border_tab_east.tga differ

diff --git a/gfx/hud/luma/border_tab_north.tga b/gfx/hud/luma/border_tab_north.tga
index 62e379306a67dcdf502a71bdb7b73b68016f7664..0a64f30415ab826a258c30668bd40397fd7b2bae 100644 (file)
Binary files a/gfx/hud/luma/border_tab_north.tga and b/gfx/hud/luma/border_tab_north.tga differ

diff --git a/gfx/hud/luma/border_tab_south.tga b/gfx/hud/luma/border_tab_south.tga
index c6212d5a8ef92ee62fdc49cf26bf27dce5e550a1..ef60b15580e86360ca200dedf14dbfcffc5d8d04 100644 (file)
Binary files a/gfx/hud/luma/border_tab_south.tga and b/gfx/hud/luma/border_tab_south.tga differ

diff --git a/gfx/hud/luma/border_tab_west.tga b/gfx/hud/luma/border_tab_west.tga
index 007efa8ed2c0b77856556b73d491968957a0e30c..ea95be07dc77d9ce2dd99b662bd63502a5fa0afd 100644 (file)
Binary files a/gfx/hud/luma/border_tab_west.tga and b/gfx/hud/luma/border_tab_west.tga differ

diff --git a/gfx/hud/luma/powerup_invisibility.tga b/gfx/hud/luma/powerup_invisibility.tga
index d1aa0c72ab142c61518859eb6a79980f5a8b49ec..073c227ef08138587239499d4369526af1d9bfc3 100644 (file)
Binary files a/gfx/hud/luma/powerup_invisibility.tga and b/gfx/hud/luma/powerup_invisibility.tga differ

diff --git a/gfx/hud/luma/shield.tga b/gfx/hud/luma/shield.tga
index 3101dbb4d4b19ec0b591cde0977fd2c3b6ce03c6..9962fa63ef99f3e8ee83ca60038303e70945e9a0 100644 (file)
Binary files a/gfx/hud/luma/shield.tga and b/gfx/hud/luma/shield.tga differ

diff --git a/gfx/hud/luma/weapon_accuracy.tga b/gfx/hud/luma/weapon_accuracy.tga
index 1bdcdd50f19996930faa98508e85937c0dc6fd06..b0d906db0d780511f14d6a328599e96d007bde55 100644 (file)
Binary files a/gfx/hud/luma/weapon_accuracy.tga and b/gfx/hud/luma/weapon_accuracy.tga differ

diff --git a/gfx/hud/luma/weapon_accuracy_north.tga b/gfx/hud/luma/weapon_accuracy_north.tga
deleted file mode 100644 (file)
index 03cc0ff..0000000
Binary files a/gfx/hud/luma/weapon_accuracy_north.tga and /dev/null differ

diff --git a/gfx/hud/luma/weapon_accuracy_south.tga b/gfx/hud/luma/weapon_accuracy_south.tga
deleted file mode 100644 (file)
index 7aa8069..0000000
Binary files a/gfx/hud/luma/weapon_accuracy_south.tga and /dev/null differ

diff --git a/gfx/hud/luma/weapon_accuracy_west.tga b/gfx/hud/luma/weapon_accuracy_west.tga
deleted file mode 100644 (file)
index 965c9ad..0000000
Binary files a/gfx/hud/luma/weapon_accuracy_west.tga and /dev/null differ

diff --git a/gfx/hud/luma/weapon_ammo.tga b/gfx/hud/luma/weapon_ammo.tga
index 0a688f71dc47cbf0266065ca5fa60d484d10238e..8d42c3863f2aa907332d058e70949ca89f51b29c 100644 (file)
Binary files a/gfx/hud/luma/weapon_ammo.tga and b/gfx/hud/luma/weapon_ammo.tga differ

diff --git a/gfx/hud/luma/weapon_current_bg.tga b/gfx/hud/luma/weapon_current_bg.tga
index 6d3efb9a2d7ffadbbcf7933b916b75f406e22d7d..e0c6a5edb28c1a714d56a85a06e41419f9ca85c2 100644 (file)
Binary files a/gfx/hud/luma/weapon_current_bg.tga and b/gfx/hud/luma/weapon_current_bg.tga differ

diff --git a/gfx/hud/luma/weapon_current_bg_north.tga b/gfx/hud/luma/weapon_current_bg_north.tga
deleted file mode 100644 (file)
index 8ad7ec2..0000000
Binary files a/gfx/hud/luma/weapon_current_bg_north.tga and /dev/null differ

diff --git a/gfx/hud/luma/weapon_current_bg_south.tga b/gfx/hud/luma/weapon_current_bg_south.tga
deleted file mode 100644 (file)
index a2b9bf7..0000000
Binary files a/gfx/hud/luma/weapon_current_bg_south.tga and /dev/null differ

diff --git a/gfx/hud/luma/weapon_current_bg_west.tga b/gfx/hud/luma/weapon_current_bg_west.tga
deleted file mode 100644 (file)
index d40e2a4..0000000
Binary files a/gfx/hud/luma/weapon_current_bg_west.tga and /dev/null differ

diff --git a/gfx/hud/luma/weaponflak.tga b/gfx/hud/luma/weaponflak.tga
new file mode 100644 (file)
index 0000000..8dd37f2
Binary files /dev/null and b/gfx/hud/luma/weaponflak.tga differ

diff --git a/gfx/menu/luma/icon_aeslevel1.tga b/gfx/menu/luma/icon_aeslevel1.tga
index 22aa0ff6833922cf30db1ad4dc3d0bc85657dfc7..c32dd97a85d90dcdc42bf8935af07006b4ee74ca 100644 (file)
Binary files a/gfx/menu/luma/icon_aeslevel1.tga and b/gfx/menu/luma/icon_aeslevel1.tga differ

diff --git a/gfx/menu/luma/icon_aeslevel2.tga b/gfx/menu/luma/icon_aeslevel2.tga
index 22aa0ff6833922cf30db1ad4dc3d0bc85657dfc7..c32dd97a85d90dcdc42bf8935af07006b4ee74ca 100644 (file)
Binary files a/gfx/menu/luma/icon_aeslevel2.tga and b/gfx/menu/luma/icon_aeslevel2.tga differ

diff --git a/gfx/menu/luma/icon_ipv4.tga b/gfx/menu/luma/icon_ipv4.tga
new file mode 100644 (file)
index 0000000..83659d0
Binary files /dev/null and b/gfx/menu/luma/icon_ipv4.tga differ

diff --git a/gfx/menu/luma/icon_ipv6.tga b/gfx/menu/luma/icon_ipv6.tga
new file mode 100644 (file)
index 0000000..43d9d41
Binary files /dev/null and b/gfx/menu/luma/icon_ipv6.tga differ

diff --git a/gfx/menu/luma/icon_mod_instagib.tga b/gfx/menu/luma/icon_mod_instagib.tga
new file mode 100644 (file)
index 0000000..ce8c2d5
Binary files /dev/null and b/gfx/menu/luma/icon_mod_instagib.tga differ

diff --git a/hud_luma.cfg b/hud_luma.cfg
index 36af8de6758b798ca0db0fb34c15a2156bb42b33..0912910b76eafe67ec28ce1b1efc27cf1baa9c05 100644 (file)
--- a/hud_luma.cfg
+++ b/hud_luma.cfg
@@ -33,7 +33,7 @@ seta hud_configure_grid_xsize "0.005000"
 seta hud_configure_grid_ysize "0.005000"
 
 seta hud_panel_weapons 1
-seta hud_panel_weapons_pos "0.965000 0.120000"
+seta hud_panel_weapons_pos "0.965000 0.125000"
 seta hud_panel_weapons_size "0.035000 0.770000"
 seta hud_panel_weapons_bg "border_default_east"
 seta hud_panel_weapons_bg_color ""
@@ -62,10 +62,12 @@ seta hud_panel_weapons_timeout_fadefgmin "0.4"
 seta hud_panel_weapons_timeout_speed_in "0.25"
 seta hud_panel_weapons_timeout_speed_out "0.75"
 seta hud_panel_weapons_onlyowned "1"
+seta hud_panel_weapons_noncurrent_alpha "0.8"
+seta hud_panel_weapons_noncurrent_scale "0.8"
 
 seta hud_panel_ammo 1
-seta hud_panel_ammo_pos "0.330000 0.865000"
-seta hud_panel_ammo_size "0.340000 0.060000"
+seta hud_panel_ammo_pos "0.315000 0.865000"
+seta hud_panel_ammo_size "0.370000 0.060000"
 seta hud_panel_ammo_bg "border_tab_south"
 seta hud_panel_ammo_bg_color ""
 seta hud_panel_ammo_bg_color_team ""
@@ -82,17 +84,17 @@ seta hud_panel_ammo_progressbar_xoffset "0"
 seta hud_panel_ammo_text "1"
 
 seta hud_panel_powerups 1
-seta hud_panel_powerups_pos "0 0.270000"
-seta hud_panel_powerups_size "0.040000 0.415000"
-seta hud_panel_powerups_bg "border_default_west"
+seta hud_panel_powerups_pos "0.325000 0.820000"
+seta hud_panel_powerups_size "0.350000 0.050000"
+seta hud_panel_powerups_bg "border_shadow_south"
 seta hud_panel_powerups_bg_color ""
 seta hud_panel_powerups_bg_color_team ""
 seta hud_panel_powerups_bg_alpha ""
 seta hud_panel_powerups_bg_border ""
-seta hud_panel_powerups_bg_padding "2"
+seta hud_panel_powerups_bg_padding ""
 seta hud_panel_powerups_flip "1"
-seta hud_panel_powerups_iconalign "1"
-seta hud_panel_powerups_baralign "1"
+seta hud_panel_powerups_iconalign "2"
+seta hud_panel_powerups_baralign "2"
 seta hud_panel_powerups_progressbar "1"
 seta hud_panel_powerups_progressbar_strength "progressbar"
 seta hud_panel_powerups_progressbar_shield "progressbar"
@@ -208,7 +210,7 @@ seta hud_panel_modicons_dom_layout "1"
 seta hud_panel_modicons_freezetag_layout "1"
 
 seta hud_panel_pressedkeys 1
-seta hud_panel_pressedkeys_pos "0.445000 0.730000"
+seta hud_panel_pressedkeys_pos "0.445000 0.710000"
 seta hud_panel_pressedkeys_size "0.110000 0.090000"
 seta hud_panel_pressedkeys_bg " "
 seta hud_panel_pressedkeys_bg_color ""
@@ -253,7 +255,7 @@ seta hud_panel_infomessages_bg_padding "0"
 seta hud_panel_infomessages_flip "1"
 
 seta hud_panel_physics 3
-seta hud_panel_physics_pos "0.410000 0.630000"
+seta hud_panel_physics_pos "0.410000 0.625000"
 seta hud_panel_physics_size "0.180000 0.080000"
 seta hud_panel_physics_bg "0"
 seta hud_panel_physics_bg_color ""
@@ -302,8 +304,8 @@ seta hud_panel_centerprint_fade_subsequent_minfontsize "0.75"
 seta hud_panel_centerprint_fade_minfontsize "0"
 
 seta hud_panel_buffs 1
-seta hud_panel_buffs_pos "0.435000 0.840000"
-seta hud_panel_buffs_size "0.125000 0.035000"
+seta hud_panel_buffs_pos "0.325000 0.820000"
+seta hud_panel_buffs_size "0.350000 0.050000"
 seta hud_panel_buffs_bg "0"
 seta hud_panel_buffs_bg_color ""
 seta hud_panel_buffs_bg_color_team ""

diff --git a/hud_luminos.cfg b/hud_luminos.cfg
index 054254c06b0da9593fbfa09c976c0930612dda41..efffd53e3b3e0105832bbaf14630b56eb71c584f 100644 (file)
--- a/hud_luminos.cfg
+++ b/hud_luminos.cfg
@@ -62,6 +62,8 @@ seta hud_panel_weapons_timeout_fadefgmin "0.4"
 seta hud_panel_weapons_timeout_speed_in "0.25"
 seta hud_panel_weapons_timeout_speed_out "0.75"
 seta hud_panel_weapons_onlyowned "1"
+seta hud_panel_weapons_noncurrent_alpha "1"
+seta hud_panel_weapons_noncurrent_scale "1"
 
 seta hud_panel_ammo 1
 seta hud_panel_ammo_pos "0.330000 0.960000"

diff --git a/hud_luminos_minimal.cfg b/hud_luminos_minimal.cfg
index 192ef68d91f5f61cd67fd6eb2474b122d6ec97c2..c0b2e3d90878e5c6dbf362fd00590f1aae4c1499 100644 (file)
--- a/hud_luminos_minimal.cfg
+++ b/hud_luminos_minimal.cfg
@@ -62,6 +62,8 @@ seta hud_panel_weapons_timeout_fadefgmin "0"
 seta hud_panel_weapons_timeout_speed_in "0.25"
 seta hud_panel_weapons_timeout_speed_out "0.75"
 seta hud_panel_weapons_onlyowned "1"
+seta hud_panel_weapons_noncurrent_alpha "1"
+seta hud_panel_weapons_noncurrent_scale "1"
 
 seta hud_panel_ammo 1
 seta hud_panel_ammo_pos "0.650000 0.890000"

diff --git a/hud_luminos_minimal_xhair.cfg b/hud_luminos_minimal_xhair.cfg
index 4045cc44dd4efdef79955630df919c7ee55df8a3..6671c402181c76fbe1b9b34da0d3d6f0130e4354 100644 (file)
--- a/hud_luminos_minimal_xhair.cfg
+++ b/hud_luminos_minimal_xhair.cfg
@@ -62,6 +62,8 @@ seta hud_panel_weapons_timeout_fadefgmin "0"
 seta hud_panel_weapons_timeout_speed_in "0.25"
 seta hud_panel_weapons_timeout_speed_out "0.75"
 seta hud_panel_weapons_onlyowned "1"
+seta hud_panel_weapons_noncurrent_alpha "1"
+seta hud_panel_weapons_noncurrent_scale "1"
 
 seta hud_panel_ammo 1
 seta hud_panel_ammo_pos "0.450000 0.630000"

diff --git a/hud_luminos_old.cfg b/hud_luminos_old.cfg
index 4ec02c1b1c26afc2615949577ca07566a137754a..615dfb296e4b12c35fc20956e2e9531f054ad546 100644 (file)
--- a/hud_luminos_old.cfg
+++ b/hud_luminos_old.cfg
@@ -62,6 +62,8 @@ seta hud_panel_weapons_timeout_fadefgmin "0"
 seta hud_panel_weapons_timeout_speed_in "0.25"
 seta hud_panel_weapons_timeout_speed_out "0.75"
 seta hud_panel_weapons_onlyowned "1"
+seta hud_panel_weapons_noncurrent_alpha "1"
+seta hud_panel_weapons_noncurrent_scale "1"
 
 seta hud_panel_ammo 1
 seta hud_panel_ammo_pos "0.190000 0.920000"

diff --git a/hud_nexuiz.cfg b/hud_nexuiz.cfg
index 6728107fb104c8998a94cbf6855d37f7df0ff9dc..9dbd05f54a74029f4a1a980f6a206e1b163e2c05 100644 (file)
--- a/hud_nexuiz.cfg
+++ b/hud_nexuiz.cfg
@@ -62,6 +62,8 @@ seta hud_panel_weapons_timeout_fadefgmin "0"
 seta hud_panel_weapons_timeout_speed_in "0.25"
 seta hud_panel_weapons_timeout_speed_out "0.75"
 seta hud_panel_weapons_onlyowned "0"
+seta hud_panel_weapons_noncurrent_alpha "1"
+seta hud_panel_weapons_noncurrent_scale "1"
 
 seta hud_panel_ammo 1
 seta hud_panel_ammo_pos "0.160000 0.910000"

diff --git a/models/items/g_invincible_luma.tga b/models/items/g_invincible_luma.tga
index caa1938c6d8fa0e6e4f410375d65b1cf9db4562a..99dd234644f79632bd4cb2766683c90dab6f5c2d 100644 (file)
Binary files a/models/items/g_invincible_luma.tga and b/models/items/g_invincible_luma.tga differ

diff --git a/models/items/powerup_invisibility_luma.tga b/models/items/powerup_invisibility_luma.tga
index 8b1e8ed3cf0ac6642eddf674b5f9c85af67dcdff..cf186f08e1554366ce6ec42e4792327a40e7c39a 100644 (file)
Binary files a/models/items/powerup_invisibility_luma.tga and b/models/items/powerup_invisibility_luma.tga differ

diff --git a/models/weapons/g_flak_luma.tga b/models/weapons/g_flak_luma.tga
new file mode 100644 (file)
index 0000000..78ace25
Binary files /dev/null and b/models/weapons/g_flak_luma.tga differ

diff --git a/models/weapons/g_sniperrifle_luma.tga b/models/weapons/g_sniperrifle_luma.tga
new file mode 100644 (file)
index 0000000..5f8e135
Binary files /dev/null and b/models/weapons/g_sniperrifle_luma.tga differ

diff --git a/qcsrc/client/autocvars.qh b/qcsrc/client/autocvars.qh
index 0cd212f329a3e3af34877f540b1feeb4a20cae51..6cf3227933dfd55ac4490b13c7d802e573dcb8ef 100644 (file)
--- a/qcsrc/client/autocvars.qh
+++ b/qcsrc/client/autocvars.qh
@@ -354,6 +354,8 @@ float autocvar_hud_panel_weapons_complainbubble_time;
 int autocvar_hud_panel_weapons_label;
 float autocvar_hud_panel_weapons_label_scale = 0.5;
 bool autocvar_hud_panel_weapons_onlyowned;
+float autocvar_hud_panel_weapons_noncurrent_alpha = 1;
+float autocvar_hud_panel_weapons_noncurrent_scale = 1;
 float autocvar_hud_panel_weapons_timeout;
 int autocvar_hud_panel_weapons_timeout_effect;
 float autocvar_hud_panel_weapons_timeout_fadebgmin;

diff --git a/qcsrc/client/hud.qc b/qcsrc/client/hud.qc
index e0dc1d91b7c93babe7324ae3cdc585163643006e..14a1e15aecca88f595baacf1482df8eb838666ec 100644 (file)
--- a/qcsrc/client/hud.qc
+++ b/qcsrc/client/hud.qc
@@ -789,11 +789,17 @@ void HUD_Weapons(void)
        // draw items
        row = column = 0;
        vector label_size = '1 1 0' * min(weapon_size.x, weapon_size.y) * bound(0, autocvar_hud_panel_weapons_label_scale, 1);
+       vector noncurrent_pos = '0 0 0';
+       vector noncurrent_size = weapon_size * bound(0, autocvar_hud_panel_weapons_noncurrent_scale, 1);
+       float noncurrent_alpha = panel_fg_alpha * bound(0, autocvar_hud_panel_weapons_noncurrent_alpha, 1);
+       bool isCurrent;
+
        for(i = 0; i <= WEP_LAST-WEP_FIRST; ++i)
        {
                // retrieve information about the current weapon to be drawn
                self = weaponorder[i];
                weapon_id = self.impulse;
+               isCurrent = (self.weapon == switchweapon);
 
                // skip if this weapon doesn't exist
                if(!self || weapon_id < 0) { continue; }
@@ -804,12 +810,12 @@ void HUD_Weapons(void)
                        continue;
 
                // figure out the drawing position of weapon
-               weapon_pos = (panel_pos
-                       + eX * column * weapon_size.x
-                       + eY * row * weapon_size.y);
+               weapon_pos = (panel_pos + eX * column * weapon_size.x + eY * row * weapon_size.y);
+               noncurrent_pos.x = weapon_pos.x + (weapon_size.x - noncurrent_size.x) / 2;
+               noncurrent_pos.y = weapon_pos.y + (weapon_size.y - noncurrent_size.y) / 2;
 
                // draw background behind currently selected weapon
-               if(self.weapon == switchweapon)
+               if(isCurrent)
                        drawpic_aspect_skin(weapon_pos, "weapon_current_bg", weapon_size, '1 1 1', panel_fg_alpha, DRAWFLAG_NORMAL);
 
                // draw the weapon accuracy
@@ -827,7 +833,10 @@ void HUD_Weapons(void)
                if(weapons_stat & WepSet_FromWeapon(self.weapon))
                {
                        // draw the weapon image
-                       drawpic_aspect_skin(weapon_pos, self.model2, weapon_size, '1 1 1', panel_fg_alpha, DRAWFLAG_NORMAL);
+                       if(isCurrent)
+                               drawpic_aspect_skin(weapon_pos, self.model2, weapon_size, '1 1 1', panel_fg_alpha, DRAWFLAG_NORMAL);
+                       else
+                               drawpic_aspect_skin(noncurrent_pos, self.model2, noncurrent_size, '1 1 1', noncurrent_alpha, DRAWFLAG_NORMAL);
 
                        // draw weapon label string
                        switch(autocvar_hud_panel_weapons_label)
@@ -889,7 +898,7 @@ void HUD_Weapons(void)
                }
                else // draw a "ghost weapon icon" if you don't have the weapon
                {
-                       drawpic_aspect_skin(weapon_pos, self.model2, weapon_size, '0 0 0', panel_fg_alpha * 0.5, DRAWFLAG_NORMAL);
+                       drawpic_aspect_skin(noncurrent_pos, self.model2, noncurrent_size, '0.2 0.2 0.2', panel_fg_alpha * 0.5, DRAWFLAG_NORMAL);
                }
 
                // draw the complain message

diff --git a/qcsrc/client/hud_config.qc b/qcsrc/client/hud_config.qc
index 4b55bb40e9850ab92c104210f6d2fb3712373c93..2bce4439241156d6b38bf93c50de62d4febf40e5 100644 (file)
--- a/qcsrc/client/hud_config.qc
+++ b/qcsrc/client/hud_config.qc
@@ -96,6 +96,8 @@ void HUD_Panel_ExportCfg(string cfgname)
                                        HUD_Write_PanelCvar_q("_timeout_speed_in");
                                        HUD_Write_PanelCvar_q("_timeout_speed_out");
                                        HUD_Write_PanelCvar_q("_onlyowned");
+                                       HUD_Write_PanelCvar_q("_noncurrent_alpha");
+                                       HUD_Write_PanelCvar_q("_noncurrent_scale");
                                        break;
                                case HUD_PANEL_AMMO:
                                        HUD_Write_PanelCvar_q("_onlycurrent");

diff --git a/qcsrc/menu/xonotic/dialog_hudpanel_weapons.qc b/qcsrc/menu/xonotic/dialog_hudpanel_weapons.qc
index 7f58e6c4abe904435eaa553c1ab14cc3715149df..a78effc6ed1e421dc50ae36ca185dbce5084470a 100644 (file)
--- a/qcsrc/menu/xonotic/dialog_hudpanel_weapons.qc
+++ b/qcsrc/menu/xonotic/dialog_hudpanel_weapons.qc
@@ -6,7 +6,7 @@ CLASS(XonoticHUDWeaponsDialog, XonoticRootDialog)
        ATTRIB(XonoticHUDWeaponsDialog, title, string, _("Weapons Panel"))
        ATTRIB(XonoticHUDWeaponsDialog, color, vector, SKINCOLOR_DIALOG_TEAMSELECT)
        ATTRIB(XonoticHUDWeaponsDialog, intendedWidth, float, 0.4)
-       ATTRIB(XonoticHUDWeaponsDialog, rows, float, 19)
+       ATTRIB(XonoticHUDWeaponsDialog, rows, float, 21)
        ATTRIB(XonoticHUDWeaponsDialog, columns, float, 4)
        ATTRIB(XonoticHUDWeaponsDialog, name, string, "HUDweapons")
        ATTRIB(XonoticHUDWeaponsDialog, requiresConnection, float, true)
@@ -46,6 +46,14 @@ void XonoticHUDWeaponsDialog_fill(entity me)
        me.TR(me);
                me.TDempty(me, 0.2);
                me.TD(me, 1, 3.8, e = makeXonoticCheckBox(0, "hud_panel_weapons_onlyowned", _("Show only owned weapons")));
+       me.TR(me);
+               me.TDempty(me, 0.2);
+               me.TD(me, 1, 1.2, e = makeXonoticTextLabel(0, _("Noncurrent alpha:")));
+               me.TD(me, 1, 2.6, e = makeXonoticSlider(0, 1, 0.1, "hud_panel_weapons_noncurrent_alpha"));
+       me.TR(me);
+               me.TDempty(me, 0.2);
+               me.TD(me, 1, 1.2, e = makeXonoticTextLabel(0, _("Noncurrent scale:")));
+               me.TD(me, 1, 2.6, e = makeXonoticSlider(0, 1, 0.1, "hud_panel_weapons_noncurrent_scale"));
        me.TR(me);
                me.TDempty(me, 0.2);
                me.TD(me, 1, 1.4, e = makeXonoticTextLabel(0, _("Show weapon ID as:")));