Merge branch 'master' into terencehill/vehicles_fixes
authorterencehill <piuntn@gmail.com>
Sat, 31 Aug 2013 10:21:48 +0000 (12:21 +0200)
committerterencehill <piuntn@gmail.com>
Sat, 31 Aug 2013 10:21:48 +0000 (12:21 +0200)
Conflicts:
qcsrc/server/vehicles/spiderbot.qc

1  2 
qcsrc/server/cl_client.qc
qcsrc/server/cl_impulse.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
qcsrc/server/vehicles/vehicles_def.qh
vehicle_raptor.cfg
vehicle_spiderbot.cfg

Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
@@@ -737,9 -729,8 +737,9 @@@ void spiderbot_blowup(
      self.movetype   = MOVETYPE_NONE;
      self.deadflag   = DEAD_DEAD;
      self.solid      = SOLID_NOT;
-     self.tur_head.effects  &~=  EF_FLAME;
+     self.tur_head.effects  &=  ~EF_FLAME;
 -    self.vehicle_hudmodel.viewmodelforclient = self;
 +      self.vehicle_hudmodel.viewmodelforclient = self;
 +      setorigin(self, self.pos1);
  }
  
  void spiderbot_die()
Simple merge
Simple merge
Simple merge
Simple merge