From: Mario <zacjardine@y7mail.com>
Date: Fri, 13 Mar 2015 11:20:43 +0000 (+1100)
Subject: Merge branch 'master' into Mario/combined_updates
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=3b552b6aeec67a91de72f02272440cbeea3a828b;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'master' into Mario/combined_updates

Conflicts:
	qcsrc/server/defs.qh
---

3b552b6aeec67a91de72f02272440cbeea3a828b
diff --cc qcsrc/server/defs.qh
index 134aac662,822c5163c..e7be2b3d6
--- a/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