From: Matthias Krüger <matthias.krueger@famsik.de>
Date: Sat, 20 Feb 2016 15:48:17 +0000 (+0100)
Subject: Merge branch 'master' into matthiaskrgr/unsealed
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=8df991e2cf4d27642296fe53fe0da54eff39aaf2;p=xonotic%2Fxonotic-maps.pk3dir.git

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

8df991e2cf4d27642296fe53fe0da54eff39aaf2
diff --cc scripts/model_crystals.shader
index 00000000,14015805..5858752d
mode 000000,100644..100644
--- a/scripts/model_crystals.shader
+++ b/scripts/model_crystals.shader
@@@ -1,0 -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 a660936a,4d4aaf2b..65d306db
--- a/scripts/shaderlist.txt
+++ b/scripts/shaderlist.txt
@@@ -1,7 -1,5 +1,6 @@@
  alphamod
 +crystals
  common
- crystals
  decals
  effects_beam
  effects_forcefield