Merge remote branch 'origin/mirceakitsune/gravity_trigger'

Conflicts:
	scripts/entities.def

diff --cc scripts/entities.def
index 8a89f28f1e408ede8d21e474ae702a2c521054e1,036d4fa40565baf0a2437857919273d237b8b898..b3540f9988259d24ddaf39224587c2e675da8419
--- 1/scripts/entities.def
--- 2/scripts/entities.def
+++ b/scripts/entities.def
@@@ -1775,31 -1775,14 +1775,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
++*/