Merged master.
authorLyberta <lyberta@lyberta.net>
Fri, 4 Aug 2017 22:17:37 +0000 (01:17 +0300)
committerLyberta <lyberta@lyberta.net>
Fri, 4 Aug 2017 22:17:37 +0000 (01:17 +0300)
1  2 
defaultXonotic.cfg
qcsrc/client/view.qc
qcsrc/common/mutators/mutator/overkill/rpc.qc
qcsrc/common/stats.qh
qcsrc/common/weapons/weapon/shotgun.qc
qcsrc/server/client.qc
qcsrc/server/defs.qh

Simple merge
Simple merge
index afca9517cfb74f28e743c85db632e651a25816f0,e9a5ce2c3fc01b3a39a0ab055234b5f23170b4fd..536435d34ff3c48cc94ed797eabbbb7042708007
@@@ -8,9 -8,9 +8,9 @@@ void W_RocketPropelledChainsaw_Explode(
        this.event_damage = func_null;
        this.takedamage = DAMAGE_NO;
  
 -      RadiusDamage (this, this.realowner, WEP_CVAR(rpc, damage), WEP_CVAR(rpc, edgedamage), WEP_CVAR(rpc, radius), NULL, NULL, WEP_CVAR(rpc, force), this.projectiledeathtype, directhitentity);
 +      RadiusDamage (this, this.realowner, WEP_CVAR_PRI(rpc, damage), WEP_CVAR_PRI(rpc, edgedamage), WEP_CVAR_PRI(rpc, radius), NULL, NULL, WEP_CVAR_PRI(rpc, force), this.projectiledeathtype, directhitentity);
  
-       delete (this);
+       delete(this);
  }
  
  void W_RocketPropelledChainsaw_Explode_think(entity this)
Simple merge
index 7401c2cd1a1f7f141f0a392f82d28154bb7f79e8,804868fa0031ac041b3e24cf65ae737fb0bed114..d8a8c3c52e5f4aeeffa9274870b324eb5b2eaedd
@@@ -1705,11 -1722,8 +1724,10 @@@ void SpectateCopy(entity this, entity s
        this.superweapons_finished = spectatee.superweapons_finished;
        STAT(PRESSED_KEYS, this) = STAT(PRESSED_KEYS, spectatee);
        this.weapons = spectatee.weapons;
-       this.dual_weapons = spectatee.dual_weapons;
        this.vortex_charge = spectatee.vortex_charge;
        this.vortex_chargepool_ammo = spectatee.vortex_chargepool_ammo;
 +      this.okvortex_charge = spectatee.okvortex_charge;
 +      this.okvortex_chargepool_ammo = spectatee.okvortex_chargepool_ammo;
        this.hagar_load = spectatee.hagar_load;
        this.arc_heat_percent = spectatee.arc_heat_percent;
        this.minelayer_mines = spectatee.minelayer_mines;
Simple merge