From: Mario Date: Tue, 4 Aug 2015 05:52:30 +0000 (+0000) Subject: Merge branch 'terencehill/mapvote_layout_changes' into 'master' X-Git-Tag: xonotic-v0.8.1~22 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=02e0727816326407cc681dd2d12c67d157e618cf;p=xonotic%2Fxonotic-data.pk3dir.git Merge branch 'terencehill/mapvote_layout_changes' into 'master' Map/gametype vote layout changes Improvements over the map/gametype vote screens: * items as big as possible with minimum alteration of the desired item aspect ratio (like in the weapons panel layout) * layout more compact with limited item size (especially with very few vote choices) * added a background in the default hud skin, as part of the change that makes them real panels * fixed a few minor things * the fps panel (if enabled) is kept on screen during the map vote See merge request !152 --- 02e0727816326407cc681dd2d12c67d157e618cf diff --cc hud_luma.cfg index 81528404a,4f016240e..e6312c1ac --- a/hud_luma.cfg +++ b/hud_luma.cfg @@@ -23,10 -23,8 +23,10 @@@ seta hud_progressbar_nexball_color "0. seta hud_progressbar_speed_color "0.77 0.67 0" seta hud_progressbar_acceleration_color "0.2 0.65 0.93" seta hud_progressbar_acceleration_neg_color "0.86 0.35 0" +seta hud_progressbar_vehicles_ammo1_color "0.77 0.67 0" +seta hud_progressbar_vehicles_ammo2_color "0.86 0.35 0" - seta _hud_panelorder "15 12 9 5 10 6 14 0 7 4 11 2 1 3 8 13 16 " + seta _hud_panelorder "17 15 12 9 5 10 6 14 0 7 4 11 2 1 3 8 13 16 " seta hud_configure_grid "1" seta hud_configure_grid_xsize "0.005000" diff --cc hud_luminos.cfg index efffd53e3,6b8a26342..56f696f3e --- a/hud_luminos.cfg +++ b/hud_luminos.cfg @@@ -23,10 -23,8 +23,10 @@@ seta hud_progressbar_nexball_color "0. seta hud_progressbar_speed_color "1 0.75 0" seta hud_progressbar_acceleration_color "0.5 0.75 1" seta hud_progressbar_acceleration_neg_color "0.125 0.25 0.5" +seta hud_progressbar_vehicles_ammo1_color "0.8 0.7 0" +seta hud_progressbar_vehicles_ammo2_color "0.7 0.4 0" - seta _hud_panelorder "15 12 9 10 5 6 14 0 7 4 11 2 1 3 8 13 16 " + seta _hud_panelorder "17 15 12 9 10 5 6 14 0 7 4 11 2 1 3 8 13 16 " seta hud_configure_grid "1" seta hud_configure_grid_xsize "0.010000" diff --cc hud_luminos_minimal.cfg index c0b2e3d90,f54b93b2d..e5829e035 --- a/hud_luminos_minimal.cfg +++ b/hud_luminos_minimal.cfg @@@ -23,10 -23,8 +23,10 @@@ seta hud_progressbar_nexball_color "0. seta hud_progressbar_speed_color "1 0.75 0" seta hud_progressbar_acceleration_color "0.5 0.75 1" seta hud_progressbar_acceleration_neg_color "0.125 0.25 0.5" +seta hud_progressbar_vehicles_ammo1_color "0.8 0.7 0" +seta hud_progressbar_vehicles_ammo2_color "0.7 0.4 0" - seta _hud_panelorder "10 3 0 14 6 9 13 4 1 2 11 12 7 5 8 15 16 " + seta _hud_panelorder "17 10 3 0 14 6 9 13 4 1 2 11 12 7 5 8 15 16 " seta hud_configure_grid "1" seta hud_configure_grid_xsize "0.010000" diff --cc hud_luminos_minimal_xhair.cfg index 6671c4021,8cc9ea15e..126d22310 --- a/hud_luminos_minimal_xhair.cfg +++ b/hud_luminos_minimal_xhair.cfg @@@ -23,10 -23,8 +23,10 @@@ seta hud_progressbar_nexball_color "0. seta hud_progressbar_speed_color "1 0.75 0" seta hud_progressbar_acceleration_color "0.5 0.75 1" seta hud_progressbar_acceleration_neg_color "0.125 0.25 0.5" +seta hud_progressbar_vehicles_ammo1_color "0.8 0.7 0" +seta hud_progressbar_vehicles_ammo2_color "0.7 0.4 0" - seta _hud_panelorder "15 3 1 2 11 10 0 14 6 9 13 4 12 7 5 8 16 " + seta _hud_panelorder "17 15 3 1 2 11 10 0 14 6 9 13 4 12 7 5 8 16 " seta hud_configure_grid "1" seta hud_configure_grid_xsize "0.010000" diff --cc hud_luminos_old.cfg index 615dfb296,0f06e8059..aed07d9ce --- a/hud_luminos_old.cfg +++ b/hud_luminos_old.cfg @@@ -23,10 -23,8 +23,10 @@@ seta hud_progressbar_nexball_color "0. seta hud_progressbar_speed_color "1 0.75 0" seta hud_progressbar_acceleration_color "0.5 0.75 1" seta hud_progressbar_acceleration_neg_color "0.125 0.25 0.5" +seta hud_progressbar_vehicles_ammo1_color "0.8 0.7 0" +seta hud_progressbar_vehicles_ammo2_color "0.7 0.4 0" - seta _hud_panelorder "15 10 9 6 8 14 5 0 4 13 2 7 1 3 11 12 16 " + seta _hud_panelorder "17 15 10 9 6 8 14 5 0 4 13 2 7 1 3 11 12 16 " seta hud_configure_grid "1" seta hud_configure_grid_xsize "0.010000" diff --cc hud_nexuiz.cfg index 9dbd05f54,117ab9dc4..d950703f9 --- a/hud_nexuiz.cfg +++ b/hud_nexuiz.cfg @@@ -23,10 -23,8 +23,10 @@@ seta hud_progressbar_nexball_color "0. seta hud_progressbar_speed_color "1 0.75 0" seta hud_progressbar_acceleration_color "0.5 0.75 1" seta hud_progressbar_acceleration_neg_color "0.125 0.25 0.5" +seta hud_progressbar_vehicles_ammo1_color "0.8 0.7 0" +seta hud_progressbar_vehicles_ammo2_color "0.7 0.4 0" - seta _hud_panelorder "15 0 11 8 5 6 14 9 13 7 2 3 1 10 12 4 16 " + seta _hud_panelorder "17 15 0 11 8 5 6 14 9 13 7 2 3 1 10 12 4 16 " seta hud_configure_grid "1" seta hud_configure_grid_xsize "0.01"