Merge branch 'master' into sev/luma_revisions
authorSeverin Meyer <sev.ch@web.de>
Sun, 2 Aug 2015 09:40:58 +0000 (11:40 +0200)
committerSeverin Meyer <sev.ch@web.de>
Sun, 2 Aug 2015 09:40:58 +0000 (11:40 +0200)
41 files changed:
_hud_descriptions.cfg
gfx/crosshair55.tga
gfx/hud/luma/border_shadow_east.tga [new file with mode: 0644]
gfx/hud/luma/border_shadow_north.tga [new file with mode: 0644]
gfx/hud/luma/border_shadow_south.tga [new file with mode: 0644]
gfx/hud/luma/border_shadow_west.tga [new file with mode: 0644]
gfx/hud/luma/border_tab_east.tga
gfx/hud/luma/border_tab_north.tga
gfx/hud/luma/border_tab_south.tga
gfx/hud/luma/border_tab_west.tga
gfx/hud/luma/powerup_invisibility.tga
gfx/hud/luma/shield.tga
gfx/hud/luma/weapon_accuracy.tga
gfx/hud/luma/weapon_accuracy_north.tga [deleted file]
gfx/hud/luma/weapon_accuracy_south.tga [deleted file]
gfx/hud/luma/weapon_accuracy_west.tga [deleted file]
gfx/hud/luma/weapon_ammo.tga
gfx/hud/luma/weapon_current_bg.tga
gfx/hud/luma/weapon_current_bg_north.tga [deleted file]
gfx/hud/luma/weapon_current_bg_south.tga [deleted file]
gfx/hud/luma/weapon_current_bg_west.tga [deleted file]
gfx/hud/luma/weaponflak.tga [new file with mode: 0644]
gfx/menu/luma/icon_aeslevel1.tga
gfx/menu/luma/icon_aeslevel2.tga
gfx/menu/luma/icon_ipv4.tga [new file with mode: 0644]
gfx/menu/luma/icon_ipv6.tga [new file with mode: 0644]
gfx/menu/luma/icon_mod_instagib.tga [new file with mode: 0644]
hud_luma.cfg
hud_luminos.cfg
hud_luminos_minimal.cfg
hud_luminos_minimal_xhair.cfg
hud_luminos_old.cfg
hud_nexuiz.cfg
models/items/g_invincible_luma.tga
models/items/powerup_invisibility_luma.tga
models/weapons/g_flak_luma.tga [new file with mode: 0644]
models/weapons/g_sniperrifle_luma.tga [new file with mode: 0644]
qcsrc/client/autocvars.qh
qcsrc/client/hud.qc
qcsrc/client/hud_config.qc
qcsrc/menu/xonotic/dialog_hudpanel_weapons.qc

index 8bbe389..0a1c1d4 100644 (file)
@@ -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"
index adf1950..8709b58 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
index 974fb6b..8cd0ede 100644 (file)
Binary files a/gfx/hud/luma/border_tab_east.tga and b/gfx/hud/luma/border_tab_east.tga differ
index 62e3793..0a64f30 100644 (file)
Binary files a/gfx/hud/luma/border_tab_north.tga and b/gfx/hud/luma/border_tab_north.tga differ
index c6212d5..ef60b15 100644 (file)
Binary files a/gfx/hud/luma/border_tab_south.tga and b/gfx/hud/luma/border_tab_south.tga differ
index 007efa8..ea95be0 100644 (file)
Binary files a/gfx/hud/luma/border_tab_west.tga and b/gfx/hud/luma/border_tab_west.tga differ
index d1aa0c7..073c227 100644 (file)
Binary files a/gfx/hud/luma/powerup_invisibility.tga and b/gfx/hud/luma/powerup_invisibility.tga differ
index 3101dbb..9962fa6 100644 (file)
Binary files a/gfx/hud/luma/shield.tga and b/gfx/hud/luma/shield.tga differ
index 1bdcdd5..b0d906d 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
index 0a688f7..8d42c38 100644 (file)
Binary files a/gfx/hud/luma/weapon_ammo.tga and b/gfx/hud/luma/weapon_ammo.tga differ
index 6d3efb9..e0c6a5e 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
index 22aa0ff..c32dd97 100644 (file)
Binary files a/gfx/menu/luma/icon_aeslevel1.tga and b/gfx/menu/luma/icon_aeslevel1.tga differ
index 22aa0ff..c32dd97 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
index 36af8de..0912910 100644 (file)
@@ -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 ""
index 054254c..efffd53 100644 (file)
@@ -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"
index 192ef68..c0b2e3d 100644 (file)
@@ -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"
index 4045cc4..6671c40 100644 (file)
@@ -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"
index 4ec02c1..615dfb2 100644 (file)
@@ -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"
index 6728107..9dbd05f 100644 (file)
@@ -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"
index caa1938..99dd234 100644 (file)
Binary files a/models/items/g_invincible_luma.tga and b/models/items/g_invincible_luma.tga differ
index 8b1e8ed..cf186f0 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
index 0cd212f..6cf3227 100644 (file)
@@ -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;
index e0dc1d9..14a1e15 100644 (file)
@@ -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
index 4b55bb4..2bce443 100644 (file)
@@ -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");
index 7f58e6c..a78effc 100644 (file)
@@ -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)
@@ -48,6 +48,14 @@ void XonoticHUDWeaponsDialog_fill(entity me)
                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:")));
                        me.TD(me, 1, 0.8, e = makeXonoticRadioButton(2, "hud_panel_weapons_label", "0", ZCTX(_("SHOWAS^None"))));
                        me.TD(me, 1, 0.8, e = makeXonoticRadioButton(2, "hud_panel_weapons_label", "1", _("Number")));