Merge branch 'marin-t/nadectr' into 'master'
authorMario <zacjardine@y7mail.com>
Fri, 25 Aug 2017 10:28:37 +0000 (10:28 +0000)
committerMario <zacjardine@y7mail.com>
Fri, 25 Aug 2017 10:28:37 +0000 (10:28 +0000)
commit83e2013a3aa40f8e5cfeac82e83c9abdd7a038b8
tree8fddfa9fa412dd89ff2032809dfc5ac5c05f40f9
parentcf2f9ff50ee8aa47bdb9773e97adc3b7c68a15fb
parent3fb2ceecb2cd89c51d58152121f6bb20cfa950e6
Merge branch 'marin-t/nadectr' into 'master'

Remove `dppolygonoffset -6000` from nade countdown shader

See merge request !466