Merge branch 'master' into divVerent/archived/fruitiex/textures

diff --combined scripts/exx.shader
index 12ff98c00491a99b3f88ec4f9492f3cf01985cc8,035a9bd032c405bc44051f9fca27105600f00af3..5fe332aa16708a59f7da987d754e849ff6611842
--- 1/scripts/exx.shader
--- 2/scripts/exx.shader
+++ b/scripts/exx.shader
@@@ -4,8 -4,8 +4,8 @@@ textures/exx/base-crete0
        
        q3map_bounceScale  0.5
        dpoffsetmapping - 2
-       dpglossintensitymod  3
-       dpglossexponentmod  4
+       dpglossintensitymod  1
+       dpglossexponentmod  1
  
  
        {
@@@ -26,8 -26,8 +26,8 @@@ textures/exx/base-crete01blu
        
        q3map_bounceScale  0.5
        dpoffsetmapping - 2
-       dpglossintensitymod  3
-       dpglossexponentmod  4
+       dpglossintensitymod  1
+       dpglossexponentmod  1
  
  
        {
@@@ -48,8 -48,8 +48,8 @@@ textures/exx/base-crete01re
        
        q3map_bounceScale  0.5
        dpoffsetmapping - 2
-       dpglossintensitymod  3
-       dpglossexponentmod  4
+       dpglossintensitymod  1
+       dpglossexponentmod  1
  
  
        {
@@@ -70,8 -70,8 +70,8 @@@ textures/exx/base-crete0
        
        q3map_bounceScale  0.5
        dpoffsetmapping - 2
-       dpglossintensitymod  3
-       dpglossexponentmod  4
+       dpglossintensitymod  1
+       dpglossexponentmod  1
  
  
        {
@@@ -92,8 -92,8 +92,8 @@@ textures/exx/base-crete0
        
        q3map_bounceScale  0.5
        dpoffsetmapping - 2
-       dpglossintensitymod  3
-       dpglossexponentmod  4
+       dpglossintensitymod  1
+       dpglossexponentmod  1
  
  
        {
@@@ -322,8 -322,8 +322,8 @@@ textures/exx/floor-crete0
        
        q3map_bounceScale  0.5
        dpoffsetmapping - 2
-       dpglossintensitymod  3
-       dpglossexponentmod  4
+       dpglossintensitymod  1
+       dpglossexponentmod  1
  
  
        {
@@@ -344,8 -344,8 +344,8 @@@ textures/exx/floor-crete01-phoeni
        
        q3map_bounceScale  0.5
        dpoffsetmapping - 2
-       dpglossintensitymod  3
-       dpglossexponentmod  4
+       dpglossintensitymod  1
+       dpglossexponentmod  1
  
  
        {
@@@ -366,8 -366,8 +366,8 @@@ textures/exx/floor-crete01-phoenix
        
        q3map_bounceScale  0.5
        dpoffsetmapping - 2
-       dpglossintensitymod  3
-       dpglossexponentmod  4
+       dpglossintensitymod  1
+       dpglossexponentmod  1
  
  
        {
@@@ -388,8 -388,8 +388,8 @@@ textures/exx/floor-crete01
        
        q3map_bounceScale  0.5
        dpoffsetmapping - 2
-       dpglossintensitymod  3
-       dpglossexponentmod  4
+       dpglossintensitymod  1
+       dpglossexponentmod  1
  
  
        {
@@@ -709,75 -709,6 +709,75 @@@ textures/exx/floor-wrn0
        }
  }
  
 +textures/exx/floor-wrn01-blue
 +{
 +      qer_editorimage textures/exx/floor/floor_wrn01-blue.tga
 +      
 +      q3map_bounceScale  0.75
 +      dpoffsetmapping - 2
 +      dpglossintensitymod  3
 +      dpglossexponentmod  4
 +
 +
 +      {
 +              map textures/exx/floor/floor_wrn01-blue.tga
 +              
 +
 +      }
 +      {
 +              map $lightmap
 +              rgbGen identity
 +              tcGen lightmap
 +              blendfunc filter
 +      }
 +}
 +
 +textures/exx/floor-wrn01-red
 +{
 +      qer_editorimage textures/exx/floor/floor_wrn01-red.tga
 +      
 +      q3map_bounceScale  0.75
 +      dpoffsetmapping - 2
 +      dpglossintensitymod  3
 +      dpglossexponentmod  4
 +
 +
 +      {
 +              map textures/exx/floor/floor_wrn01-red.tga
 +              
 +
 +      }
 +      {
 +              map $lightmap
 +              rgbGen identity
 +              tcGen lightmap
 +              blendfunc filter
 +      }
 +}
 +
 +textures/exx/floor-wrn01-purple
 +{
 +      qer_editorimage textures/exx/floor/floor_wrn01-purple.tga
 +      
 +      q3map_bounceScale  0.75
 +      dpoffsetmapping - 2
 +      dpglossintensitymod  3
 +      dpglossexponentmod  4
 +
 +
 +      {
 +              map textures/exx/floor/floor_wrn01-purple.tga
 +              
 +
 +      }
 +      {
 +              map $lightmap
 +              rgbGen identity
 +              tcGen lightmap
 +              blendfunc filter
 +      }
 +}
 +
  textures/exx/light-panel01
  {
        qer_editorimage textures/exx/light/light_panel01.tga
@@@ -787,6 -718,28 +787,28 @@@
        dpglossintensitymod  3
        dpglossexponentmod  4
  
+       {
+               map textures/exx/light/light_panel01.tga
+               
+ 
+       }
+       {
+               map $lightmap
+               rgbGen identity
+               tcGen lightmap
+               blendfunc filter
+       }
+ }
+ textures/exx/light-panel01-surfacelight
+ {
+       qer_editorimage textures/exx/light/light_panel01.tga
+       
+       q3map_bounceScale  0.75
+       dpoffsetmapping - 2
+       dpglossintensitymod  3
+       dpglossexponentmod  4
+ 
+       q3map_surfacelight 2500
  
        {
                map textures/exx/light/light_panel01.tga
@@@ -809,6 -762,28 +831,28 @@@ textures/exx/light-u20
        dpglossintensitymod  3
        dpglossexponentmod  4
  
+       {
+               map textures/exx/light/light_u201.tga
+               
+ 
+       }
+       {
+               map $lightmap
+               rgbGen identity
+               tcGen lightmap
+               blendfunc filter
+       }
+ }
+ textures/exx/light-u201-surfacelight
+ {
+       qer_editorimage textures/exx/light/light_u201.tga
+       
+       q3map_bounceScale  0.75
+       dpoffsetmapping - 2
+       dpglossintensitymod  3
+       dpglossexponentmod  4
+ 
+       q3map_surfacelight 2500
  
        {
                map textures/exx/light/light_u201.tga
@@@ -822,35 -797,6 +866,35 @@@
                blendfunc filter
        }
  }
 +textures/exx/panel-grate01
 +{
 +      qer_editorimage textures/exx/panel/panel_grate01.tga
 +      
 +      surfaceparm metalsteps
 +      q3map_bounceScale  2
 +      dpoffsetmapping - 2
 +      dpglossintensitymod  3
 +      dpglossexponentmod  4
 +
 +      surfaceparm nomarks
 +      surfaceparm trans
 +      surfaceparm alphashadow
 +
 +      cull none
 +      nopicmip
 +      nomipmaps
 +      {
 +              map textures/exx/panel/panel_grate01.tga
 +              alphaFunc GT0
 +              rgbgen vertex
 +      }
 +      {
 +              map $lightmap
 +              rgbGen identity
 +              tcGen lightmap
 +              blendfunc filter
 +      }
 +}
  textures/exx/panel-metal01
  {
        qer_editorimage textures/exx/panel/panel_metal01.tga
@@@ -866,6 -812,29 +910,29 @@@
                map textures/exx/panel/panel_metal01.tga
                
  
+       }
+       {
+               map $lightmap
+               rgbGen identity
+               tcGen lightmap
+               blendfunc filter
+       }
+ }
+ textures/exx/panel-metal01b
+ {
+       qer_editorimage textures/exx/panel/panel_metal01b.tga
+       
+       surfaceparm metalsteps
+       q3map_bounceScale  2
+       dpoffsetmapping - 2
+       dpglossintensitymod  3
+       dpglossexponentmod  4
+ 
+ 
+       {
+               map textures/exx/panel/panel_metal01b.tga
+               
+ 
        }
        {
                map $lightmap
@@@ -1524,8 -1493,8 +1591,8 @@@ textures/exx/wall-crete0
        
        q3map_bounceScale  0.5
        dpoffsetmapping - 2
-       dpglossintensitymod  3
-       dpglossexponentmod  4
+       dpglossintensitymod  1
+       dpglossexponentmod  1
  
  
        {
@@@ -1546,8 -1515,8 +1613,8 @@@ textures/exx/wall-crete0
        
        q3map_bounceScale  0.5
        dpoffsetmapping - 2
-       dpglossintensitymod  3
-       dpglossexponentmod  4
+       dpglossintensitymod  1
+       dpglossexponentmod  1
  
  
        {
@@@ -1568,8 -1537,8 +1635,8 @@@ textures/exx/wall-crete0
        
        q3map_bounceScale  0.5
        dpoffsetmapping - 2
-       dpglossintensitymod  3
-       dpglossexponentmod  4
+       dpglossintensitymod  1
+       dpglossexponentmod  1
  
  
        {
@@@ -1590,8 -1559,8 +1657,8 @@@ textures/exx/wall-crete03
        
        q3map_bounceScale  0.5
        dpoffsetmapping - 2
-       dpglossintensitymod  3
-       dpglossexponentmod  4
+       dpglossintensitymod  1
+       dpglossexponentmod  1
  
  
        {

diff --combined scripts/trak5x.shader
index 5f87681159d7e4957496bcec1caec15d53bcb390,e12c9592dc042f100a4bf1eb11b39f21905aa221..32396f2f9ba470fe389cffb8afd4f55ec6c411c0
--- 1/scripts/trak5x.shader
--- 2/scripts/trak5x.shader
+++ b/scripts/trak5x.shader
@@@ -161,25 -161,6 +161,25 @@@ textures/trak5x/base-pipe1
                map textures/trak5x/base/base_pipe1d.tga
                
  
 +      }
 +      {
 +              map $lightmap
 +              rgbGen identity
 +              tcGen lightmap
 +              blendfunc filter
 +      }
 +}
 +textures/trak5x/base-pipe1e
 +{
 +      qer_editorimage textures/trak5x/base/base_pipe1e.tga
 +      
 +      q3map_bounceScale 1.25
 +
 +
 +      {
 +              map textures/trak5x/base/base_pipe1e.tga
 +              
 +
        }
        {
                map $lightmap
@@@ -802,6 -783,25 +802,25 @@@ textures/trak5x/light-light1
        
        q3map_bounceScale 1.25
  
+       {
+               map textures/trak5x/light/light_light1a.tga
+               
+ 
+       }
+       {
+               map $lightmap
+               rgbGen identity
+               tcGen lightmap
+               blendfunc filter
+       }
+ }
+ textures/trak5x/light-light1a-surfacelight
+ {
+       qer_editorimage textures/trak5x/light/light_light1a.tga
+       
+       q3map_bounceScale 1.25
+ 
+       q3map_surfacelight 2500
  
        {
                map textures/trak5x/light/light_light1a.tga
@@@ -821,7 -821,25 +840,25 @@@ textures/trak5x/light-light1
        
        q3map_bounceScale 1.25
  
-       q3map_surfacelight 1500
+       {
+               map textures/trak5x/light/light_light1b.tga
+               
+ 
+       }
+       {
+               map $lightmap
+               rgbGen identity
+               tcGen lightmap
+               blendfunc filter
+       }
+ }
+ textures/trak5x/light-light1b-surfacelight
+ {
+       qer_editorimage textures/trak5x/light/light_light1b.tga
+       
+       q3map_bounceScale 1.25
+ 
+       q3map_surfacelight 2500
  
        {
                map textures/trak5x/light/light_light1b.tga
@@@ -841,7 -859,25 +878,25 @@@ textures/trak5x/light-light1
        
        q3map_bounceScale 1.25
  
-       q3map_surfacelight 1500
+       {
+               map textures/trak5x/light/light_light1c.tga
+               
+ 
+       }
+       {
+               map $lightmap
+               rgbGen identity
+               tcGen lightmap
+               blendfunc filter
+       }
+ }
+ textures/trak5x/light-light1c-surfacelight
+ {
+       qer_editorimage textures/trak5x/light/light_light1c.tga
+       
+       q3map_bounceScale 1.25
+ 
+       q3map_surfacelight 2500
  
        {
                map textures/trak5x/light/light_light1c.tga
@@@ -861,6 -897,25 +916,25 @@@ textures/trak5x/light-light2
        
        q3map_bounceScale 1.25
  
+       {
+               map textures/trak5x/light/light_light2a.tga
+               
+ 
+       }
+       {
+               map $lightmap
+               rgbGen identity
+               tcGen lightmap
+               blendfunc filter
+       }
+ }
+ textures/trak5x/light-light2a-surfacelight
+ {
+       qer_editorimage textures/trak5x/light/light_light2a.tga
+       
+       q3map_bounceScale 1.25
+ 
+       q3map_surfacelight 2500
  
        {
                map textures/trak5x/light/light_light2a.tga
@@@ -880,6 -935,25 +954,25 @@@ textures/trak5x/light-light2
        
        q3map_bounceScale 1.25
  
+       {
+               map textures/trak5x/light/light_light2b.tga
+               
+ 
+       }
+       {
+               map $lightmap
+               rgbGen identity
+               tcGen lightmap
+               blendfunc filter
+       }
+ }
+ textures/trak5x/light-light2b-surfacelight
+ {
+       qer_editorimage textures/trak5x/light/light_light2b.tga
+       
+       q3map_bounceScale 1.25
+ 
+       q3map_surfacelight 2500
  
        {
                map textures/trak5x/light/light_light2b.tga
@@@ -899,6 -973,25 +992,25 @@@ textures/trak5x/light-light2
        
        q3map_bounceScale 1.25
  
+       {
+               map textures/trak5x/light/light_light2c.tga
+               
+ 
+       }
+       {
+               map $lightmap
+               rgbGen identity
+               tcGen lightmap
+               blendfunc filter
+       }
+ }
+ textures/trak5x/light-light2c-surfacelight
+ {
+       qer_editorimage textures/trak5x/light/light_light2c.tga
+       
+       q3map_bounceScale 1.25
+ 
+       q3map_surfacelight 2500
  
        {
                map textures/trak5x/light/light_light2c.tga
@@@ -918,6 -1011,25 +1030,25 @@@ textures/trak5x/light-light2
        
        q3map_bounceScale 1.25
  
+       {
+               map textures/trak5x/light/light_light2d.tga
+               
+ 
+       }
+       {
+               map $lightmap
+               rgbGen identity
+               tcGen lightmap
+               blendfunc filter
+       }
+ }
+ textures/trak5x/light-light2d-surfacelight
+ {
+       qer_editorimage textures/trak5x/light/light_light2d.tga
+       
+       q3map_bounceScale 1.25
+ 
+       q3map_surfacelight 2500
  
        {
                map textures/trak5x/light/light_light2d.tga
@@@ -937,6 -1049,25 +1068,25 @@@ textures/trak5x/light-light3
        
        q3map_bounceScale 1.25
  
+       {
+               map textures/trak5x/light/light_light3a.tga
+               
+ 
+       }
+       {
+               map $lightmap
+               rgbGen identity
+               tcGen lightmap
+               blendfunc filter
+       }
+ }
+ textures/trak5x/light-light3a-surfacelight
+ {
+       qer_editorimage textures/trak5x/light/light_light3a.tga
+       
+       q3map_bounceScale 1.25
+ 
+       q3map_surfacelight 2500
  
        {
                map textures/trak5x/light/light_light3a.tga