Merge branch 'master' into Lyberta/StandaloneOverkillWeapons

diff --cc defaultXonotic.cfg
Simple merge

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

diff --cc qcsrc/server/client.qc
index 2e2e92cd58e2b240069147bdc12d4b5ff5bbd728,72ee5a7cd4c486d641370481f3797c27b7c5f20b..284d133cf58f7551d64bfb06fbe507f0eba3602b
--- 1/qcsrc/server/client.qc
--- 2/qcsrc/server/client.qc
+++ b/qcsrc/server/client.qc
@@@ -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;

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