From: Matthias Krüger <matthias.krueger@famsik.de>
Date: Wed, 26 Aug 2015 21:30:46 +0000 (+0200)
Subject: Merge branch 'master' into matthiaskrgr/unsealedtrial3
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=f4fd5c4ef0f2e573b0de336143919eba30304b4a;p=xonotic%2Fxonotic-maps.pk3dir.git

Merge branch 'master' into matthiaskrgr/unsealedtrial3
---

f4fd5c4ef0f2e573b0de336143919eba30304b4a
diff --cc scripts/crystals.shader
index 84af0d65,14015805..5858752d
mode 100644,100755..100644
--- a/scripts/crystals.shader
+++ b/scripts/crystals.shader
@@@ -1,18 -1,13 +1,26 @@@
  models/crystals/crystal1
  {
++<<<<<<< HEAD
 +	dpmeshcollisions
  	dpglossintensitymod 5
  	dpglossexponentmod 2
 +	surfaceparm alphashadow
 +
++=======
++	dpglossintensitymod 5
++	dpglossexponentmod 2
++>>>>>>> master
  	dpreflectcube cubemaps/default/sky
  	{
  		map "models/crystals/crystal1"
  	}
  	{
  		map $lightmap
++<<<<<<< HEAD
 +		blendfunc GL_DST_COLOR GL_ZERO
 +		rgbGen identity
++=======
++>>>>>>> master
  	}
  }
  
diff --cc scripts/shaderlist.txt
index e87b80c7,4a3eff5e..237d15fb
--- a/scripts/shaderlist.txt
+++ b/scripts/shaderlist.txt
@@@ -1,6 -1,6 +1,7 @@@
  alphamod
 +crystals
  common
+ crystals
  decals
  effects_beam
  effects_forcefield