Merge branch 'master' into Mario/mutators

diff --git a/qcsrc/client/View.qc b/qcsrc/client/View.qc
index 13e41a4167c531dcbba9387dfca2af50cb29ab2b..44f8236f2f55cb859b9a04e3b5eff1d58567c433 100644 (file)
--- a/qcsrc/client/View.qc
+++ b/qcsrc/client/View.qc
@@ -483,7 +483,15 @@ void CSQC_UpdateView(float w, float h)
                if(spectatee_status >= 0 && (autocvar_cl_eventchase_death && is_dead) || intermission)
                {
                        // make special vector since we can't use view_origin (It is one frame old as of this code, it gets set later with the results this code makes.)
-                       vector current_view_origin = ((csqcplayer ? csqcplayer.origin : pmove_org) + autocvar_cl_eventchase_viewoffset);
+                       vector current_view_origin = (csqcplayer ? csqcplayer.origin : pmove_org);
+
+                       // detect maximum viewoffset and use it
+                       if(autocvar_cl_eventchase_viewoffset)
+                       {
+                               WarpZone_TraceLine(current_view_origin, current_view_origin + autocvar_cl_eventchase_viewoffset + ('0 0 1' * autocvar_cl_eventchase_maxs_z), MOVE_WORLDONLY, self);
+                               if(trace_fraction == 1) { current_view_origin += autocvar_cl_eventchase_viewoffset; }
+                               else { current_view_origin_z += max(0, (trace_endpos_z - current_view_origin_z) - autocvar_cl_eventchase_maxs_z); }
+                       }
 
                        // We must enable chase_active to get a third person view (weapon viewmodel hidden and own player model showing).
                        // Ideally, there should be another way to enable third person cameras, such as through setproperty()

diff --git a/qcsrc/server/cheats.qc b/qcsrc/server/cheats.qc
index 017999d761becfb892d56dc535ff8f2c43a9a148..c87eee433669cc01da6cd30de366ff459b0d42d7 100644 (file)
--- a/qcsrc/server/cheats.qc
+++ b/qcsrc/server/cheats.qc
@@ -236,7 +236,7 @@ float CheatImpulse(float i)
                                        break;
                                }
                        }
-                       if(MoveToRandomMapLocation(self, DPCONTENTS_SOLID | DPCONTENTS_CORPSE | DPCONTENTS_PLAYERCLIP, DPCONTENTS_SLIME | DPCONTENTS_LAVA | DPCONTENTS_SKY | DPCONTENTS_BODY | DPCONTENTS_DONOTENTER, Q3SURFACEFLAG_SKY, ((gamestart_sv_cheats < 2) ? 100 : 100000), 1024, 256))
+                       if(MoveToRandomMapLocation(self, DPCONTENTS_SOLID | DPCONTENTS_CORPSE | DPCONTENTS_PLAYERCLIP, DPCONTENTS_SLIME | DPCONTENTS_LAVA | DPCONTENTS_SKY | DPCONTENTS_BODY | DPCONTENTS_DONOTENTER, Q3SURFACEFLAG_SKY, ((gamestart_sv_cheats < 2) ? 100 : 100000), 384, 384))
                        {
                                sprint(self, "Emergency teleport used random location\n");
                                self.angles_x = -self.angles_x;

diff --git a/vehicle_racer.cfg b/vehicle_racer.cfg
index 5c3e06aff1cc9f4db3b590407cecd65beec6db58..4a7862008348efb3190b60b0c0400cdb3946f9ac 100644 (file)
--- a/vehicle_racer.cfg
+++ b/vehicle_racer.cfg
@@ -52,7 +52,7 @@ set g_vehicle_racer_rocket_cost        0
 set g_vehicle_racer_rocket_climbspeed  1600
 
 set g_vehicle_racer_rocket_locktarget           1
-set g_vehicle_racer_rocket_locking_time         0.35
+set g_vehicle_racer_rocket_locking_time         0.9
 set g_vehicle_racer_rocket_locking_releasetime  0.5
 set g_vehicle_racer_rocket_locked_time          4
 set g_vehicle_racer_rocket_locked_maxangle      1.8

diff --git a/vehicle_raptor.cfg b/vehicle_raptor.cfg
index 1efc2f17534f291a1387c90af40bff49acb5fbfc..d91b79b6ceebdd6858051c24c837b21208378732 100644 (file)
--- a/vehicle_raptor.cfg
+++ b/vehicle_raptor.cfg
@@ -29,12 +29,12 @@ set g_vehicle_raptor_bomblet_force      150
 set g_vehicle_raptor_bomblet_explode_delay 0.4
 set g_vehicle_raptor_bombs_refire       5
 
-set g_vehicle_raptor_cannon_turnspeed 60
+set g_vehicle_raptor_cannon_turnspeed 120
 set g_vehicle_raptor_cannon_turnlimit 20
 set g_vehicle_raptor_cannon_pitchlimit_up   12
 set g_vehicle_raptor_cannon_pitchlimit_down 32
 
-set g_vehicle_raptor_cannon_locktarget          1
+set g_vehicle_raptor_cannon_locktarget          0
 set g_vehicle_raptor_cannon_locking_time        0.2
 set g_vehicle_raptor_cannon_locking_releasetime 0.45
 set g_vehicle_raptor_cannon_locked_time         1
@@ -44,7 +44,7 @@ set g_vehicle_raptor_cannon_cost     1
 set g_vehicle_raptor_cannon_damage   10
 set g_vehicle_raptor_cannon_radius   60
 set g_vehicle_raptor_cannon_refire   0.03
-set g_vehicle_raptor_cannon_speed    12000
+set g_vehicle_raptor_cannon_speed    24000
 set g_vehicle_raptor_cannon_spread   0.01
 set g_vehicle_raptor_cannon_force    25
 

diff --git a/vehicle_spiderbot.cfg b/vehicle_spiderbot.cfg
index 0223b09e897770b09ca9ae84b19fd561041758a9..23b0857a027ebed4726d4d8df6bdd7e15baef02d 100644 (file)
--- a/vehicle_spiderbot.cfg
+++ b/vehicle_spiderbot.cfg
@@ -26,14 +26,14 @@ set g_vehicle_spiderbot_speed_strafe       400
 set g_vehicle_spiderbot_movement_inertia   0.15
 set g_vehicle_spiderbot_tiltlimit          90
 
-set g_vehicle_spiderbot_minigun_damage          12       // 400 (x2) DPS 
-set g_vehicle_spiderbot_minigun_refire          0.03
+set g_vehicle_spiderbot_minigun_damage          24       // 400 (x2) DPS 
+set g_vehicle_spiderbot_minigun_refire          0.06
 set g_vehicle_spiderbot_minigun_force           9
 set g_vehicle_spiderbot_minigun_spread          0.015
 set g_vehicle_spiderbot_minigun_speed           45000  // ~ 32QU
 set g_vehicle_spiderbot_minigun_bulletconstant  110
 set g_vehicle_spiderbot_minigun_ammo_cost       1
-set g_vehicle_spiderbot_minigun_ammo_max        200
+set g_vehicle_spiderbot_minigun_ammo_max        100
 set g_vehicle_spiderbot_minigun_ammo_regen      40
 set g_vehicle_spiderbot_minigun_ammo_regen_pause 1