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

diff --cc _hud_descriptions.cfg
Simple merge

diff --cc hud_luma.cfg
index 81528404a0b95f729bebf4c61166a11be54ab94c,4f016240e0111b0924e5a0ecacbaeefc8188cb33..e6312c1ac9fd505929ceac40ba21c17a64d87b27
--- 1/hud_luma.cfg
--- 2/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 efffd53e3b3e0105832bbaf14630b56eb71c584f,6b8a2634294a569e0ce6537ef35d47f066600af4..56f696f3e6746f27bdbb9849aab18b6c6368e3b4
--- 1/hud_luminos.cfg
--- 2/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 c0b2e3d90878e5c6dbf362fd00590f1aae4c1499,f54b93b2d13bc3594ea5ef03220e259461a5e9c7..e5829e03554201298579ec806a1e3f717f0f10e3
--- 1/hud_luminos_minimal.cfg
--- 2/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 6671c402181c76fbe1b9b34da0d3d6f0130e4354,8cc9ea15e0db3e0e28191bab29157ccb9d1d8d59..126d22310c56e313bd5506329baf63121ee6fb63
--- 1/hud_luminos_minimal_xhair.cfg
--- 2/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 615dfb296e4b12c35fc20956e2e9531f054ad546,0f06e80595f39ad6c3596593df0f6dbb8de6e988..aed07d9cef824f078df2cbe3e42ee7a7981030d1
--- 1/hud_luminos_old.cfg
--- 2/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 9dbd05f54a74029f4a1a980f6a206e1b163e2c05,117ab9dc47c714ba6d9b829f46110b391badc9dd..d950703f92526d5355dcf2d36cd7ff0d40de0f21
--- 1/hud_nexuiz.cfg
--- 2/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"

diff --cc qcsrc/client/autocvars.qh
Simple merge

diff --cc qcsrc/client/hud.qc
Simple merge

diff --cc qcsrc/client/hud.qh
Simple merge

diff --cc qcsrc/client/hud_config.qc
Simple merge

diff --cc qcsrc/client/view.qc
Simple merge