Merge branch 'master' into Mario/cs_clientcvars

# Conflicts:
#	qcsrc/server/client.qh

diff --cc qcsrc/common/mutators/mutator/buffs/sv_buffs.qc
index ffa9ce20d6a4aa80f3afdc70c8f5e2efb68fe58f,b9b2a8e06480603bccfc1612c843f903c8896de3..925525f395a80e672113ff19e6f5768e81ac1d17
--- 1/qcsrc/common/mutators/mutator/buffs/sv_buffs.qc
--- 2/qcsrc/common/mutators/mutator/buffs/sv_buffs.qc
+++ b/qcsrc/common/mutators/mutator/buffs/sv_buffs.qc
@@@ -175,9 -167,19 +167,19 @@@ void buff_Touch(entity this, entity tou
        if(!IS_PLAYER(toucher))
                return; // incase mutator changed toucher
  
+       if((this.team && DIFF_TEAM(toucher, this))
+       || (STAT(FROZEN, toucher))
+       || (toucher.vehicle)
+       || (time < PS(toucher).buff_shield)
+       )
+       {
+               // can't touch this
+               return;
+       }
+ 
        if (toucher.buffs)
        {
 -              if (toucher.cvar_cl_buffs_autoreplace && toucher.buffs != this.buffs)
 +              if (CS(toucher).cvar_cl_buffs_autoreplace && toucher.buffs != this.buffs)
                {
                        int buffid = buff_FirstFromFlags(toucher.buffs).m_id;
                        //Send_Notification(NOTIF_ONE, toucher, MSG_MULTI, ITEM_BUFF_DROP, toucher.buffs);

diff --cc qcsrc/common/mutators/mutator/nades/nades.qc
Simple merge

diff --cc qcsrc/common/mutators/mutator/spawn_near_teammate/sv_spawn_near_teammate.qc
Simple merge

diff --cc qcsrc/common/physics/player.qc
Simple merge

diff --cc qcsrc/common/t_items.qc
Simple merge

diff --cc qcsrc/server/bot/default/bot.qc
Simple merge

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

diff --cc qcsrc/server/client.qh
index 51dcb86148f550841768e038b138cb502d9bc4b1,ee00c60ca6f97f4603c1572ec34099a1cb800e46..63666c01ebb592e0a01ef1424eae1b6095f8808d
--- 1/qcsrc/server/client.qh
--- 2/qcsrc/server/client.qh
+++ b/qcsrc/server/client.qh
@@@ -107,37 -107,8 +107,38 @@@ CLASS(Client, Object
      ATTRIB(Client, specialcommand_pos, int, this.specialcommand_pos);
      ATTRIB(Client, hitplotfh, int, this.hitplotfh);
      ATTRIB(Client, clientdata, entity, this.clientdata);
 +    ATTRIB(Client, cmd_floodcount, int, this.cmd_floodcount);
 +    ATTRIB(Client, cmd_floodtime, float, this.cmd_floodtime);
+     ATTRIB(Client, wasplayer, bool, this.wasplayer);
  
 +    // networked cvars
 +
 +    ATTRIB(Client, cvar_cl_allow_uid2name, int, this.cvar_cl_allow_uid2name);
 +    ATTRIB(Client, cvar_cl_allow_uidtracking, int, this.cvar_cl_allow_uidtracking);
 +    ATTRIB(Client, cvar_cl_autotaunt, float, this.cvar_cl_autotaunt);
 +    ATTRIB(Client, cvar_cl_voice_directional, int, this.cvar_cl_voice_directional);
 +    ATTRIB(Client, cvar_cl_voice_directional_taunt_attenuation, float, this.cvar_cl_voice_directional_taunt_attenuation);
 +    ATTRIB(Client, cvar_cl_physics, string, this.cvar_cl_physics);
 +    ATTRIB(Client, cvar_cl_buffs_autoreplace, bool, this.cvar_cl_buffs_autoreplace);
 +    ATTRIB(Client, cvar_cl_nade_type, int, this.cvar_cl_nade_type);
 +    ATTRIB(Client, cvar_cl_pokenade_type, string, this.cvar_cl_pokenade_type);
 +    ATTRIB(Client, cvar_cl_spawn_near_teammate, bool, this.cvar_cl_spawn_near_teammate);
 +    ATTRIB(Client, cvar_cl_gunalign, int, this.cvar_cl_gunalign);
 +    ATTRIB(Client, cvar_cl_handicap, float, this.cvar_cl_handicap);
 +    ATTRIB(Client, cvar_cl_clippedspectating, bool, this.cvar_cl_clippedspectating);
 +    ATTRIB(Client, cvar_cl_autoscreenshot, int, this.cvar_cl_autoscreenshot);
 +    ATTRIB(Client, cvar_cl_jetpack_jump, bool, this.cvar_cl_jetpack_jump);
 +    ATTRIB(Client, cvar_cl_newusekeysupported, bool, this.cvar_cl_newusekeysupported);
 +    ATTRIB(Client, cvar_cl_noantilag, bool, this.cvar_cl_noantilag);
 +    ATTRIB(Client, cvar_cl_movement_track_canjump, bool, this.cvar_cl_movement_track_canjump);
 +    ATTRIB(Client, cvar_cl_weaponimpulsemode, int, this.cvar_cl_weaponimpulsemode);
 +    ATTRIB(Client, cvar_g_xonoticversion, string, this.cvar_g_xonoticversion);
 +    ATTRIB(Client, autoswitch, bool, this.autoswitch);
 +    ATTRIB(Client, cvar_cl_dodging_timeout, float, this.cvar_cl_dodging_timeout);
 +    ATTRIB(Client, cvar_cl_multijump, bool, this.cvar_cl_multijump);
 +    ATTRIB(Client, cvar_cl_accuracy_data_share, bool, this.cvar_cl_accuracy_data_share);
 +    ATTRIB(Client, cvar_cl_accuracy_data_receive, bool, this.cvar_cl_accuracy_data_receive);
 +
      METHOD(Client, m_unwind, bool(Client this));
  
      STATIC_METHOD(Client, Add, void(Client this, int _team));

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

diff --cc qcsrc/server/defs.qh
Simple merge

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

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

diff --cc qcsrc/server/mutators/mutator/gamemode_ctf.qc
Simple merge

diff --cc qcsrc/server/mutators/mutator/gamemode_cts.qc
Simple merge

diff --cc qcsrc/server/mutators/mutator/gamemode_race.qc
Simple merge

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

diff --cc qcsrc/server/weapons/accuracy.qc
Simple merge

diff --cc qcsrc/server/weapons/tracing.qc
Simple merge