Merge branch 'master' into Mario/combined_updates

Conflicts:
	qcsrc/server/defs.qh

diff --cc qcsrc/client/hud.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 134aac6623b31dab7eace133b0776111e060b7e3,822c5163c384c1476656d825ab0a009f549ac406..e7be2b3d6588486013589d272ca7b44d89be92f8
--- 1/qcsrc/server/defs.qh
--- 2/qcsrc/server/defs.qh
+++ b/qcsrc/server/defs.qh
@@@ -646,28 -624,7 +646,32 @@@ const int MIF_GUIDED_TAG = 128
  .float elos;
  .float ranks;
  
 +.int cvar_cl_sparkle;
 +.bool cvar_cl_pony;
 +.int cvar_cl_pony_skin;
 +.int cvar_cl_damnfurries;
 +.bool cvar_cl_thestars;
 +.bool cvar_cl_robot;
 +.bool cvar_cl_goat;
 +.int cvar_cl_charge;
 +
 +.string cvar_cl_autovote;
 +
 +.entity lastkiller;
 +.entity lastkilled;
 +
 +.float vaporizer_refire;
 +
 +bool sv_showfps;
 +
 +.float clientfov;
 +
 +.bool sub_target_used;
 +
 +.string cvar_cl_physics;
 +
+ .float init_for_player_needed;
+ .void(entity) init_for_player;
+ 
++
  #endif

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

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