Merge branch 'master' into Lyberta/StandaloneOverkillWeapons
authorLyberta <lyberta@lyberta.net>
Fri, 28 Apr 2017 18:47:00 +0000 (21:47 +0300)
committerLyberta <lyberta@lyberta.net>
Fri, 28 Apr 2017 18:47:00 +0000 (21:47 +0300)
1  2 
defaultXonotic.cfg
qcsrc/client/view.qc
qcsrc/server/client.qc
qcsrc/server/defs.qh

Simple merge
Simple merge
@@@ -1696,10 -1695,9 +1697,11 @@@ 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