Merge branch 'master' into drjaska/q3df-rl-h-force

diff --cc bal-wep-mario.cfg
Simple merge

diff --cc bal-wep-nexuiz25.cfg
Simple merge

diff --cc bal-wep-samual.cfg
Simple merge

diff --cc bal-wep-xdf.cfg
Simple merge

diff --cc bal-wep-xonotic.cfg
Simple merge

diff --cc qcsrc/common/weapons/weapon/blaster.qc
index 1699f40187e7fea9f43fc9abff920ab4144691af,3a936a5d844c24ca27f212684e92e9b0f0dd8ae1..63e735b3b15cd158182475f3715f89526dc910a6
--- 1/qcsrc/common/weapons/weapon/blaster.qc
--- 2/qcsrc/common/weapons/weapon/blaster.qc
+++ b/qcsrc/common/weapons/weapon/blaster.qc
@@@ -7,11 -7,7 +7,10 @@@ void W_Blaster_Touch(entity this, entit
        PROJECTILE_TOUCH(this, toucher);
  
        this.event_damage = func_null;
-       bool isprimary = !(this.projectiledeathtype & HITTYPE_SECONDARY);
  
-       force_xyzscale.z = WEP_CVAR_BOTH(blaster, isprimary, force_zscale);
 +      vector force_xyzscale = '1 1 1';
++      force_xyzscale.z = WEP_CVAR_PRI(WEP_BLASTER, force_zscale);
 +
        RadiusDamageForSource(
                this,
                (this.origin + (this.mins + this.maxs) * 0.5),
@@@ -23,8 -19,8 +22,8 @@@
                NULL,
                NULL,
                false,
-               WEP_CVAR_BOTH(blaster, isprimary, force),
+               WEP_CVAR_PRI(WEP_BLASTER, force),
 -              WEP_CVAR_PRI(WEP_BLASTER, force_zscale),
 +              force_xyzscale,
                this.projectiledeathtype,
                this.weaponentity_fld,
                toucher

diff --cc qcsrc/common/weapons/weapon/devastator.qc
index 0f840df55e8ed06296c69d9081d3827f5f20cbe5,d1f22665dabe131339aa32650784120837e15074..562f754ec0c48572424b1d7a130d6cdee03005fc
--- 1/qcsrc/common/weapons/weapon/devastator.qc
--- 2/qcsrc/common/weapons/weapon/devastator.qc
+++ b/qcsrc/common/weapons/weapon/devastator.qc
@@@ -28,23 -28,15 +28,23 @@@ void W_Devastator_Explode(entity this, 
        this.event_damage = func_null;
        this.takedamage = DAMAGE_NO;
  
 -      RadiusDamage(
 +      vector force_xyzscale = '1 1 1';
-       force_xyzscale.x = WEP_CVAR(devastator, force_xyscale);
-       force_xyzscale.y = WEP_CVAR(devastator, force_xyscale);
++      force_xyzscale.x = WEP_CVAR(WEP_DEVASTATOR, force_xyscale);
++      force_xyzscale.y = WEP_CVAR(WEP_DEVASTATOR, force_xyscale);
 +
 +      RadiusDamageForSource(
                this,
 +              this.origin,
 +              this.velocity,
                this.realowner,
-               WEP_CVAR(devastator, damage),
-               WEP_CVAR(devastator, edgedamage),
-               WEP_CVAR(devastator, radius),
+               WEP_CVAR(WEP_DEVASTATOR, damage),
+               WEP_CVAR(WEP_DEVASTATOR, edgedamage),
+               WEP_CVAR(WEP_DEVASTATOR, radius),
                NULL,
                NULL,
-               WEP_CVAR(devastator, force),
 +              false,
+               WEP_CVAR(WEP_DEVASTATOR, force),
 +              force_xyzscale,
                this.projectiledeathtype,
                this.weaponentity_fld,
                directhitentity

diff --cc qcsrc/common/weapons/weapon/devastator.qh
Simple merge