From: terencehill <piuntn@gmail.com>
Date: Mon, 27 Jul 2015 23:21:26 +0000 (+0200)
Subject: Merge branch 'master' into terencehill/itemstime
X-Git-Tag: xonotic-v0.8.1~12^2~19
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=8643336b62c2c2881987dabddc842a0214839012;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'master' into terencehill/itemstime

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

8643336b62c2c2881987dabddc842a0214839012
diff --cc _hud_common.cfg
index 1bdea1c34,b74eff960..ba81ef88e
--- a/_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 qcsrc/common/stats.qh
index 18bddcd99,b488df1cf..ae1830569
--- a/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/xonotic/mainwindow.qc
index 11c1f226f,7af6e9363..2a4635a40
--- a/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 ecbf89573,51b14aa08..8ca128282
--- a/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;
 +float autocvar_sv_itemstime;
- string autocvar_sv_jumpspeedcap_max;
+ 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;