Merge branch 'origin/master' (early part) into fruitiex/jumppadmodel1

Conflicts:
	scripts/trak5x.shader

diff --cc scripts/exx.shader
index c234f62e1e3b1913b147d2c073aca87474d38f62,80254519922bda344d41b9af6e2ec0ae8d2060ba..db2ff9a92a5196774a70b69bfe8f8a0a9f0d00fb
--- 1/scripts/exx.shader
--- 2/scripts/exx.shader
+++ b/scripts/exx.shader
@@@ -736,10 -715,9 +780,10 @@@ textures/exx/light-panel0
        \r
        q3map_bounceScale  0.75\r
        dpoffsetmapping - 2\r
-       dpglossintensitymod  4\r
-       dpglossexponentmod  2\r
+       dpglossintensitymod  3\r
+       dpglossexponentmod  4\r
  \r
 +      q3map_surfacelight 1500\r
  \r
        {\r
                map textures/exx/light/light_panel01.tga\r
@@@ -759,10 -737,9 +803,10 @@@ textures/exx/light-u20
        \r
        q3map_bounceScale  0.75\r
        dpoffsetmapping - 2\r
-       dpglossintensitymod  4\r
-       dpglossexponentmod  2\r
+       dpglossintensitymod  3\r
+       dpglossexponentmod  4\r
  \r
 +      q3map_surfacelight 1500\r
  \r
        {\r
                map textures/exx/light/light_u201.tga\r

diff --cc scripts/trak5x.shader
index c06798b87e4fbb62397a17b45ecb0ffc0fdbe51e,500ae26428e942299cc1ddc829150db5b199a272..366e7f10a70739a5e9abaeeda1573ef6283819c9
--- 1/scripts/trak5x.shader
--- 2/scripts/trak5x.shader
+++ b/scripts/trak5x.shader
@@@ -843,10 -880,9 +883,10 @@@ textures/trak5x/light-light2
        \r
        q3map_bounceScale 1.25\r
  \r
 +      q3map_surfacelight 1500\r
  \r
        {\r
-               map textures/trak5x/light/light_light2d.tga\r
+               map textures/trak5x/light/light_light2c.tga\r
                \r
  \r
        }\r
@@@ -863,10 -899,9 +903,10 @@@ textures/trak5x/light-light2
        \r
        q3map_bounceScale 1.25\r
  \r
 +      q3map_surfacelight 1500\r
  \r
        {\r
-               map textures/trak5x/light/light_light2c.tga\r
+               map textures/trak5x/light/light_light2d.tga\r
                \r
  \r
        }\r