Merge branch 'master' into terencehill/newpanelhud

diff --cc defaultXonotic.cfg
Simple merge

diff --cc hud_luminos.cfg
Simple merge

diff --cc hud_luminos_minimal.cfg
Simple merge

diff --cc hud_luminos_xhair_minimal.cfg
Simple merge

diff --cc hud_nexuiz.cfg
Simple merge

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

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

diff --cc qcsrc/client/autocvars.qh
index 477b5ec86853f753044fae30af1d656fb2e0a6ab,0cf1e4bf8dc8d5f76652fa0141d269ce66ff358f..8c3305db1a98314baa4d2577a10c542140de5267
--- 1/qcsrc/client/autocvars.qh
--- 2/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;

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

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

diff --cc qcsrc/common/constants.qh
Simple merge

diff --cc qcsrc/common/util.qh
Simple merge

diff --cc qcsrc/server/cl_client.qc
Simple merge