From: Rudolf Polzer <divverent@alientrap.org>
Date: Wed, 21 Jul 2010 10:02:58 +0000 (+0200)
Subject: Merge branch 'origin/master' (early part) into fruitiex/jumppadmodel1
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=eeac4631e2c5867eef9d1987dc647bc622457d6d;p=xonotic%2Fxonotic-maps.pk3dir.git

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

Conflicts:
	scripts/trak5x.shader
---

eeac4631e2c5867eef9d1987dc647bc622457d6d
diff --cc scripts/exx.shader
index c234f62e,80254519..db2ff9a9
--- a/scripts/exx.shader
+++ b/scripts/exx.shader
@@@ -736,10 -715,9 +780,10 @@@ textures/exx/light-panel0
  	
  	q3map_bounceScale  0.75
  	dpoffsetmapping - 2
- 	dpglossintensitymod  4
- 	dpglossexponentmod  2
+ 	dpglossintensitymod  3
+ 	dpglossexponentmod  4
  
 +	q3map_surfacelight 1500
  
  	{
  		map textures/exx/light/light_panel01.tga
@@@ -759,10 -737,9 +803,10 @@@ textures/exx/light-u20
  	
  	q3map_bounceScale  0.75
  	dpoffsetmapping - 2
- 	dpglossintensitymod  4
- 	dpglossexponentmod  2
+ 	dpglossintensitymod  3
+ 	dpglossexponentmod  4
  
 +	q3map_surfacelight 1500
  
  	{
  		map textures/exx/light/light_u201.tga
diff --cc scripts/trak5x.shader
index c06798b8,500ae264..366e7f10
--- a/scripts/trak5x.shader
+++ b/scripts/trak5x.shader
@@@ -843,10 -880,9 +883,10 @@@ textures/trak5x/light-light2
  	
  	q3map_bounceScale 1.25
  
 +	q3map_surfacelight 1500
  
  	{
- 		map textures/trak5x/light/light_light2d.tga
+ 		map textures/trak5x/light/light_light2c.tga
  		
  
  	}
@@@ -863,10 -899,9 +903,10 @@@ textures/trak5x/light-light2
  	
  	q3map_bounceScale 1.25
  
 +	q3map_surfacelight 1500
  
  	{
- 		map textures/trak5x/light/light_light2c.tga
+ 		map textures/trak5x/light/light_light2d.tga
  		
  
  	}