From: terencehill <piuntn@gmail.com>
Date: Sun, 3 Apr 2011 21:15:52 +0000 (+0200)
Subject: Merge branch 'master' into terencehill/newpanelhud
X-Git-Tag: xonotic-v0.5.0~269^2~24
X-Git-Url: https://de.git.xonotic.org/?a=commitdiff_plain;h=03d780d293d208d7b24c452d0e03ca4b12206413;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'master' into terencehill/newpanelhud

Conflicts:
	hud_luminos.cfg
---

03d780d293d208d7b24c452d0e03ca4b12206413
diff --cc hud_luminos.cfg
index a0f28fcfa,57be0d0a7..9ff5431f1
--- a/hud_luminos.cfg
+++ b/hud_luminos.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 "12 9 10 5 6 14 0 7 4 11 2 1 3 8 13 "
++seta _hud_panelorder "12 9 10 5 6 14 0 7 4 11 2 1 3 8 13 15 "
  
  seta hud_configure_grid "1"
  seta hud_configure_grid_xsize "0.010000"
@@@ -75,10 -72,10 +75,10 @@@ seta hud_panel_powerups_bg_color "
  seta hud_panel_powerups_bg_color_team ""
  seta hud_panel_powerups_bg_alpha ""
  seta hud_panel_powerups_bg_border ""
- seta hud_panel_powerups_bg_padding ""
- seta hud_panel_powerups_flip "1"
+ seta hud_panel_powerups_bg_padding "0"
+ seta hud_panel_powerups_flip "0"
 -seta hud_panel_powerups_iconalign "4"
 -seta hud_panel_powerups_baralign "4"
 +seta hud_panel_powerups_iconalign "3"
 +seta hud_panel_powerups_baralign "3"
  seta hud_panel_powerups_progressbar "1"
  seta hud_panel_powerups_progressbar_strength "progressbar"
  seta hud_panel_powerups_progressbar_shield "progressbar"
diff --cc qcsrc/client/hud.qc
index 44a10eed1,4dfb60c2d..a20706dd5
--- a/qcsrc/client/hud.qc
+++ b/qcsrc/client/hud.qc
@@@ -699,9 -1610,16 +699,9 @@@ void HUD_Weapons(void
  	}
  
  	float i, weapid, wpnalpha, weapon_cnt;
 -	weapon_cnt = 0;
 -	for(i = WEP_FIRST; i <= WEP_LAST; ++i)
 -	{
 -		self = get_weaponinfo(i);
 -		if(self.impulse >= 0)
 -			++weapon_cnt;
 -	}
  
  	// TODO make this configurable
- 	if(weaponorder_bypriority != autocvar_cl_weaponpriority)
+ 	if(weaponorder_bypriority != autocvar_cl_weaponpriority || !weaponorder[0])
  	{
  		if(weaponorder_bypriority)
  			strunzone(weaponorder_bypriority);