From: terencehill <piuntn@gmail.com>
Date: Mon, 11 Apr 2011 17:20:48 +0000 (+0200)
Subject: Merge remote-tracking branch 'remotes/origin/terencehill/newpanelhud' into terencehil... 
X-Git-Tag: xonotic-v0.5.0~269^2~21
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=cd4733447ff43d2aa6141fb9b66f718f61d46fc5;p=xonotic%2Fxonotic-data.pk3dir.git

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

Conflicts:
	hud_luminos.cfg
	hud_luminos_old.cfg
---

cd4733447ff43d2aa6141fb9b66f718f61d46fc5
diff --cc hud_luminos.cfg
index 899d0fb62,de45c8609..9a3629ee2
--- a/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 6fd045036,1d8446511..af4a2cda6
--- a/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"