Merge branch 'master' into terencehill/vehicles_fixes
authorterencehill <piuntn@gmail.com>
Sat, 4 Jan 2014 18:48:00 +0000 (19:48 +0100)
committerterencehill <piuntn@gmail.com>
Sat, 4 Jan 2014 18:48:00 +0000 (19:48 +0100)
Conflicts:
qcsrc/server/vehicles/bumblebee.qc
qcsrc/server/vehicles/raptor.qc
qcsrc/server/vehicles/spiderbot.qc

1  2 
qcsrc/server/cl_client.qc
qcsrc/server/cl_impulse.qc
qcsrc/server/mutators/gamemode_assault.qc
qcsrc/server/vehicles/bumblebee.qc
qcsrc/server/vehicles/racer.qc
qcsrc/server/vehicles/raptor.qc
qcsrc/server/vehicles/spiderbot.qc
qcsrc/server/vehicles/vehicles.qc
vehicle_spiderbot.cfg

Simple merge
index 2535444966e26b347541c7825410632fd6db362c,a4376bd418a101096d5fdf7d2e68c76070796578..28d794c6dfcbbeb52a9a628feff097b44ec0a742
@@@ -52,13 -52,13 +52,13 @@@ void ImpulseCommands (void
  
        if (timeout_status == TIMEOUT_ACTIVE) //don't allow any impulses while the game is paused
                return;
-     
      if(self.vehicle)
          if(self.vehicle.deadflag == DEAD_NO)
 -            if(self.vehicle.vehicles_impusle)
 -                if(self.vehicle.vehicles_impusle(imp))
 +            if(self.vehicle.vehicles_impulse)
 +                if(self.vehicle.vehicles_impulse(imp))
                      return;
-     
        if(CheatImpulse(imp))
        {
        }
Simple merge
Simple merge
index c9096a818a9a6a59d3ef92b6217b589359fb3577,58a640e9cf8672afe3d0861b7c572f4ad4617bd9..a6ef526499528839ee09194e3b0fbd73bc5cee1c
@@@ -805,9 -797,9 +805,9 @@@ void raptor_spawn(float _f
  
          //FIXME: Camera is in a bad place in HUD model.
          //setorigin(self.vehicle_viewport, '25 0 5');
-         
 -        self.vehicles_impusle   = raptor_impulse;
 +        self.vehicles_impulse   = raptor_impulse;
-         
          self.frame = 0;
  
          self.bomb1 = spawn();
index 3d1aa3d833de56183726b8051a044cd9268e281a,a73997fda5be350ca8469496fcd56033691ae9f7..1085a904e2143f7e1abec373b6f4d80aa496cad7
@@@ -797,10 -783,10 +792,10 @@@ float spiderbot_impulse(float _imp
  void spiderbot_spawn(float _f)
  {
      if(!self.gun1)
-     {        
+     {
 -        self.vehicles_impusle   = spiderbot_impulse;
 +        self.vehicles_impulse   = spiderbot_impulse;
          self.gun1               = spawn();
-         self.gun2               = spawn();    
+         self.gun2               = spawn();
          setmodel(self.gun1, "models/vehicles/spiderbot_barrels.dpm");
          setmodel(self.gun2, "models/vehicles/spiderbot_barrels.dpm");
          setattachment(self.gun1, self.tur_head, "tag_hardpoint01");
index aa72658b512b2137442d85cbfc969e8f51f473b3,1e5537a259934cd2faab7750716d1b9d57ea22de..b9740b5d88bfa5bee49fc6589962ef61298ed672
@@@ -683,10 -658,10 +683,10 @@@ void vehicles_enter(
          }
      }
  
 -    vehicles_clearrturn();
 +    vehicles_clearreturn();
  
      CSQCVehicleSetup(self.owner, self.hud);
-     
      vh_player = other;
      vh_vehicle = self;
      MUTATOR_CALLHOOK(VehicleEnter);
Simple merge