From: Martin Taibr <taibr.martin@gmail.com>
Date: Wed, 30 Aug 2017 17:11:18 +0000 (+0200)
Subject: Merge branch 'master' into matthiaskrgr/nadecountdown_nopicmip
X-Git-Tag: xonotic-v0.8.5~2454^2
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=5149aaa004721dba4947df89026a1c4b59506122;p=xonotic%2Fxonotic-data.pk3dir.git

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

5149aaa004721dba4947df89026a1c4b59506122
diff --cc scripts/ok_nade_counter.shader
index 4c7547197,a538eafbb..bfd9808fb
--- a/scripts/ok_nade_counter.shader
+++ b/scripts/ok_nade_counter.shader
@@@ -2,8 -2,6 +2,7 @@@ models/ok_nade_counter/ok_nade_counter_
  {
  	dpnoshadow
  	deformVertexes autosprite
- 	dppolygonoffset -6000
 +	nopicmip
  	{
  		map "models/ok_nade_counter/ok_nade_counter_01"
  		blendfunc add
@@@ -13,8 -11,6 +12,7 @@@ models/ok_nade_counter/ok_nade_counter_
  {
  	dpnoshadow
  	deformVertexes autosprite
- 	dppolygonoffset -6000
 +	nopicmip
  	{
  		map "models/ok_nade_counter/ok_nade_counter_02"
  		blendfunc add
@@@ -24,8 -20,6 +22,7 @@@ models/ok_nade_counter/ok_nade_counter_
  {
  	dpnoshadow
  	deformVertexes autosprite
- 	dppolygonoffset -6000
 +	nopicmip
  	{
  		map "models/ok_nade_counter/ok_nade_counter_03"
  		blendfunc add
@@@ -35,8 -29,6 +32,7 @@@ models/ok_nade_counter/ok_nade_counter_
  {
  	dpnoshadow
  	deformVertexes autosprite
- 	dppolygonoffset -6000
 +	nopicmip
  	{
  		map "models/ok_nade_counter/ok_nade_counter_04"
  		blendfunc add
@@@ -46,8 -38,6 +42,7 @@@ models/ok_nade_counter/ok_nade_counter_
  {
  	dpnoshadow
  	deformVertexes autosprite
- 	dppolygonoffset -6000
 +	nopicmip
  	{
  		map "models/ok_nade_counter/ok_nade_counter_05"
  		blendfunc add
@@@ -57,8 -47,6 +52,7 @@@ models/ok_nade_counter/ok_nade_counter_
  {
  	dpnoshadow
  	deformVertexes autosprite
- 	dppolygonoffset -6000
 +	nopicmip
  	{
  		map "models/ok_nade_counter/ok_nade_counter_06"
  		blendfunc add
@@@ -68,8 -56,6 +62,7 @@@ models/ok_nade_counter/ok_nade_counter_
  {
  	dpnoshadow
  	deformVertexes autosprite
- 	dppolygonoffset -6000
 +	nopicmip
  	{
  		map "models/ok_nade_counter/ok_nade_counter_07"
  		blendfunc add
@@@ -79,8 -65,6 +72,7 @@@ models/ok_nade_counter/ok_nade_counter_
  {
  	dpnoshadow
  	deformVertexes autosprite
- 	dppolygonoffset -6000
 +	nopicmip
  	{
  		map "models/ok_nade_counter/ok_nade_counter_08"
  		blendfunc add
@@@ -90,8 -74,6 +82,7 @@@ models/ok_nade_counter/ok_nade_counter_
  {
  	dpnoshadow
  	deformVertexes autosprite
- 	dppolygonoffset -6000
 +	nopicmip
  	{
  		map "models/ok_nade_counter/ok_nade_counter_09"
  		blendfunc add