From: Severin Meyer Date: Thu, 25 Dec 2014 11:57:45 +0000 (+0100) Subject: Small luma update X-Git-Tag: xonotic-v0.8.1~144^2~17 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=9dabce2fb5ea3ae6da40211cdc434a69fc58c0df;p=xonotic%2Fxonotic-data.pk3dir.git Small luma update --- diff --git a/gfx/hud/luma/ammo_cells.tga b/gfx/hud/luma/ammo_cells.tga index 5ca2001fc..a5a617831 100644 Binary files a/gfx/hud/luma/ammo_cells.tga and b/gfx/hud/luma/ammo_cells.tga differ diff --git a/gfx/hud/luma/ammo_plasma.tga b/gfx/hud/luma/ammo_plasma.tga index 76bba4a12..c47bc6fdd 100644 Binary files a/gfx/hud/luma/ammo_plasma.tga and b/gfx/hud/luma/ammo_plasma.tga differ diff --git a/gfx/hud/luma/ammo_supercells.tga b/gfx/hud/luma/ammo_supercells.tga index b9202e45b..fb6a46e36 100644 Binary files a/gfx/hud/luma/ammo_supercells.tga and b/gfx/hud/luma/ammo_supercells.tga differ diff --git a/gfx/hud/luma/notify_lava.tga b/gfx/hud/luma/notify_lava.tga index b3f74af18..a074f86d8 100644 Binary files a/gfx/hud/luma/notify_lava.tga and b/gfx/hud/luma/notify_lava.tga differ diff --git a/gfx/menu/luma/colorbutton_c.tga b/gfx/menu/luma/colorbutton_c.tga index 10e94feee..0d8eef139 100644 Binary files a/gfx/menu/luma/colorbutton_c.tga and b/gfx/menu/luma/colorbutton_c.tga differ diff --git a/gfx/menu/luma/colorbutton_f.tga b/gfx/menu/luma/colorbutton_f.tga index cc87495b9..1a2fc860e 100644 Binary files a/gfx/menu/luma/colorbutton_f.tga and b/gfx/menu/luma/colorbutton_f.tga differ diff --git a/gfx/menu/luma/colorbutton_n.tga b/gfx/menu/luma/colorbutton_n.tga index 2fdf9197b..3498ad541 100644 Binary files a/gfx/menu/luma/colorbutton_n.tga and b/gfx/menu/luma/colorbutton_n.tga differ diff --git a/gfx/menu/luma/skinvalues.txt b/gfx/menu/luma/skinvalues.txt index 6bdeb2e7b..1e87e8869 100644 --- a/gfx/menu/luma/skinvalues.txt +++ b/gfx/menu/luma/skinvalues.txt @@ -23,12 +23,18 @@ COLOR_BUTTON_N '1 1 1' // campaign ALPHA_CAMPAIGN_CURRENT 1 -COLOR_CAMPAIGN_CURRENT '0.95 0.99 1' +COLOR_CAMPAIGN_CURRENT '0.96 0.99 1' ALPHA_CAMPAIGN_DESCRIPTION 0.8 ALPHA_CAMPAIGN_FUTURE 0.2 -COLOR_CAMPAIGN_FUTURE '0.95 0.99 1' +COLOR_CAMPAIGN_FUTURE '0.96 0.99 1' ALPHA_CAMPAIGN_SELECTABLE 0.6 -COLOR_CAMPAIGN_SELECTABLE '0.95 0.99 1' +COLOR_CAMPAIGN_SELECTABLE '0.96 0.99 1' + +// charmap +ALPHA_CHARMAP_CHAR 0.85 +COLOR_CHARMAP_CHAR '1 1 1' +ALPHA_CHARMAP_FOCUS 0.85 +COLOR_CHARMAP_FOCUS '0.09 0.42 0.69' // checkbox COLOR_CHECKBOX_C '1 1 1' @@ -49,7 +55,7 @@ MARGIN_COLORPICKER '0 0 0' ALPHA_CREDITS_FUNCTION 1 COLOR_CREDITS_FUNCTION '0.03 0.25 0.49' ALPHA_CREDITS_PERSON 0.8 -COLOR_CREDITS_PERSON '0.95 0.99 1' +COLOR_CREDITS_PERSON '0.96 0.99 1' ALPHA_CREDITS_TITLE 1 COLOR_CREDITS_TITLE '0.94 0.45 0.11' ROWS_CREDITS 20 @@ -108,9 +114,9 @@ POSITION_DIALOG_QUIT '1.05 1.2 0' // font ALPHA_TEXT 0.8 -COLOR_TEXT '0.95 0.99 1' +COLOR_TEXT '0.96 0.99 1' ALPHA_HEADER 0.5 -COLOR_HEADER '0.95 0.99 1' +COLOR_HEADER '0.96 0.99 1' FONTSIZE_NORMAL 12 FONTSIZE_TITLE 16 FONTSIZE_TOOLTIP 12 @@ -125,7 +131,7 @@ MARGIN_INPUTBOX_CHARS 1 // keygrabber ALPHA_KEYGRABBER_KEYS 0.8 -COLOR_KEYGRABBER_KEYS '0.95 0.99 1' +COLOR_KEYGRABBER_KEYS '0.96 0.99 1' ALPHA_KEYGRABBER_TITLES 1 COLOR_KEYGRABBER_TITLES '0.03 0.25 0.49' @@ -146,11 +152,11 @@ ALPHA_MAPLIST_INCLUDEDBG 0.3 COLOR_MAPLIST_INCLUDEDBG '0.03 0.25 0.49' ALPHA_MAPLIST_INCLUDEDFG 1 ALPHA_MAPLIST_NOTINCLUDEDFG 0.25 -COLOR_MAPLIST_TITLE '0.95 0.99 1' +COLOR_MAPLIST_TITLE '0.96 0.99 1' // modeltitle ALPHA_MODELTITLE 0.8 -COLOR_MODELTITLE '0.95 0.99 1' +COLOR_MODELTITLE '0.96 0.99 1' // radiobutton COLOR_RADIOBUTTON_C '1 1 1' @@ -159,7 +165,7 @@ COLOR_RADIOBUTTON_F '1 1 1' COLOR_RADIOBUTTON_N '1 1 1' // serverinfo -COLOR_SERVERINFO_IP '0.95 0.99 1' +COLOR_SERVERINFO_IP '0.96 0.99 1' COLOR_SERVERINFO_NAME '0.94 0.45 0.11' // serverlist @@ -176,7 +182,7 @@ COLOR_SERVERLIST_MEDPING '0.98 0.76 0.08' // skinlist COLOR_SKINLIST_AUTHOR '0.56 0.72 0.86' -COLOR_SKINLIST_TITLE '0.95 0.99 1' +COLOR_SKINLIST_TITLE '0.96 0.99 1' // scrollbar COLOR_SCROLLBAR_C '1 1 1' @@ -196,7 +202,7 @@ WIDTH_SLIDERTEXT 0.333333333333 // tooltip ALPHA_TOOLTIP 0.8 -COLOR_TOOLTIP '1 0.96 0.93' +COLOR_TOOLTIP '1 0.97 0.94' AVOID_TOOLTIP '8 8 0' BORDER_TOOLTIP '16 16 0' MARGIN_TOOLTIP '10 8 0' diff --git a/hud_luma.cfg b/hud_luma.cfg index 216237762..417ae7810 100644 --- a/hud_luma.cfg +++ b/hud_luma.cfg @@ -126,7 +126,7 @@ seta hud_panel_notify_flip "0" seta hud_panel_notify_fontsize "0.8" seta hud_panel_notify_time "10" seta hud_panel_notify_fadetime "3" -seta hud_panel_notify_icon_aspect "2" +seta hud_panel_notify_icon_aspect "1" seta hud_panel_timer 1 seta hud_panel_timer_pos "0.460000 0" @@ -296,12 +296,21 @@ seta hud_panel_centerprint_fade_subsequent_passtwo_minalpha "0.5" 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.450000 0.855000" +seta hud_panel_buffs_size "0.050000 0.070000" +seta hud_panel_buffs_bg "0" +seta hud_panel_buffs_bg_color "" +seta hud_panel_buffs_bg_color_team "" +seta hud_panel_buffs_bg_alpha "" +seta hud_panel_buffs_bg_border "" +seta hud_panel_buffs_bg_padding "" + seta scoreboard_columns "default" seta scoreboard_border_thickness "1" seta scoreboard_accuracy_border_thickness "1" seta scoreboard_accuracy_doublerows "0" seta scoreboard_accuracy_nocolors "0" -seta scoreboard_accuracy "1" seta scoreboard_color_bg_r "0.125" seta scoreboard_color_bg_g "0.55" seta scoreboard_color_bg_b "0.875" @@ -310,25 +319,9 @@ seta scoreboard_alpha_bg "0.7" seta scoreboard_alpha_fg "1" seta scoreboard_alpha_name "0.9" seta scoreboard_alpha_name_self "1" -seta scoreboard_fadeinspeed "10" -seta scoreboard_fadeoutspeed "10" seta scoreboard_highlight "1" seta scoreboard_highlight_alpha "0" seta scoreboard_highlight_alpha_self "0.3" -seta scoreboard_offset_left "0.18" -seta scoreboard_offset_right "0.18" -seta scoreboard_offset_vertical "0.05" seta scoreboard_bg_scale "0.25" -seta scoreboard_respawntime_decimals "1" - -seta hud_panel_buffs 1 -seta hud_panel_buffs_pos "0.450000 0.855000" -seta hud_panel_buffs_size "0.050000 0.070000" -seta hud_panel_buffs_bg "0" -seta hud_panel_buffs_bg_color "" -seta hud_panel_buffs_bg_color_team "" -seta hud_panel_buffs_bg_alpha "" -seta hud_panel_buffs_bg_border "" -seta hud_panel_buffs_bg_padding "" menu_sync diff --git a/models/items/a_cells_luma.tga b/models/items/a_cells_luma.tga index 96cd51b01..2ada7fdb9 100644 Binary files a/models/items/a_cells_luma.tga and b/models/items/a_cells_luma.tga differ diff --git a/models/items/a_plasma_luma.tga b/models/items/a_plasma_luma.tga index 67efe23f4..d21484ce3 100644 Binary files a/models/items/a_plasma_luma.tga and b/models/items/a_plasma_luma.tga differ