From: Mario Date: Tue, 5 Apr 2016 22:50:43 +0000 (+0000) Subject: Merge branch 'terencehill/hud_skin_updates' into 'master' X-Git-Tag: xonotic-v0.8.2~969 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=b0423598270855d5f0a3206d46f0ebf43182b411;p=xonotic%2Fxonotic-data.pk3dir.git Merge branch 'terencehill/hud_skin_updates' into 'master' Hud skin updates * Remove all the main panel cvars from the hud skin settings so that hud skins never ever enable/disable any panel * hud_panel_healtharmor_combined * Fix wrong bg image references in a few panels See merge request !307 --- b0423598270855d5f0a3206d46f0ebf43182b411 diff --cc hud_luma.cfg index 066ebfbf4,dee9877e8..2ec91efca --- a/hud_luma.cfg +++ b/hud_luma.cfg @@@ -65,10 -64,9 +64,9 @@@ seta hud_panel_weapons_timeout_fadefgmi 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.800000" -seta hud_panel_weapons_noncurrent_scale "0.900000" +seta hud_panel_weapons_noncurrent_alpha "0.8" +seta hud_panel_weapons_noncurrent_scale "0.9" - seta hud_panel_ammo "1" 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" @@@ -192,9 -183,8 +183,8 @@@ seta hud_panel_vote_bg_color_team " seta hud_panel_vote_bg_alpha "" seta hud_panel_vote_bg_border "" seta hud_panel_vote_bg_padding "" -seta hud_panel_vote_alreadyvoted_alpha "0.700000" +seta hud_panel_vote_alreadyvoted_alpha "0.7" - seta hud_panel_modicons "1" seta hud_panel_modicons_pos "0.370000 0.030000" seta hud_panel_modicons_size "0.260000 0.07000" seta hud_panel_modicons_bg "border_fading_north" @@@ -216,10 -205,9 +205,9 @@@ seta hud_panel_pressedkeys_bg_color_tea seta hud_panel_pressedkeys_bg_alpha "" seta hud_panel_pressedkeys_bg_border "" seta hud_panel_pressedkeys_bg_padding "1" -seta hud_panel_pressedkeys_aspect "1.600000" +seta hud_panel_pressedkeys_aspect "1.6" seta hud_panel_pressedkeys_attack "0" - seta hud_panel_chat "1" seta hud_panel_chat_pos "0.010000 0.700000" seta hud_panel_chat_size "0.460000 0.190000" seta hud_panel_chat_bg "0" diff --cc hud_luminos.cfg index 65a3c9539,ad19877de..7badb2505 --- a/hud_luminos.cfg +++ b/hud_luminos.cfg @@@ -192,9 -183,8 +183,8 @@@ seta hud_panel_vote_bg_color_team " seta hud_panel_vote_bg_alpha "" seta hud_panel_vote_bg_border "" seta hud_panel_vote_bg_padding "" -seta hud_panel_vote_alreadyvoted_alpha "0.500000" +seta hud_panel_vote_alreadyvoted_alpha "0.5" - seta hud_panel_modicons "1" seta hud_panel_modicons_pos "0.410000 0" seta hud_panel_modicons_size "0.180000 0.080000" seta hud_panel_modicons_bg "border_small_modicons" @@@ -216,10 -205,9 +205,9 @@@ seta hud_panel_pressedkeys_bg_color_tea seta hud_panel_pressedkeys_bg_alpha "" seta hud_panel_pressedkeys_bg_border "" seta hud_panel_pressedkeys_bg_padding "" -seta hud_panel_pressedkeys_aspect "1.600000" +seta hud_panel_pressedkeys_aspect "1.6" seta hud_panel_pressedkeys_attack "0" - seta hud_panel_chat "1" seta hud_panel_chat_pos "0.010000 0.700000" seta hud_panel_chat_size "0.460000 0.190000" seta hud_panel_chat_bg "0" diff --cc hud_luminos_minimal.cfg index bf3dba6b6,4773676c9..76edc7bc0 --- a/hud_luminos_minimal.cfg +++ b/hud_luminos_minimal.cfg @@@ -144,16 -139,15 +139,15 @@@ seta hud_panel_timer_bg_alpha " seta hud_panel_timer_bg_border "" seta hud_panel_timer_bg_padding "0" - seta hud_panel_radar "2" seta hud_panel_radar_pos "0.810000 0" seta hud_panel_radar_size "0.190000 0.250000" - seta hud_panel_radar_bg "border_radar" + seta hud_panel_radar_bg "border_default" seta hud_panel_radar_bg_color "" seta hud_panel_radar_bg_color_team "" -seta hud_panel_radar_bg_alpha "0.500000" +seta hud_panel_radar_bg_alpha "0.5" seta hud_panel_radar_bg_border "0" seta hud_panel_radar_bg_padding "0" -seta hud_panel_radar_foreground_alpha "0.500000" +seta hud_panel_radar_foreground_alpha "0.5" seta hud_panel_radar_rotation "0" seta hud_panel_radar_zoommode "0" seta hud_panel_radar_scale "4096" @@@ -192,9 -183,8 +183,8 @@@ seta hud_panel_vote_bg_color_team " seta hud_panel_vote_bg_alpha "" seta hud_panel_vote_bg_border "" seta hud_panel_vote_bg_padding "" -seta hud_panel_vote_alreadyvoted_alpha "0.800000" +seta hud_panel_vote_alreadyvoted_alpha "0.8" - seta hud_panel_modicons "1" seta hud_panel_modicons_pos "0.560000 0" seta hud_panel_modicons_size "0.050000 0.100000" seta hud_panel_modicons_bg "" @@@ -216,10 -205,9 +205,9 @@@ seta hud_panel_pressedkeys_bg_color_tea seta hud_panel_pressedkeys_bg_alpha "" seta hud_panel_pressedkeys_bg_border "" seta hud_panel_pressedkeys_bg_padding "" -seta hud_panel_pressedkeys_aspect "1.600000" +seta hud_panel_pressedkeys_aspect "1.6" seta hud_panel_pressedkeys_attack "0" - seta hud_panel_chat "1" seta hud_panel_chat_pos "0 0.775000" seta hud_panel_chat_size "0.460000 0.110000" seta hud_panel_chat_bg "0" diff --cc hud_luminos_minimal_xhair.cfg index baef5ba5c,a5ebfdd16..f2670d8e2 --- a/hud_luminos_minimal_xhair.cfg +++ b/hud_luminos_minimal_xhair.cfg @@@ -106,9 -102,10 +102,10 @@@ seta hud_panel_healtharmor_size "0.0700 seta hud_panel_healtharmor_bg "border_healtharmor" seta hud_panel_healtharmor_bg_color "0.464391 0.464391 0.464391" seta hud_panel_healtharmor_bg_color_team "" -seta hud_panel_healtharmor_bg_alpha "0.600000" +seta hud_panel_healtharmor_bg_alpha "0.6" seta hud_panel_healtharmor_bg_border "-1" seta hud_panel_healtharmor_bg_padding "0" + seta hud_panel_healtharmor_combined "0" seta hud_panel_healtharmor_flip "0" seta hud_panel_healtharmor_iconalign "1" seta hud_panel_healtharmor_baralign "1" @@@ -144,16 -139,15 +139,15 @@@ seta hud_panel_timer_bg_alpha " seta hud_panel_timer_bg_border "" seta hud_panel_timer_bg_padding "0" - seta hud_panel_radar "2" seta hud_panel_radar_pos "0.810000 0" seta hud_panel_radar_size "0.190000 0.250000" - seta hud_panel_radar_bg "border_radar" + seta hud_panel_radar_bg "border_default" seta hud_panel_radar_bg_color "" seta hud_panel_radar_bg_color_team "" -seta hud_panel_radar_bg_alpha "0.500000" +seta hud_panel_radar_bg_alpha "0.5" seta hud_panel_radar_bg_border "0" seta hud_panel_radar_bg_padding "0" -seta hud_panel_radar_foreground_alpha "0.500000" +seta hud_panel_radar_foreground_alpha "0.5" seta hud_panel_radar_rotation "0" seta hud_panel_radar_zoommode "0" seta hud_panel_radar_scale "4096" @@@ -192,9 -183,8 +183,8 @@@ seta hud_panel_vote_bg_color_team " seta hud_panel_vote_bg_alpha "" seta hud_panel_vote_bg_border "" seta hud_panel_vote_bg_padding "" -seta hud_panel_vote_alreadyvoted_alpha "0.800000" +seta hud_panel_vote_alreadyvoted_alpha "0.8" - seta hud_panel_modicons "1" seta hud_panel_modicons_pos "0.560000 0" seta hud_panel_modicons_size "0.050000 0.100000" seta hud_panel_modicons_bg "" @@@ -216,10 -205,9 +205,9 @@@ seta hud_panel_pressedkeys_bg_color_tea seta hud_panel_pressedkeys_bg_alpha "" seta hud_panel_pressedkeys_bg_border "" seta hud_panel_pressedkeys_bg_padding "" -seta hud_panel_pressedkeys_aspect "1.600000" +seta hud_panel_pressedkeys_aspect "1.6" seta hud_panel_pressedkeys_attack "0" - seta hud_panel_chat "1" seta hud_panel_chat_pos "0 0.775000" seta hud_panel_chat_size "0.460000 0.110000" seta hud_panel_chat_bg "0" diff --cc hud_luminos_old.cfg index b4b6b694e,1b3e81b2b..fc8d05ffb --- a/hud_luminos_old.cfg +++ b/hud_luminos_old.cfg @@@ -192,9 -183,8 +183,8 @@@ seta hud_panel_vote_bg_color_team " seta hud_panel_vote_bg_alpha "" seta hud_panel_vote_bg_border "" seta hud_panel_vote_bg_padding "" -seta hud_panel_vote_alreadyvoted_alpha "0.800000" +seta hud_panel_vote_alreadyvoted_alpha "0.8" - seta hud_panel_modicons "1" seta hud_panel_modicons_pos "0.040000 0.270000" seta hud_panel_modicons_size "0.080000 0.200000" seta hud_panel_modicons_bg "" @@@ -216,10 -205,9 +205,9 @@@ seta hud_panel_pressedkeys_bg_color_tea seta hud_panel_pressedkeys_bg_alpha "" seta hud_panel_pressedkeys_bg_border "" seta hud_panel_pressedkeys_bg_padding "" -seta hud_panel_pressedkeys_aspect "1.600000" +seta hud_panel_pressedkeys_aspect "1.6" seta hud_panel_pressedkeys_attack "0" - seta hud_panel_chat "1" seta hud_panel_chat_pos "0.020000 0.780000" seta hud_panel_chat_size "0.630000 0.110000" seta hud_panel_chat_bg "0" @@@ -364,10 -342,9 +342,9 @@@ seta hud_panel_itemstime_progressbar "1 seta hud_panel_itemstime_progressbar_name "progressbar" seta hud_panel_itemstime_progressbar_reduced "1" seta hud_panel_itemstime_text "1" -seta hud_panel_itemstime_ratio "3.500000" +seta hud_panel_itemstime_ratio "3.5" seta hud_panel_itemstime_dynamicsize "1" - seta hud_panel_quickmenu "1" seta hud_panel_quickmenu_pos "0.700000 0.460000" seta hud_panel_quickmenu_size "0.210000 0.250000" seta hud_panel_quickmenu_bg "" diff --cc hud_nexuiz.cfg index ccf74a48e,0b825d0bc..bc1dc9bdd --- a/hud_nexuiz.cfg +++ b/hud_nexuiz.cfg @@@ -192,9 -183,8 +183,8 @@@ seta hud_panel_vote_bg_color_team " seta hud_panel_vote_bg_alpha "" seta hud_panel_vote_bg_border "" seta hud_panel_vote_bg_padding "-3" -seta hud_panel_vote_alreadyvoted_alpha "0.750000" +seta hud_panel_vote_alreadyvoted_alpha "0.75" - seta hud_panel_modicons "1" seta hud_panel_modicons_pos "0.010000 0.910000" seta hud_panel_modicons_size "0.135000 0.090000" seta hud_panel_modicons_bg "0" @@@ -216,10 -205,9 +205,9 @@@ seta hud_panel_pressedkeys_bg_color_tea seta hud_panel_pressedkeys_bg_alpha "" seta hud_panel_pressedkeys_bg_border "" seta hud_panel_pressedkeys_bg_padding "" -seta hud_panel_pressedkeys_aspect "1.600000" +seta hud_panel_pressedkeys_aspect "1.6" seta hud_panel_pressedkeys_attack "0" - seta hud_panel_chat "1" seta hud_panel_chat_pos "0 0.760000" seta hud_panel_chat_size "0.420000 0.130000" seta hud_panel_chat_bg "0"