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/devastator.qc
Simple merge

diff --cc qcsrc/common/weapons/weapon/devastator.qh
index b4e155aae11a287a334f6ac3583e39bf61792109,01f3b59f343ae63936611710ca3f40c9945b52b4..1d3261f429ae3716a033444f13bddf1576e22efb
--- 1/qcsrc/common/weapons/weapon/devastator.qh
--- 2/qcsrc/common/weapons/weapon/devastator.qh
+++ b/qcsrc/common/weapons/weapon/devastator.qh
@@@ -23,38 -23,37 +23,38 @@@ CLASS(Devastator, Weapon
  #define X(BEGIN, P, END, class, prefix) \
        BEGIN(class) \
                P(class, prefix, ammo, float, NONE) \
-         P(class, prefix, animtime, float, NONE) \
-         P(class, prefix, damageforcescale, float, NONE) \
-         P(class, prefix, damage, float, NONE) \
-         P(class, prefix, detonatedelay, float, NONE) \
-         P(class, prefix, edgedamage, float, NONE) \
-         P(class, prefix, force, float, NONE) \
-         P(class, prefix, force_xyscale, float, NONE) \
-         P(class, prefix, guidedelay, float, NONE) \
-         P(class, prefix, guidegoal, float, NONE) \
-         P(class, prefix, guideratedelay, float, NONE) \
-         P(class, prefix, guiderate, float, NONE) \
-         P(class, prefix, guidestop, float, NONE) \
-         P(class, prefix, health, float, NONE) \
-         P(class, prefix, lifetime, float, NONE) \
-         P(class, prefix, radius, float, NONE) \
-         P(class, prefix, refire, float, NONE) \
+               P(class, prefix, animtime, float, NONE) \
+               P(class, prefix, damageforcescale, float, NONE) \
+               P(class, prefix, damage, float, NONE) \
+               P(class, prefix, detonatedelay, float, NONE) \
+               P(class, prefix, edgedamage, float, NONE) \
+               P(class, prefix, force, float, NONE) \
++              P(class, prefix, force_xyscale, float, NONE) \
+               P(class, prefix, guidedelay, float, NONE) \
+               P(class, prefix, guidegoal, float, NONE) \
+               P(class, prefix, guideratedelay, float, NONE) \
+               P(class, prefix, guiderate, float, NONE) \
+               P(class, prefix, guidestop, float, NONE) \
+               P(class, prefix, health, float, NONE) \
+               P(class, prefix, lifetime, float, NONE) \
+               P(class, prefix, radius, float, NONE) \
+               P(class, prefix, refire, float, NONE) \
                P(class, prefix, reload_ammo, float, NONE) \
                P(class, prefix, reload_time, float, NONE) \
-         P(class, prefix, remote_damage, float, NONE) \
-         P(class, prefix, remote_edgedamage, float, NONE) \
-         P(class, prefix, remote_force, float, NONE) \
-         P(class, prefix, remote_jump, float, NONE) \
-         P(class, prefix, remote_jump_damage, float, NONE) \
-         P(class, prefix, remote_jump_force, float, NONE) \
-         P(class, prefix, remote_jump_radius, float, NONE) \
-         P(class, prefix, remote_jump_velocity_z_add, float, NONE) \
-         P(class, prefix, remote_jump_velocity_z_max, float, NONE) \
-         P(class, prefix, remote_jump_velocity_z_min, float, NONE) \
-         P(class, prefix, remote_radius, float, NONE) \
-         P(class, prefix, speedaccel, float, NONE) \
-         P(class, prefix, speedstart, float, NONE) \
-         P(class, prefix, speed, float, NONE) \
+               P(class, prefix, remote_damage, float, NONE) \
+               P(class, prefix, remote_edgedamage, float, NONE) \
+               P(class, prefix, remote_force, float, NONE) \
+               P(class, prefix, remote_jump, float, NONE) \
+               P(class, prefix, remote_jump_damage, float, NONE) \
+               P(class, prefix, remote_jump_force, float, NONE) \
+               P(class, prefix, remote_jump_radius, float, NONE) \
+               P(class, prefix, remote_jump_velocity_z_add, float, NONE) \
+               P(class, prefix, remote_jump_velocity_z_max, float, NONE) \
+               P(class, prefix, remote_jump_velocity_z_min, float, NONE) \
+               P(class, prefix, remote_radius, float, NONE) \
+               P(class, prefix, speedaccel, float, NONE) \
+               P(class, prefix, speedstart, float, NONE) \
+               P(class, prefix, speed, float, NONE) \
                P(class, prefix, switchdelay_drop, float, NONE) \
                P(class, prefix, switchdelay_raise, float, NONE) \
                P(class, prefix, weaponreplace, string,NONE) \

diff --cc qcsrc/server/damage.qc
Simple merge