Merge branch 'master' into morphed/narmorx

diff --git a/scripts/entities.def b/scripts/entities.def
index ffc75b2bf2695e178ba6852f8c89fa515bafb5ca..f14953985629b7c137766871669567e4ca73e650 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)

diff --git a/scripts/exx.shader b/scripts/exx.shader
index 6f01c8674122508dfa58a7b75f651c66cd3c88b4..035a9bd032c405bc44051f9fca27105600f00af3 100644 (file)
--- a/scripts/exx.shader
+++ b/scripts/exx.shader
@@ -4,8 +4,8 @@ textures/exx/base-crete01
        
        q3map_bounceScale  0.5
        dpoffsetmapping - 2
-       dpglossintensitymod  3
-       dpglossexponentmod  4
+       dpglossintensitymod  1
+       dpglossexponentmod  1
 
 
        {
@@ -26,8 +26,8 @@ textures/exx/base-crete01blue
        
        q3map_bounceScale  0.5
        dpoffsetmapping - 2
-       dpglossintensitymod  3
-       dpglossexponentmod  4
+       dpglossintensitymod  1
+       dpglossexponentmod  1
 
 
        {
@@ -48,8 +48,8 @@ textures/exx/base-crete01red
        
        q3map_bounceScale  0.5
        dpoffsetmapping - 2
-       dpglossintensitymod  3
-       dpglossexponentmod  4
+       dpglossintensitymod  1
+       dpglossexponentmod  1
 
 
        {
@@ -70,8 +70,8 @@ textures/exx/base-crete02
        
        q3map_bounceScale  0.5
        dpoffsetmapping - 2
-       dpglossintensitymod  3
-       dpglossexponentmod  4
+       dpglossintensitymod  1
+       dpglossexponentmod  1
 
 
        {
@@ -92,8 +92,8 @@ textures/exx/base-crete03
        
        q3map_bounceScale  0.5
        dpoffsetmapping - 2
-       dpglossintensitymod  3
-       dpglossexponentmod  4
+       dpglossintensitymod  1
+       dpglossexponentmod  1
 
 
        {
@@ -322,8 +322,8 @@ textures/exx/floor-crete01
        
        q3map_bounceScale  0.5
        dpoffsetmapping - 2
-       dpglossintensitymod  3
-       dpglossexponentmod  4
+       dpglossintensitymod  1
+       dpglossexponentmod  1
 
 
        {
@@ -344,8 +344,8 @@ textures/exx/floor-crete01-phoenix
        
        q3map_bounceScale  0.5
        dpoffsetmapping - 2
-       dpglossintensitymod  3
-       dpglossexponentmod  4
+       dpglossintensitymod  1
+       dpglossexponentmod  1
 
 
        {
@@ -366,8 +366,8 @@ textures/exx/floor-crete01-phoenixb
        
        q3map_bounceScale  0.5
        dpoffsetmapping - 2
-       dpglossintensitymod  3
-       dpglossexponentmod  4
+       dpglossintensitymod  1
+       dpglossexponentmod  1
 
 
        {
@@ -388,8 +388,8 @@ textures/exx/floor-crete01b
        
        q3map_bounceScale  0.5
        dpoffsetmapping - 2
-       dpglossintensitymod  3
-       dpglossexponentmod  4
+       dpglossintensitymod  1
+       dpglossexponentmod  1
 
 
        {
@@ -1493,8 +1493,8 @@ textures/exx/wall-crete01
        
        q3map_bounceScale  0.5
        dpoffsetmapping - 2
-       dpglossintensitymod  3
-       dpglossexponentmod  4
+       dpglossintensitymod  1
+       dpglossexponentmod  1
 
 
        {
@@ -1515,8 +1515,8 @@ textures/exx/wall-crete02
        
        q3map_bounceScale  0.5
        dpoffsetmapping - 2
-       dpglossintensitymod  3
-       dpglossexponentmod  4
+       dpglossintensitymod  1
+       dpglossexponentmod  1
 
 
        {
@@ -1537,8 +1537,8 @@ textures/exx/wall-crete03
        
        q3map_bounceScale  0.5
        dpoffsetmapping - 2
-       dpglossintensitymod  3
-       dpglossexponentmod  4
+       dpglossintensitymod  1
+       dpglossexponentmod  1
 
 
        {
@@ -1559,8 +1559,8 @@ textures/exx/wall-crete03b
        
        q3map_bounceScale  0.5
        dpoffsetmapping - 2
-       dpglossintensitymod  3
-       dpglossexponentmod  4
+       dpglossintensitymod  1
+       dpglossexponentmod  1
 
 
        {