Merge commit 'origin/master' into divVerent/tag_seeker

diff --combined scripts/entities.def
index a22e570f908fcd8832f2f48d77f2fc68cf10549b,b3540f9988259d24ddaf39224587c2e675da8419..58fdf7c9d3d81176b75213f95fd5684df4d97c19
--- 1/scripts/entities.def
--- 2/scripts/entities.def
+++ b/scripts/entities.def
@@@ -1431,7 -1431,7 +1431,7 @@@ Example is a Mario-style question mark 
  -------- KEYS --------
  targetname: used to trigger this
  message: entity field list
- target: when set, target_spawn edits entities, instead of creating new ones
+ target: when set, target_spawn edits entities, instead of creating new ones; the special value *activator causes the activator to be edited
  count: make sure no more than count entities have been created by this (refuse to spawn new ones if exceeded)
  killtarget: reference entity (can be used as $killtarget)
  target2: reference entity (can be used as $target2)
@@@ -1501,20 -1501,6 +1501,20 @@@ FLOATING: the item will float in air, i
  model="models/weapons/g_hlac.md3"
  */
  
 +/*QUAKED weapon_seeker (1 0 .5) (-30 -30 0) (30 30 32) FLOATING
 +Placing this entity on a map kills your dog, voids the warranty on your car, and makes your map an unenjoyable noobs' paradise.
 +the T.A.G. Seeker.
 +-------- KEYS --------
 +ammo_rockets: initial rockets of the weapon (if unset, g_pickup_rockets is used)
 +respawntime: time till it respawns (default: 30)
 +team: out of items with the same value here, only one (random one) will spawn. Useful to put multiple items on one spot.
 +cnt: weight of this item for random selection using "team". Set to a lower value for items you want to see less likely.
 +-------- SPAWNFLAGS --------
 +FLOATING: the item will float in air, instead of aligning to the floor by falling
 +-------- MODEL FOR RADIANT ONLY - DO NOT SET THIS AS A KEY --------
 +model="models/weapons/g_seeker.md3"
 +*/
 +
  /*QUAKED weapon_hook (1 0 .5) (-30 -30 0) (30 30 32) FLOATING
  the on-hand Grappling Hook.
  -------- KEYS --------
@@@ -1789,3 -1775,42 +1789,42 @@@ Must target a target_position that indi
  target: must point to a target_position
  */
  
+ /*QUAKED target_music (1 0 0) (-8 -8 -8) (8 8 8)
+ Background music target (when this is used, the cdtrack line in mapinfo must not be used, and there MUST be a default target_music).
+ When triggered, the background music is switched to the given track.
+ When targetname is not set, this is the default track of the map.
+ -------- KEYS --------
+ targetname: The name other entities can use to target this entity (when not set, this one is the default)
+ noise: the music to play (as full sound file name)
+ volume: the volume (default: 1)
+ fade_time: fade-in time
+ fade_rate: fade-out time
+ lifetime: when set, the music created by this target is switched back to the default one when this time expires
+ -------- SPAWNFLAGS --------
+ START_OFF: the trigger is off initially
+ */
+ 
+ /*QUAKED trigger_music (1 0 0) ?
+ Background music trigger (when this is used, the cdtrack line in mapinfo must not be used, and there MUST be a default target_music).
+ When triggered, its effect is turned off until triggered again.
+ -------- KEYS --------
+ targetname: The name other entities can use to target this entity
+ noise: the music to play (as full sound file name)
+ volume: the volume (default: 1)
+ fade_time: fade-in time
+ fade_rate: fade-out time
+ -------- SPAWNFLAGS --------
+ START_OFF: the trigger is off initially
+ */
+ 
+ /*QUAKED trigger_gravity (.5 .5 1) ? STICKY START_OFF
+ An area where gravity differs from the rest of the map.
+ This acts as a modifier over the normal gravity (sv_gravity). eg: 0.5 is half the normal gravity, 2 is twice the normal gravity.
+ -------- KEYS --------
+ gravity: gravity offset in this area, defaults to 0 if not set
+ noise: sound to play when an entity enters the gravity zone, leave empty to disable
+ targetname: you can use this to target the grazity zone with a trigger, which will toggle it when activated
+ -------- SPAWNFLAGS --------
+ STICKY: entities keep their gravity after leaving the gravity zone
+ START_OFF: when targeted, the gravity zone starts off and is enabled upon triggering
+ */