Catharsis, prepared for merge by Mirio
[xonotic/xonotic-maps.pk3dir.git] / scripts / shaderlist.txt
2014-11-21 MarioCatharsis, prepared for merge by Mirio
2014-06-17 MirioMerge branch 'master' into mirio/map_updates
2014-06-17 Rudolf PolzerMerge remote-tracking branch 'origin/Mario/red-planet_nuke'
2014-06-15 MarioRemove red-planet
2013-08-14 Rudolf PolzerMerge remote-tracking branch 'origin/debugger/exomorphx...
2013-07-13 Rudolf PolzerMerge remote-tracking branch 'origin/matthiaskrgr/glassx'
2013-07-13 Rudolf PolzerMerge remote-tracking branch 'origin/matthiaskrgr/courtfun'
2013-07-13 Rudolf PolzerMerge remote-tracking branch 'origin/matthiaskrgr/explo...
2013-07-13 Rudolf PolzerMerge remote-tracking branch 'origin/matthiaskrgr/scrns...
2013-07-13 Rudolf PolzerMerge remote-tracking branch 'origin/matthiaskrgr/exx_f...
2013-07-10 Matthias Krügeradd shaderfile.
2013-07-08 Rudolf PolzerMerge commit '145caec5a836be05bfd091f175605bed237516e3'
2013-07-03 Matthias KrügerMerge branch 'master' into matthiaskrgr/surfaceparm_alp...
2013-06-23 Rudolf Polzerforce shaderlist.txt to be built, fixes #1702
2013-06-04 Samual LenksMerge remote-tracking branch 'origin/Mirio/afterslime'
2013-06-04 Samual LenksMerge remote-tracking branch 'origin/Mirio/campaign'
2013-06-04 Samual LenksMerge remote-tracking branch 'origin/Mirio/runningmanctf'
2013-06-03 Samual LenksMerge remote-tracking branch 'origin/Mirio/stormkeep'
2013-06-03 Samual LenksMerge remote-tracking branch 'origin/Mirio/runningman'
2013-06-03 Samual LenksMerge remote-tracking branch 'origin/Mirio/glowplant'
2013-06-03 Samual LenksMerge remote-tracking branch 'origin/Mirio/runningmanctf'
2013-06-03 Samual LenksMerge remote-tracking branch 'origin/Mirio/drain'
2013-06-03 Samual LenksMerge remote-tracking branch 'origin/Mirio/afterslime'
2013-06-03 Samual LenksMerge remote-tracking branch 'origin/master' into Mirio...
2013-06-02 Matthias KrügerMerge branch 'master' into matthiaskrgr/space-elevator_...
2013-06-02 Rudolf Polzertry fixing silentsiege by importing the gspawn1 model...
2013-05-07 kuniuthefroggMore bugs reported. And fixed.
2013-04-29 kuniuthefroggmore clipping, texture alignments, minor architecture...
2013-04-22 kuniuthefroggSilent Siege - duel/ffa map by Justin
2013-04-16 kuniuthefroggadd the shader file to shaderlist.txt
2012-08-28 Samual LenksMerge remote-tracking branch 'origin/master' into samua...
2012-04-05 Rudolf Polzeralso make a shaderlist maker
2012-03-06 Rudolf PolzerSquashed commit of the following:
2012-01-20 SamualMerge remote branch 'origin/master' into samual/running...
2011-12-30 cbrutailMerge branch 'master' into cbrutail/darkzone
2011-12-15 Rudolf Polzeroops, forgot this
2011-11-20 Rudolf Polzerphilipk1x and philipk2x texture sets
2011-10-03 cbrutailMerge branch 'master' into cbrutail/map-lightspeed
2011-09-13 Rudolf PolzerMerge branch 'master' of git://de.git.xonotic.org/xonot...
2011-09-04 Rudolf Polzerupdate shaderlist.txt xonotic-v0.5.0
2011-07-25 Rudolf PolzerMerge branch 'divVerent/courtfun2'
2011-07-24 Rudolf PolzerMerge remote branch 'origin/master' into divVerent...
2011-07-19 Rudolf PolzerMerge remote branch 'origin/morphed/teleporter'
2011-07-09 Rudolf PolzerMerge remote-tracking branch 'origin/master' into divVe...
2011-07-09 Rudolf PolzerMerge remote-tracking branch 'origin/master' into divVe...
2011-06-02 cbrutailMerge branch 'master' into cbrutail/map-lightspeed
2011-05-24 Rudolf PolzerMerge branch 'master' of git://git.xonotic.org/xonotic...
2011-05-23 merlijnMerge remote-tracking branch 'origin/diabolik/afterslime'
2011-05-22 Rudolf PolzerMerge remote-tracking branch 'origin/mirceakitsune...
2011-05-18 cbrutailMerge branch 'master' into cbrutail/map-lightspeed
2011-05-16 Sahil SinghalMerge remote branch 'origin/master' into diabolik/after...
2011-05-14 Rudolf PolzerMerge remote-tracking branch 'origin/savagex/common'
2011-04-29 Rudolf Polzerlet's pass shader-audit
2011-04-29 Rudolf PolzerSquashed commit of the following:
2011-04-08 mand1ngaMerge branch 'master' into diabolik/afterslime
2011-04-03 mand1ngaMerge remote branch 'origin/mirceakitsune/red_planet'
2011-03-19 Maik MertenMerge branch 'master' of ssh://git.xonotic.org/xonotic...
2011-02-17 ssinghalMerge remote branch 'origin/master' into diabolik/after...
2011-02-09 Rudolf PolzerMerge remote branches 'origin/cbrutail/effects-beams...
2011-02-08 Rudolf PolzerMerge remote branch 'origin/cbrutail/model_walker-static'
2011-02-05 tzorkMerge remote branch 'origin/savagex/techassault'
2011-02-05 tzorkMerge remote branch 'origin/diabolik/stein1x'
2011-02-04 ssinghalNew texture set by JulianaStein. Mostly concrete/cement...
2011-02-01 ssinghalMerge remote branch 'origin/master' into diabolik/after...
2011-02-01 tzorkMerge remote branch 'origin/diabolik/more-lavacolors'
2011-01-30 MirceaKitsuneMerge branch 'master' into mirceakitsune/red_planet
2011-01-30 ssinghalVersion 2. Hopefully fix jumppads.
2011-01-26 Rudolf PolzerMerge branch 'master' of git://git.xonotic.org/xonotic...
2011-01-26 Rudolf PolzerMerge remote branch 'origin/tzork/glowplant'
2011-01-25 tzorkMerge remote branch 'origin/diabolik/trak-textures'
2011-01-25 ssinghalShaders for trak7 and 6. tzork will merge soon.
2010-12-30 Rudolf PolzerMerge remote branch 'origin/fruitiex/runningmanctf...
2010-12-28 Maik MertenMerge branch 'master' of ssh://git.xonotic.org/xonotic...
2010-12-28 Rudolf PolzerMerge remote branch 'origin/savagex/stormkeepfixes'
2010-12-28 Maik Mertenfix some caulk gaps on rocks, introduce a shader for...
2010-11-28 Maik MertenThis station is now on red alert! Attack incoming!...
2010-11-20 Maik Mertenadd map_courtfun to shaderlist
2010-11-15 FruitieXMerge branch 'master' into savagex/techassault
2010-11-07 Maik MertenMerge branch 'master' of ssh://git.xonotic.org/xonotic...
2010-11-03 Rudolf PolzerMerge branch 'master' into cbrutail/decals-xonotic
2010-11-02 Rudolf PolzerMerge remote branch 'origin/fruitiex/nexballarena'
2010-11-02 Rudolf PolzerMerge remote branch 'origin/savagex/moarfixes'
2010-11-02 FruitieXMerge branch 'master' into fruitiex/runningmanctf
2010-11-01 Rudolf PolzerMerge remote branch 'origin/mirceakitsune/red_planet'
2010-11-01 Rudolf PolzerMerge branch 'master' of ssh://git.xonotic.org/xonotic...
2010-11-01 Rudolf Polzernew shaderlist
2010-11-01 cbrutailMerge branch 'master' of git://git.xonotic.org/xonotic...
2010-10-26 MirceaKitsunescreens in shaderlist.txt
2010-10-02 FruitieXMerge remote branch 'origin/master' into fruitiex/runni...
2010-09-29 Rudolf PolzerMerge remote branch 'origin/morphed/fruitiex-textures...
2010-09-29 Rudolf PolzerMerge branch 'master' into divVerent/fruitiex-textures
2010-09-29 Rudolf PolzerMerge remote branch 'origin/morphed/narmorx'
2010-09-28 Rudolf PolzerMerge commit 'c87167c'
2010-09-28 Rudolf PolzerMerge branch 'master' into divVerent/archived/fruitiex...
2010-09-28 Rudolf PolzerMerge branch 'master' into morphed/narmorx
2010-09-26 Jakob MGOrganice and add shader for the "narmorx" textureset
2010-09-25 Rudolf PolzerMerge branch 'master' into cbrutail/shaders_fx_xonotic2
2010-09-25 Rudolf PolzerMerge branch 'master' into fruitiex/runningmanctf
2010-08-31 Rudolf PolzerMerge remote branch 'refs/remotes/origin/mookow/shaderlist'
2010-08-24 MooKowUpdating the shaderlist... you are welcome
next