Merge remote-tracking branch 'origin/master' into samual/spawn_weapons

Conflicts:
	effectinfo.txt
	qcsrc/server/vehicles/raptor.qc
	qcsrc/server/vehicles/spiderbot.qc

diff --cc effectinfo.txt
index 38a14489d07172fe6aa3dd95852698a18759d7bc,38413d3c622aa32af70926abdb2e1b8649458327..e2491883b576181e36c7f38794d70778e26212aa
--- 1/effectinfo.txt
--- 2/effectinfo.txt
+++ b/effectinfo.txt
@@@ -7411,82 -7411,229 +7411,310 @@@ velocityjitter 64 64 6
  //lightcolor 1 0.9 0.7
  //lightshadow 1
  
 -// heal ray muzzleflash
+ 
++// heal ray muzzleflash
+ effect healray_muzzleflash
+ countabsolute 1
+ type smoke
+ color 0x283880 0x283880 // 0x202020 0x404040
+ tex 65 65
+ size 20 20
+ alpha 256 256 512
+ originjitter 1.5 1.5 1.5
+ velocityjitter 6 6 6
+ sizeincrease -10
+ velocitymultiplier 0.01
+ lightradius 200
+ lightradiusfade 2000
+ lightcolor 1.5 3 6
+ 
+ effect healray_muzzleflash
+ count 22
+ type spark
+ tex 71 73
+ color 0xD9FDFF 0x00f0ff
+ size 1 15
+ sizeincrease 3
+ alpha 50 150 1924
+ originjitter 1 1 1
+ velocityjitter 150 150 150
+ velocitymultiplier 0.4
+ airfriction 5
+ stretchfactor 3.9
+ 
+ effect healray_muzzleflash
+ count 4
+ type spark
+ tex 70 70
+ color 0xD9FDFF 0x00f0ff
+ size 1 1
+ alpha 110 228 4024
+ originjitter 1 1 1
+ velocityjitter 650 650 650
+ velocitymultiplier 1.1
+ stretchfactor 0.2
+ 
+ 
+ 
+ //healray impact
+ 
+ effect healray_impact
+ countabsolute 1
+ type decal
+ tex 59 59
+ size 32 32
+ alpha 256 256 0
+ color 0xd800ff 0xd800ff
+ originjitter 17 17 17
+ lightradius 125
+ lightradiusfade 450
+ lightcolor 0 4.375 0
+ // shockwave
+ effect healray_impact
+ type smoke
+ countabsolute 1
+ tex 33 33
+ size 32 32
+ sizeincrease 1400
+ color 0x00ff00 0x84c52f
+ alpha 40 40 350
+ velocitymultiplier 44
+ // cloud of bouncing sparks
+ effect healray_impact
+ count 30
+ type spark
+ tex 70 70
+ color 0x00ff00 0x84c52f
+ size 1 2
+ alpha 156 300 1024
+ gravity 2
+ airfriction 6
+ originjitter 1 1 1
+ velocityjitter 1112 1112 1112
+ // inner cloud of smoke
+ effect healray_impact
+ count 15
+ type smoke
+ color 0x00ff00 0x84c52f
+ tex 40 40
+ size 2 3 
+ alpha 200 456 512
+ airfriction 3
+ gravity -2
+ velocityjitter 120 120 420
+ rotate -180 180 -90 90
+ 
+ 
+ 
+ 
+ // big plasma muzzle flash
+ 
+ effect bigplasma_muzzleflash
+ countabsolute 1
+ type smoke
+ color 0x283880 0x283880 // 0x202020 0x404040
+ tex 65 65
+ size 50 50
+ alpha 256 256 812
+ originjitter 1.5 1.5 1.5
+ velocityjitter 6 6 6
+ sizeincrease -10
+ velocitymultiplier 0.01
+ lightradius 200
+ lightradiusfade 2000
+ lightcolor 1.5 3 6
+ 
+ effect bigplasma_muzzleflash
+ countabsolute 1
+ type smoke
+ color 0x00f0ff 0x00f0ff
+ tex 74 74
+ size 20 20
+ alpha 56 56 1112
+ sizeincrease 300
+ 
+ effect bigplasma_muzzleflash
+ count 14
+ type spark
+ tex 51 55
+ color 0xD9FDFF 0x00f0ff
+ size 5 10
+ sizeincrease 135
+ alpha 50 150 1924
+ originjitter 1 1 1
+ velocityjitter 350 350 350
+ velocitymultiplier 0.4
+ airfriction 5
+ stretchfactor 1.9
+ 
+ effect bigplasma_muzzleflash
+ count 4
+ type spark
+ tex 70 70
+ color 0xD9FDFF 0x00f0ff
+ size 20 20
+ alpha 110 228 4024
+ originjitter 1 1 1
+ velocityjitter 650 650 650
+ velocitymultiplier 1.1
+ stretchfactor 0.2
+ 
+ 
+ // big plasma impact
+ 
+ effect bigplasma_impact
+ countabsolute 1
+ type decal
+ tex 59 59
+ size 32 32
+ alpha 256 256 0
+ originjitter 17 17 17
+ lightradius 125
+ lightradiusfade 450
+ lightcolor 3.125 4.375 10
+ // shockwave
+ effect bigplasma_impact
+ type smoke
+ countabsolute 1
+ tex 33 33
+ size 32 32
+ sizeincrease 1400
+ color 0x80C0FF 0x80C0FF
+ alpha 40 40 350
+ velocitymultiplier 44
+ // cloud of bouncing sparks
+ effect bigplasma_impact
+ count 30
+ type spark
+ tex 70 70
+ color 0x629dff 0x0018ff
+ size 1 2
+ alpha 156 300 1024
+ gravity 2
+ airfriction 6
+ originjitter 1 1 1
+ velocityjitter 1512 1512 1512
+ // inner cloud of smoke
+ effect bigplasma_impact
+ count 15
+ type smoke
+ color 0x629dff 0x0018ff
+ tex 48 55
+ size 20 24
+ sizeincrease 555
+ alpha 200 456 1512
+ airfriction 30
+ originjitter 20 20 20
+ velocityjitter 320 320 320
+ rotate -180 180 -9 9
+ // smoke
+ effect bigplasma_impact
+ type smoke
+ count 16
+ blend alpha
+ tex 0 7
+ size 60 30
+ color 0x222222 0x000000
+ alpha 128 328 390
+ rotate -180 180 2 -2
+ velocityjitter 100 100 200
+ velocityoffset 0 0 180
+ originjitter 80 80 10
+ sizeincrease 30
+ airfriction 0.04
+ gravity 0.4
+ // smoke in the middle
+ effect bigplasma_impact
+ type alphastatic
+ count 10
+ tex 0 7
+ size 60 70
+ color 0x222222 0x000000
+ alpha 128 328 310
+ rotate -180 180 20 -20
+ velocityjitter 10 10 10
+ originjitter 80 80 80
+ sizeincrease -10
+ airfriction 0.04
 -gravity -0.2
