Merge branch 'master' into fruitiex/runningmanctf

diff --combined scripts/exx.shader
index 12ff98c00491a99b3f88ec4f9492f3cf01985cc8,6f01c8674122508dfa58a7b75f651c66cd3c88b4..76b014ce0abfb8e18d8eb09c83608d40bddb7d0c
--- 1/scripts/exx.shader
--- 2/scripts/exx.shader
+++ b/scripts/exx.shader
@@@ -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