Merge branch 'master' into Mario/wepent_experimental
authorMario <mario@smbclan.net>
Tue, 29 Nov 2016 14:03:52 +0000 (00:03 +1000)
committerMario <mario@smbclan.net>
Tue, 29 Nov 2016 14:03:52 +0000 (00:03 +1000)
# Conflicts:
# qcsrc/common/mutators/mutator/nades/nades.qc

1  2 
mutators.cfg
qcsrc/client/view.qc
qcsrc/common/mutators/mutator/nades/nades.qc
qcsrc/common/physics/player.qc
qcsrc/server/client.qc
qcsrc/server/miscfunctions.qc
qcsrc/server/mutators/events.qh

diff --cc mutators.cfg
Simple merge
Simple merge
index 24d8c87cc0cbbfe1ca97ab8c0ec962c1160b430d,c09e221e469ec96b7e912b3bc0491dd372cc68e7..7f2bed6973aafcdd50327c74e9a5d8b6b266267a
@@@ -1050,9 -1050,10 +1052,10 @@@ void spawn_held_nade(entity player, ent
        setthink(n, nade_beep);
        n.nextthink = max(n.wait - 3, time);
        n.projectiledeathtype = DEATH_NADE.m_id;
 +      n.weaponentity_fld = weaponentity;
+       n.nade_lifetime = ntime;
  
        setmodel(fn, MDL_NADE_VIEW);
 -      .entity weaponentity = weaponentities[0]; // TODO: unhardcode
        setattachment(fn, player.(weaponentity), "");
        fn.realowner = fn.owner = player;
        fn.colormod = Nades_from(n.nade_type).m_color;
Simple merge
index 58e512a38255aa825cd207ba8b013df1583d492f,04c35a11761ffbb05b04cec53c55919c53b4a55c..2b480e39ec8396b507335ce35f0e61ec09676744
@@@ -331,8 -336,10 +331,9 @@@ void PutObserverInServer(entity this
        this.istypefrag = 0;
        setthink(this, func_null);
        this.nextthink = 0;
 -      this.hook_time = 0;
        this.deadflag = DEAD_NO;
        this.crouch = false;
+       this.revive_progress = 0;
        this.revival_time = 0;
  
        this.items = 0;
Simple merge
Simple merge