]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
Merge branch 'master' into Mario/combined_updates
authorMario <zacjardine@y7mail.com>
Fri, 13 Mar 2015 11:20:43 +0000 (22:20 +1100)
committerMario <zacjardine@y7mail.com>
Fri, 13 Mar 2015 11:20:43 +0000 (22:20 +1100)
Conflicts:
qcsrc/server/defs.qh

1  2 
qcsrc/client/hud.qc
qcsrc/server/cl_client.qc
qcsrc/server/command/vote.qc
qcsrc/server/defs.qh
qcsrc/server/func_breakable.qc
qcsrc/server/g_world.qc

Simple merge
Simple merge
Simple merge
index 134aac6623b31dab7eace133b0776111e060b7e3,822c5163c384c1476656d825ab0a009f549ac406..e7be2b3d6588486013589d272ca7b44d89be92f8
@@@ -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
Simple merge
Simple merge