Merge branch 'master' into cbrutail/map-lightspeed

diff --git a/models/leaves6.tga b/models/leaves6.tga
index dba586d56b5fceec01d2b0f0c991b2c1e428dc2a..9d231f7029a70bf69fb1719a440c7c0d44a03fc5 100644 (file)
Binary files a/models/leaves6.tga and b/models/leaves6.tga differ

diff --git a/models/leaves7.tga b/models/leaves7.tga
index 6a620268d6e2ac3a85e59a18becbc7eebd613c9a..f4756a8738c1d2d1100b79c031a2bc934f96fdc9 100644 (file)
Binary files a/models/leaves7.tga and b/models/leaves7.tga differ

diff --git a/models/trak/tablet.ase_6.skin~ b/models/trak/tablet.ase_6.skin~
deleted file mode 100644 (file)
index e0371b2..0000000
--- a/models/trak/tablet.ase_6.skin~
+++ /dev/null
@@ -1 +0,0 @@
-Plane01,models/trak/tablet.tga
\ No newline at end of file

diff --git a/scripts/entities.def b/scripts/entities.def
index 5b726796e060b6e3bfa160a8f9b98137d01a725a..d940df0a291ba3d8cc8d24d7a6f6eb4737c0d789 100644 (file)
--- a/scripts/entities.def
+++ b/scripts/entities.def
@@ -1923,7 +1923,7 @@ FLOATING: the item will float in air, instead of aligning to the floor by fallin
 modeldisabled="models/weapons/g_fireball.md3"
 */
 
-/*QUAKED trigger_warpzone (1 .5 1) ?
+/*QUAKED trigger_warpzone (1 .5 1) ? WATCHMOVE
 A warp zone, i.e. seamlessly connecting two parts of the map.
 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.
@@ -1939,6 +1939,8 @@ targetname: must be pointed to by another trigger_warpzone. Should be pointed to
 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)
+-------- SPAWNFLAGS --------
+WATCHMOVE: allow this entity to be moved by others, e.g. misc_follow in MOVETYPE_FOLLOW mode
 */
 
 /*QUAKED trigger_warpzone_reconnect (1 .5 1) (-8 -8 -8) (8 8 8) IGNORE_VISIBLE
@@ -1958,7 +1960,7 @@ angles: must point perpendicular to the common/warpzone surface of the trigger_w
 origin: must be on the common/warpzone surface of the trigger_warpzone
 */
 
-/*QUAKED func_camera (1 .5 1) ?
+/*QUAKED func_camera (1 .5 1) ? WATCHMOVE
 A camera, i.e. a surface that shows a view from another part of the map.
 One surface of this entity must have the common/camera shader, the others should be common/caulk.
 Must target a target_position that indicates the view to be shown (and whose angles also indicate the orientation of the view)
@@ -1966,6 +1968,8 @@ Must target a target_position that indicates the view to be shown (and whose ang
 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)
+-------- SPAWNFLAGS --------
+WATCHMOVE: allow this entity to be moved by others, e.g. misc_follow in MOVETYPE_FOLLOW mode
 */
 
 /*QUAKED target_music (1 0 0) (-8 -8 -8) (8 8 8) START_OFF

diff --git a/scripts/model_tree.shader b/scripts/model_tree.shader
index 261881a24063fac6d0290d1228c489ffd270b698..05f9e97764b0199368ce063c43a4fef06e7c7eaa 100644 (file)
--- a/scripts/model_tree.shader
+++ b/scripts/model_tree.shader
@@ -29,7 +29,7 @@ cull none
        deformVertexes wave 128 sin 0 1 0 0.4 
        {
                map models/leaves6.tga
-               alphaFunc GT0
+               blendFunc blend
                rgbGen vertex
        }
 }
@@ -46,7 +46,7 @@ cull none
        deformVertexes wave 128 sin 0 1 0 0.5
        {
                map models/leaves7.tga
-               alphaFunc GT0
+               blendFunc blend
                rgbGen vertex
        }
 }