From: terencehill <piuntn@gmail.com>
Date: Sat, 26 Feb 2011 17:28:26 +0000 (+0100)
Subject: Merge branch 'master' into terencehill/newpanelhud
X-Git-Tag: xonotic-v0.5.0~311
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=c5ebde8d94010d71635def61abf89f69fa892b15;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'master' into terencehill/newpanelhud
---

c5ebde8d94010d71635def61abf89f69fa892b15
diff --cc qcsrc/client/autocvars.qh
index 477b5ec86,0cf1e4bf8..8c3305db1
--- a/qcsrc/client/autocvars.qh
+++ b/qcsrc/client/autocvars.qh
@@@ -196,22 -209,9 +199,23 @@@ float autocvar_hud_panel_modicons_dom_l
  float autocvar_hud_panel_notify;
  float autocvar_hud_panel_notify_fadetime;
  float autocvar_hud_panel_notify_flip;
+ float autocvar_hud_panel_notify_fontsize;
  float autocvar_hud_panel_notify_print;
  float autocvar_hud_panel_notify_time;
 +float autocvar_hud_panel_physics;
 +float autocvar_hud_panel_physics_acceleration_progressbar_mode;
 +float autocvar_hud_panel_physics_acceleration_max;
 +float autocvar_hud_panel_physics_progressbar;
 +float autocvar_hud_panel_physics_acceleration_vertical;
 +float autocvar_hud_panel_physics_baralign;
 +float autocvar_hud_panel_physics_flip;
 +float autocvar_hud_panel_physics_speed_max;
 +float autocvar_hud_panel_physics_speed_unit;
 +float autocvar_hud_panel_physics_speed_unit_show;
 +float autocvar_hud_panel_physics_speed_vertical;
 +float autocvar_hud_panel_physics_text;
 +float autocvar_hud_panel_physics_topspeed;
 +float autocvar_hud_panel_physics_topspeed_time;
  float autocvar_hud_panel_powerups;
  float autocvar_hud_panel_powerups_baralign;
  float autocvar_hud_panel_powerups_flip;