Merge branch 'master' into Mirio/implosion
authorMario <zacjardine@y7mail.com>
Tue, 2 Dec 2014 02:31:42 +0000 (13:31 +1100)
committerMario <zacjardine@y7mail.com>
Tue, 2 Dec 2014 02:31:42 +0000 (13:31 +1100)
1  2 
scripts/shaderlist.txt

diff --combined scripts/shaderlist.txt
@@@ -1,5 -1,6 +1,6 @@@
  alphamod
  common
+ crystals
  decals
  effects_beam
  effects_forcefield
@@@ -18,11 -19,11 +19,12 @@@ liquids_lav
  liquids_slime
  liquids_water
  logos
+ map_catharsis
  map_courtfun
  map_darkzone
  map_g-23
  map_glowplant
 +map_implosion
  map_leave_em_behind
  map_lightspeed
  map_newtonian-nightmare