Merge remote branch 'origin/morphed/mapstuff'

diff --git a/.gitignore b/.gitignore
new file mode 100644 (file)
index 0000000..4190d18
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,2 @@
+maps/*.bsp
+maps/*/lm_*.tga

diff --git a/scripts/entities.def b/scripts/entities.def
index 58fdf7c9d3d81176b75213f95fd5684df4d97c19..826f4fa6e6868e364a73c89191aac3c4a6441af9 100644 (file)
--- a/scripts/entities.def
+++ b/scripts/entities.def
@@ -1756,7 +1756,7 @@ model="models/weapons/g_fireball.md3"
 
 /*QUAKED trigger_warpzone (1 .5 1) ?
 A warp zone, i.e. seamlessly connecting two parts of the map.
-One surface of this entity must have the common/warpzone shader - this will be the warp plane - the others should be common/trigger.
+One surface of this entity must have the common/warpzone shader (or a similar selfmade shader) - this will be the warp plane - the others must be common/trigger.
 Must target, or be targeted by, another trigger_warpzone with a congruent common/warpzone surface.
 Should target a target_position, or be targeted by a misc_warpzone_position.
 Should be thick enough to fit a player entity (i.e. 32 units), preferably even thicker.