Merge branch 'master' into fruitiex/runningmanctf

[xonotic/xonotic-maps.pk3dir.git] / scripts / entities.def

diff --git a/scripts/entities.def b/scripts/entities.def
index ffc75b2bf2695e178ba6852f8c89fa515bafb5ca..5ecb09e658f003a23804fa761646f453dfe10e99 100644 (file)
--- a/scripts/entities.def
+++ b/scripts/entities.def
@@ -1780,6 +1780,8 @@ target3: is triggered when a player LEAVES the warpzone (from the other warp zon
 target4: is triggered in both cases
 targetname: must be pointed to by another trigger_warpzone. Should be pointed to by a misc_warpzone_position entity, or...
 killtarget: should point to a target_position entity, or
+warpzone_fadestart: start distance of fading out the warpzone
+warpzone_fadeend: end distance of fading out the warpzone (if viewer is further, warpzone is not rendered at all)
 */
 
 /*QUAKED trigger_warpzone_reconnect (1 .5 1) (-8 -8 -8) (8 8 8)
@@ -1803,6 +1805,8 @@ One surface of this entity must have the common/camera shader, the others should
 Must target a target_position that indicates the view to be shown (and whose angles also indicate the orientation of the view)
 -------- KEYS --------
 target: must point to a target_position
+warpzone_fadestart: start distance of fading out the warpzone
+warpzone_fadeend: end distance of fading out the warpzone (if viewer is further, warpzone is not rendered at all)
 */
 
 /*QUAKED target_music (1 0 0) (-8 -8 -8) (8 8 8)
@@ -1844,3 +1848,57 @@ targetname: you can use this to target the grazity zone with a trigger, which wi
 STICKY: entities keep their gravity after leaving the gravity zone
 START_OFF: when targeted, the gravity zone starts off and is enabled upon triggering
 */
+
+/*QUAKED relay_activate (0 1 0) (-8 -8 -8) (8 8 8) 
+Activates all .target's
+List of currently supported target ents:
+trigger_hurt
+trigger_heal
+trigger_impulse
+trigger_push
+trigger_teleport
+func_rotating
+func_bobbing
+func_button
+func_fourier
+func_vectormamamam
+-------- KEYS --------
+target: trigger all entities with this targetname when triggered
+targetname: name that identifies this entity so it can be triggered
+*/
+
+/*QUAKED relay_deactivate (1 0 0) (-8 -8 -8) (8 8 8) 
+Deactivates all .target's
+List of currently supported target ents:
+trigger_hurt
+trigger_heal
+trigger_impulse
+trigger_push
+trigger_teleport
+func_rotating
+func_bobbing
+func_button
+func_fourier
+func_vectormamamam
+-------- KEYS --------
+target: trigger all entities with this targetname when triggered
+targetname: name that identifies this entity so it can be triggered
+*/
+
+/*QUAKED relay_activatetoggle (0 1 1) (-8 -8 -8) (8 8 8) 
+Toggles all .target's de/active
+List of currently supported target ents:
+trigger_hurt
+trigger_heal
+trigger_impulse
+trigger_push
+trigger_teleport
+func_rotating
+func_bobbing
+func_button
+func_fourier
+func_vectormamamam
+-------- KEYS --------
+target: trigger all entities with this targetname when triggered
+targetname: name that identifies this entity so it can be triggered
+*/