Merge branch 'master' into terencehill/itemstime

Conflicts:
	_hud_common.cfg
	qcsrc/server/autocvars.qh

diff --cc _hud_common.cfg
index 1bdea1c34bf5192bf01b8351f6493b8ddc968689,b74eff9607999b19978d0128dd466824e1167585..ba81ef88ea520992f3db7e75a1c77ab3b28bf613
--- 1/_hud_common.cfg
--- 2/_hud_common.cfg
+++ b/_hud_common.cfg
@@@ -38,8 -38,9 +38,11 @@@ seta hud_panel_engineinfo_framecounter_
  seta hud_panel_engineinfo_framecounter_exponentialmovingaverage_new_weight 0.1 "weight of latest data point"
  seta hud_panel_engineinfo_framecounter_exponentialmovingaverage_instantupdate_change_threshold 0.5 "threshold for fps change when to update instantly, to make big fps changes update faster"
  
+ seta hud_panel_physics_acceleration_movingaverage 1 "use an averaging method for calculating acceleration instead of the real value"
+ seta hud_panel_phisics_update_interval 0.0666 "how often (in seconds) numeric values get updated on screen"
+ 
 +seta hud_panel_itemstime_progressbar_maxtime "30" "when left time is at least this amount, the status bar is full"
 +
  // hud panel aliases
  alias hud_panel_radar_rotate "toggle hud_panel_radar_rotation 0 1 2 3 4"
  alias +hud_panel_radar_maximized "cl_cmd hud radar 1"

diff --cc defaultXonotic.cfg
Simple merge

diff --cc qcsrc/client/autocvars.qh
Simple merge

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

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

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

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

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

diff --cc qcsrc/common/stats.qh
index 18bddcd99818f5193e174de262f519e5fe6c3a63,b488df1cfd709edacf36401d42990adbd4f4ed93..ae1830569f43b6bfa54612d8f665defe9ec823a2
--- 1/qcsrc/common/stats.qh
--- 2/qcsrc/common/stats.qh
+++ b/qcsrc/common/stats.qh
@@@ -107,19 -107,19 +107,19 @@@ const int STAT_HEALING_ORB_ALPHA      
  const int STAT_PLASMA                 = 84;
  const int STAT_OK_AMMO_CHARGE         = 85;
  const int STAT_OK_AMMO_CHARGEPOOL     = 86;
- // 87 empty?
- // 88 empty?
+ const int STAT_FROZEN                 = 87;
+ const int STAT_REVIVE_PROGRESS        = 88;
  // 89 empty?
 -// 90 empty?
 -// 91 empty?
 -// 92 empty?
 -// 93 empty?
 -// 94 empty?
 -// 95 empty?
 -// 96 empty?
 -// 97 empty?
 -// 98 empty?
 -// 99 empty?
 +const float STAT_ARMOR_LARGE_TIME       = 90;
 +const float STAT_HEALTH_MEGA_TIME       = 91;
 +const float STAT_INVISIBLE_TIME         = 92;
 +const float STAT_SPEED_TIME             = 93;
 +const float STAT_EXTRALIFE_TIME         = 94;
 +const float STAT_STRENGTH_TIME          = 95;
 +const float STAT_SHIELD_TIME            = 96;
 +const float STAT_FUELREGEN_TIME         = 97;
 +const float STAT_JETPACK_TIME           = 98;
 +const float STAT_SUPERWEAPONS_TIME      = 99;
  
  
  /* The following stats change depending on the gamemode, so can share the same ID */

diff --cc qcsrc/menu/classes.inc
Simple merge

diff --cc qcsrc/menu/xonotic/mainwindow.qc
index 11c1f226f84718b0b0a581f5d523a7845ebae242,7af6e9363d3ce440dbc60d944a55b400c77d3475..2a4635a4089533f0819f372fee73f75095f4ce78
--- 1/qcsrc/menu/xonotic/mainwindow.qc
--- 2/qcsrc/menu/xonotic/mainwindow.qc
+++ b/qcsrc/menu/xonotic/mainwindow.qc
@@@ -134,12 -130,8 +130,12 @@@ void MainWindow_configureMainWindow(ent
  
        i = NEW(XonoticHUDBuffsDialog);
        i.configureDialog(i);
-       me.addItemCentered(me, i, i.intendedWidth * eX + i.intendedHeight * eY, SKINALPHAS_MAINMENU_z);
+       me.addItemRightCentered(me, i, i.intendedWidth * eX + i.intendedHeight * eY, SKINALPHAS_MAINMENU_z);
  
 +      i = NEW(XonoticHUDItemsTimeDialog);
 +      i.configureDialog(i);
 +      me.addItemCentered(me, i, i.intendedWidth * eX + i.intendedHeight * eY, SKINALPHAS_MAINMENU_z);
 +
  
        // dialogs used by settings
        me.userbindEditDialog = i = NEW(XonoticUserbindEditDialog);

diff --cc qcsrc/server/autocvars.qh
index ecbf895739b0ed19f16d0680c9b52353780b0b90,51b14aa0812e2c2af73a354b7cd204608beb736c..8ca128282e36bf477106af5f40af3d4756219372
--- 1/qcsrc/server/autocvars.qh
--- 2/qcsrc/server/autocvars.qh
+++ b/qcsrc/server/autocvars.qh
@@@ -638,10 -626,9 +626,10 @@@ float autocvar_sv_gameplayfix_q2airacce
  int autocvar_sv_gentle;
  #define autocvar_sv_gravity cvar("sv_gravity")
  string autocvar_sv_intermission_cdtrack;
- string autocvar_sv_jumpspeedcap_max;
 +float autocvar_sv_itemstime;
+ float autocvar_sv_jumpspeedcap_max;
  float autocvar_sv_jumpspeedcap_max_disable_on_ramps;
- string autocvar_sv_jumpspeedcap_min;
+ float autocvar_sv_jumpspeedcap_min;
  float autocvar_sv_jumpvelocity;
  bool autocvar_sv_logscores_bots;
  bool autocvar_sv_logscores_console;

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

diff --cc qcsrc/server/command/vote.qc
Simple merge

diff --cc qcsrc/server/defs.qh
Simple merge

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

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

diff --cc qcsrc/server/t_items.qh
Simple merge