++gravity -0.2
++
++
 +// laser_shockwave_attack
 +// used nowhere in code
 +effect laser_shockwave_attack
 +// glow and light
 +//countabsolute 1
 +//type smoke
 +//color 0xcc0000 0xff0000
 +//tex 65 65
 +//size 10 15
 +//alpha 256 512 6280
 +//airfriction 10
 +//sizeincrease 1.5
 +//stretchfactor 2
 +//lightradius 200
 +//lightradiusfade 2000
 +//lightcolor 3 0.1 0.1
 +// electricity
 +effect laser_shockwave_attack
 +count 1
 +type spark
 +color 0xb44215 0xff0000
 +tex 43 43
 +size 5 7
 +bounce 0
 +alpha 4096 4096 20000
 +airfriction 1
 +originjitter 2 2 2
 +velocityjitter 10 10 10
 +velocitymultiplier 10
 +sizeincrease 1.5
 +stretchfactor 2.3
 +rotate -180 180 4000 -4000
 +// fire
 +effect laser_shockwave_attack
 +count 1
 +type spark
 +color 0xff4200 0xff0000
 +tex 8 15
 +size 7 9
 +bounce 0
 +alpha 4096 4096 20000
 +airfriction 1
 +originjitter 2 2 2
 +velocityjitter 10 10 10
 +velocitymultiplier 10
 +sizeincrease 1.5
 +stretchfactor 2
 +
 +// new_laser_impact
 +// used nowhere in code
 +// decal
 +effect new_laser_impact
 +countabsolute 1
 +type decal
 +tex 8 16
 +size 72 72
 +alpha 256 256 0
 +originjitter 2 2 2
 +// flare effect
 +//effect new_laser_impact
 +//countabsolute 1
 +//type static
 +//tex 39 39
 +//color 0xFF2010 0xFF2010
 +//alpha 256 256 1024
 +//size 24 24
 +// sparks that rapidly expand and rapidly slow down to form an interesting spherical effect
 +effect new_laser_impact
 +count 128
 +type spark
 +color 0x800000 0xFF8020
 +alpha 256 256 1024
 +size 4 4
 +bounce 1.5
 +gravity 0.5
 +airfriction 1
 +liquidfriction 1
 +originjitter 20 20 20
