]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
Small luma update
authorSeverin Meyer <sev.ch@web.de>
Thu, 25 Dec 2014 11:57:45 +0000 (12:57 +0100)
committerSeverin Meyer <sev.ch@web.de>
Thu, 25 Dec 2014 11:57:45 +0000 (12:57 +0100)
gfx/hud/luma/ammo_cells.tga
gfx/hud/luma/ammo_plasma.tga
gfx/hud/luma/ammo_supercells.tga
gfx/hud/luma/notify_lava.tga
gfx/menu/luma/colorbutton_c.tga
gfx/menu/luma/colorbutton_f.tga
gfx/menu/luma/colorbutton_n.tga
gfx/menu/luma/skinvalues.txt
hud_luma.cfg
models/items/a_cells_luma.tga
models/items/a_plasma_luma.tga

index 5ca2001fc1fb9ede18c5d8080036660bfd62f119..a5a6178311c7fd6c01cfa172334cc5c1a9173734 100644 (file)
Binary files a/gfx/hud/luma/ammo_cells.tga and b/gfx/hud/luma/ammo_cells.tga differ
index 76bba4a12ca80c2fd77b1d7965a36b9ad4645fcb..c47bc6fdd592b8ddd39df9061b2dfff48697d140 100644 (file)
Binary files a/gfx/hud/luma/ammo_plasma.tga and b/gfx/hud/luma/ammo_plasma.tga differ
index b9202e45b3d6ae0eac4a7486bfe28dd15a760b55..fb6a46e36e87e05a7137f132657889a645253c33 100644 (file)
Binary files a/gfx/hud/luma/ammo_supercells.tga and b/gfx/hud/luma/ammo_supercells.tga differ
index b3f74af1810e2430d34546433612340ac60d7a48..a074f86d82b6e3495eb8bc4ba7218e8a7d815e90 100644 (file)
Binary files a/gfx/hud/luma/notify_lava.tga and b/gfx/hud/luma/notify_lava.tga differ
index 10e94feee4adf15141340751be8b737044c27d92..0d8eef1394ba987c9e1d75a077ef188403b21a1a 100644 (file)
Binary files a/gfx/menu/luma/colorbutton_c.tga and b/gfx/menu/luma/colorbutton_c.tga differ
index cc87495b99b744b95b559de5b21710c0a6c0bf91..1a2fc860e99ad45d4fb86b05fb664b4888259e3a 100644 (file)
Binary files a/gfx/menu/luma/colorbutton_f.tga and b/gfx/menu/luma/colorbutton_f.tga differ
index 2fdf9197b0a80bad23039e42dc52afb9c2e1d047..3498ad541b333959d3975dc904f0536786815ebb 100644 (file)
Binary files a/gfx/menu/luma/colorbutton_n.tga and b/gfx/menu/luma/colorbutton_n.tga differ
index 6bdeb2e7b0ecb2a046884345242e8ae643db6600..1e87e8869ec5d9443c3147dde51298a675738f94 100644 (file)
@@ -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'
index 21623776237fb5325fca93cf279db144fb3b6dc7..417ae781054cd6bf289ec37a814522a8e1346c29 100644 (file)
@@ -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
index 96cd51b012ac45164bb8c777c2376bfeb8107335..2ada7fdb91e8b5b7db75d16988e948d28e83674a 100644 (file)
Binary files a/models/items/a_cells_luma.tga and b/models/items/a_cells_luma.tga differ
index 67efe23f40587a7034d8caaca5939f184e9e238c..d21484ce379932ec1d68f94ff9eb42f852dcd6f9 100644 (file)
Binary files a/models/items/a_plasma_luma.tga and b/models/items/a_plasma_luma.tga differ