Merge branch 'master' into Mario/monsters

diff --git a/balanceXPM.cfg b/balanceXPM.cfg
index b60d779a51f3a6b966dc94076f65529a5fdca6b4..9d27ac66c9988af575a770ec3685fb1e52b22331 100644 (file)
--- a/balanceXPM.cfg
+++ b/balanceXPM.cfg
@@ -383,7 +383,7 @@ set g_balance_electro_primary_edgedamage 20
 set g_balance_electro_primary_force 200
 set g_balance_electro_primary_force_up 0
 set g_balance_electro_primary_radius 100
-set g_balance_electro_primary_comboradius 200
+set g_balance_electro_primary_comboradius 300
 set g_balance_electro_primary_speed 2500
 set g_balance_electro_primary_spread 0
 set g_balance_electro_primary_lifetime 5

diff --git a/balanceXonotic.cfg b/balanceXonotic.cfg
index 3b8724ca443af8bbc51d038b3a757b4bc84d0545..6deba7604231d0244c560f7d84ae22e5de948f43 100644 (file)
--- a/balanceXonotic.cfg
+++ b/balanceXonotic.cfg
@@ -383,7 +383,7 @@ set g_balance_electro_primary_edgedamage 20
 set g_balance_electro_primary_force 200
 set g_balance_electro_primary_force_up 0
 set g_balance_electro_primary_radius 100
-set g_balance_electro_primary_comboradius 200
+set g_balance_electro_primary_comboradius 300
 set g_balance_electro_primary_speed 2500
 set g_balance_electro_primary_spread 0
 set g_balance_electro_primary_lifetime 5

diff --git a/qcsrc/client/View.qc b/qcsrc/client/View.qc
index 6618690882b061bcc996c9f06062253354018593..6f5b445d301d71da09626f2acbb0d98f9fb2916f 100644 (file)
--- a/qcsrc/client/View.qc
+++ b/qcsrc/client/View.qc
@@ -166,15 +166,19 @@ vector GetCurrentFov(float fov)
 
        if(autocvar_cl_velocityzoom && autocvar_cl_velocityzoom_type) // _type = 0 disables velocity zoom too
        {
-               v = pmove_vel;
-               if(csqcplayer)
-                       v = csqcplayer.velocity;
-
-               switch(autocvar_cl_velocityzoom_type)
+               if(intermission) { curspeed = 0; }
+               else
                {
-                       case 3: curspeed = max(0, v_forward * v); break;
-                       case 2: curspeed = (v_forward * v); break;
-                       case 1: default: curspeed = vlen(v); break;
+                       v = pmove_vel;
+                       if(csqcplayer)
+                               v = csqcplayer.velocity;
+
+                       switch(autocvar_cl_velocityzoom_type)
+                       {
+                               case 3: curspeed = max(0, v_forward * v); break;
+                               case 2: curspeed = (v_forward * v); break;
+                               case 1: default: curspeed = vlen(v); break;
+                       }
                }
                
                velocityzoom = bound(0, drawframetime / max(0.000000001, autocvar_cl_velocityzoom_time), 1); // speed at which the zoom adapts to player velocity