- velocityjitter 256 256 256
++velocityjitter 256 256 256

diff --cc qcsrc/client/Main.qc
Simple merge

diff --cc qcsrc/common/constants.qh
Simple merge

diff --cc qcsrc/server/autocvars.qh
Simple merge

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

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

diff --cc qcsrc/server/tturrets/units/unit_flac.qc
Simple merge

diff --cc qcsrc/server/tturrets/units/unit_walker.qc
Simple merge

diff --cc qcsrc/server/vehicles/racer.qc
index 2bde9a533a649dce2358dd1d9b8f58bdc7fef4bf,147c8139c64ae171baef0f5c8f1837052ab77e3c..0600ceb7cfcbce018112f66c2fc77f091084bd53
--- 1/qcsrc/server/vehicles/racer.qc
--- 2/qcsrc/server/vehicles/racer.qc
+++ b/qcsrc/server/vehicles/racer.qc
@@@ -555,9 -555,9 +555,9 @@@ void racer_blowup(
      self.deadflag    = DEAD_DEAD;
      self.vehicle_exit(VHEF_NORMAL);
  
-     RadiusDamage (self, self, autocvar_g_vehicle_racer_blowup_coredamage,
+     RadiusDamage (self, self.enemy, autocvar_g_vehicle_racer_blowup_coredamage,
                                        autocvar_g_vehicle_racer_blowup_edgedamage,
 -                                      autocvar_g_vehicle_racer_blowup_radius, world,
 +                                      autocvar_g_vehicle_racer_blowup_radius, world, world,
                                        autocvar_g_vehicle_racer_blowup_forceintensity,
                                        DEATH_WAKIBLOWUP, world);
  

diff --cc qcsrc/server/vehicles/raptor.qc
index cccc9b278d7a517f5aaae44b8ab57596f74275bf,c0e0c31a52e629a19867ca3f836e83d1f78bba31..c75932d81dd5cb92bb5033c4fc747309d90eaded
--- 1/qcsrc/server/vehicles/raptor.qc
--- 2/qcsrc/server/vehicles/raptor.qc
+++ b/qcsrc/server/vehicles/raptor.qc
@@@ -554,7 -625,7 +625,8 @@@ void raptor_blowup(
  {
      self.deadflag    = DEAD_DEAD;
      self.vehicle_exit(VHEF_NORMAL);
-     RadiusDamage (self, self, 250, 15, 250, world, world, 250, DEATH_WAKIBLOWUP, world);
 -    RadiusDamage (self, self.enemy, 250, 15, 250, world, 250, DEATH_WAKIBLOWUP, world);
++
++    RadiusDamage (self, self.enemy, 250, 15, 250, world, world, 250, DEATH_WAKIBLOWUP, world);
  
      self.alpha          = -1;
      self.movetype       = MOVETYPE_NONE;

diff --cc qcsrc/server/vehicles/spiderbot.qc
index 91136ce562bc871f768a936da6cf73a39618f73c,42bd7902b654ef7685bd533cd587fb74aba077c5..4201a5c772b7695a7a6d689f33f51d509009a426
--- 1/qcsrc/server/vehicles/spiderbot.qc
--- 2/qcsrc/server/vehicles/spiderbot.qc
+++ b/qcsrc/server/vehicles/spiderbot.qc
@@@ -566,7 -716,7 +716,7 @@@ void spiderbot_blowup(
      SUB_SetFade(g1, time, min(autocvar_g_vehicle_spiderbot_respawntime, 10));
      SUB_SetFade(g2, time, min(autocvar_g_vehicle_spiderbot_respawntime, 10));
  
-     RadiusDamage (self, self, 250, 15, 250, world, world, 250, DEATH_SBBLOWUP, world);
 -    RadiusDamage (self, self.enemy, 250, 15, 250, world, 250, DEATH_SBBLOWUP, world);
++    RadiusDamage (self, self.enemy, 250, 15, 250, world, world, 250, DEATH_SBBLOWUP, world);
  
      self.alpha = self.tur_head.alpha = self.gun1.alpha = self.gun2.alpha = -1;
      self.movetype   = MOVETYPE_NONE;

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

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

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

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

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

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

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

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

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

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

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

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

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