Merge branch 'master' into terencehill/itemstime

Conflicts:
	qcsrc/common/constants.qh
	qcsrc/server/defs.qh

diff --cc _hud_common.cfg
index 7420b1a85dee1448648885bd08925a7fe2704ee4,ca90bc9da204f14dc8af7cf536336699cb230363..8ab874555db8fefd96507e533d2d6af86732a107
--- 1/_hud_common.cfg
--- 2/_hud_common.cfg
+++ b/_hud_common.cfg
@@@ -26,13 -37,11 +37,13 @@@ 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_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_panel_radar_maximized 1"
- alias -hud_panel_radar_maximized "cl_cmd hud_panel_radar_maximized 0"
- alias hud_panel_radar_maximized "cl_cmd hud_panel_radar_maximized"
+ alias +hud_panel_radar_maximized "cl_cmd hud radar 1"
+ alias -hud_panel_radar_maximized "cl_cmd hud radar 0"
+ alias hud_panel_radar_maximized "cl_cmd hud radar"
  
  // other hud cvars
  seta hud_showbinds 1  "what to show in the HUD to indicate certain keys to press: 0 display commands, 1 bound keys, 2 both"

diff --cc _hud_descriptions.cfg
Simple merge

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_minimal_xhair.cfg
Simple merge

diff --cc hud_luminos_old.cfg
Simple merge

diff --cc hud_nexuiz.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
index 833216307876f0f25b5f29c71b27fe3d468ed304,c25fb059f6ebc2d52b017541eeb39e084ab4166b..898495764b60dfa322ecbf70731da392a24fac20
--- 1/qcsrc/common/constants.qh
--- 2/qcsrc/common/constants.qh
+++ b/qcsrc/common/constants.qh
@@@ -180,17 -177,8 +178,18 @@@ const float STAT_VEHICLESTAT_RELOAD2 = 
  const float STAT_SECRETS_TOTAL = 70;
  const float STAT_SECRETS_FOUND = 71;
  
- 
+ const float STAT_RESPAWN_TIME = 72;
+ 
 +const float STAT_ARMOR_LARGE_TIME = 80;
 +const float STAT_HEALTH_MEGA_TIME = 81;
 +const float STAT_INVISIBLE_TIME = 82;
 +const float STAT_SPEED_TIME = 83;
 +const float STAT_EXTRALIFE_TIME = 84;
 +const float STAT_STRENGTH_TIME = 85;
 +const float STAT_SHIELD_TIME = 86;
 +const float STAT_FUELREGEN_TIME = 87;
 +const float STAT_JETPACK_TIME = 88;
 +const float STAT_SUPERWEAPONS_TIME = 89;
  // mod stats (1xx)
  const float STAT_REDALIVE = 100;
  const float STAT_BLUEALIVE = 101;

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

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

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

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

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

diff --cc qcsrc/server/defs.qh
index 7e4a07b5f6c5565642ecaf7c57f4a0b95bb72a20,5eaafe4f109e4679aad77b9b4af21f331aa9f3f5..1f6d8b23898254c8aa579c682afeaf1fd859afd7
--- 1/qcsrc/server/defs.qh
--- 2/qcsrc/server/defs.qh
+++ b/qcsrc/server/defs.qh
@@@ -625,28 -585,11 +586,21 @@@ string deathmessage
  #define ACTIVE_BUSY   2
  #define ACTIVE_TOGGLE 3
  .float active;
- .float (float act_state) setactive;
+ .void (float act_state) setactive;
  .entity realowner;
  
 -float allowed_to_spawn; // boolean variable used by the clan arena code to determine if a player can spawn (after the round has ended)
 +.float item_armor_large_time;
 +.float item_health_mega_time;
 +.float item_invisible_time;
 +.float item_speed_time;
 +.float item_extralife_time;
 +.float item_strength_time;
 +.float item_shield_time;
 +.float item_fuelregen_time;
 +.float item_jetpack_time;
 +.float item_superweapons_time;
  
- .float nex_charge;
- .float nex_charge_rottime;
- .float nex_chargepool_ammo;
- 
- .float hagar_load;
- 
 +float allowed_to_spawn; // boolean variable used by the clan arena code to determine if a player can spawn (after the round has ended)
- 
  float serverflags;
  
  .float team_forced; // can be a team number to force a team, or 0 for default action, or -1 for forced spectator

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

diff --cc qcsrc/server/t_items.qc
index bc8638dd2f123fa2830fc90ca1b2bdbb054d280d,2ff925ca53d9fbf2ac2c05c103b85e4a0402e263..11f81b1d644f8da3c61a50bb52dcb7814de555a9
--- 1/qcsrc/server/t_items.qc
--- 2/qcsrc/server/t_items.qc
+++ b/qcsrc/server/t_items.qc
@@@ -670,12 -508,13 +673,17 @@@ void Item_RespawnCountdown (void
                        {
                                WaypointSprite_Spawn(name, 0, 0, self, '0 0 64', world, 0, self, waypointsprite_attached, TRUE, RADARICON_POWERUP, rgb);
                                if(self.waypointsprite_attached)
 +                              {
 +                                      if (self.items == IT_HEALTH || self.items == IT_ARMOR)
 +                                              WaypointSprite_UpdateRule(self.waypointsprite_attached, 0, SPRITERULE_SPECTATOR);
                                        WaypointSprite_UpdateBuildFinished(self.waypointsprite_attached, time + ITEM_RESPAWN_TICKS);
 +                              }
                        }
+                       else
+                       {
+                               print("Unknown powerup-marked item is wanting to respawn\n");
+                               localcmd(sprintf("prvm_edict server %d\n", num_for_edict(self)));
+                       }
                }
                sound (self, CH_TRIGGER, "misc/itemrespawncountdown.wav", VOL_BASE, ATTN_NORM); // play respawn sound
                if(self.waypointsprite_attached)