Merge remote-tracking branch 'remotes/origin/terencehill/newpanelhud' into terencehil...

Conflicts:
	hud_luminos.cfg
	hud_luminos_old.cfg

diff --cc hud_luminos.cfg
index 899d0fb62b8b39b213746f1ebe813bff8a746415,de45c860930a06e6d3342157f549e8c82aee8f4f..9a3629ee2506cf35d5235d6bb616152db4a11924
--- 1/hud_luminos.cfg
--- 2/hud_luminos.cfg
+++ b/hud_luminos.cfg
@@@ -23,7 -23,7 +23,7 @@@ seta hud_progressbar_speed_color "1 0.7
  seta hud_progressbar_acceleration_color "0.5 0.75 1"
  seta hud_progressbar_acceleration_neg_color "0.125 0.25 0.5"
  
- seta _hud_panelorder "12 9 10 5 6 14 0 7 4 11 2 1 3 8 13 15 "
 -seta _hud_panelorder "15 12 9 10 5 6 14 0 7 4 11 2 1 3 8 13 "
++seta _hud_panelorder "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_old.cfg
index 6fd045036082466a6a62f7db5e1713c00b958f0e,1d84465112a737607d2ee63980cb301628fbe74a..af4a2cda618472338eb361be9864754ab4b2a001
--- 1/hud_luminos_old.cfg
--- 2/hud_luminos_old.cfg
+++ b/hud_luminos_old.cfg
@@@ -19,11 -19,8 +19,11 @@@ seta hud_progressbar_health_color "0.6 
  seta hud_progressbar_armor_color "0 0.6 0"
  seta hud_progressbar_fuel_color "0.6 0.6 0"
  seta hud_progressbar_nexball_color "0.7 0.1 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_panelorder "10 9 6 8 14 5 0 4 13 2 7 1 3 11 12 15 "
 -seta _hud_panelorder "15 10 9 6 8 14 5 0 4 13 2 7 1 3 11 12 "
++seta _hud_panelorder "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 qcsrc/menu/xonotic/dialog_hudpanel_physics.c
Simple merge