Merge branch 'master' into terencehill/vehicles_fixes

Conflicts:
	qcsrc/server/vehicles/spiderbot.qc

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

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

diff --cc qcsrc/server/vehicles/bumblebee.qc
Simple merge

diff --cc qcsrc/server/vehicles/racer.qc
Simple merge

diff --cc qcsrc/server/vehicles/raptor.qc
Simple merge

diff --cc qcsrc/server/vehicles/spiderbot.qc
index 5dcfdc2571e43a4ceb9f9e0dd122e1f3ff1f12e8,9dc41952f32167641870998808b0e2b3dd18f18e..3d1aa3d833de56183726b8051a044cd9268e281a
--- 1/qcsrc/server/vehicles/spiderbot.qc
--- 2/qcsrc/server/vehicles/spiderbot.qc
+++ b/qcsrc/server/vehicles/spiderbot.qc
@@@ -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()

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

diff --cc qcsrc/server/vehicles/vehicles_def.qh
Simple merge

diff --cc vehicle_raptor.cfg
Simple merge

diff --cc vehicle_spiderbot.cfg
Simple merge