Merge branch 'master' into justin/erbium
[xonotic/xonotic-maps.pk3dir.git] / scripts / shaderlist.txt
2017-03-06 MirioMerge branch 'master' into justin/erbium
2017-03-03 MirioMerge branch 'Mirio/dance' into 'master'
2017-03-03 t0uYK8NeMerge branch 'master' into t0uYK8Ne/afterslime 64/head
2017-03-03 MirioMerge conflict
2017-03-03 MirioMerge branch 'kuniuthefrogg/boil' into 'master'
2017-03-03 MirioMerge branch 'master' into kuniuthefrogg/boil
2017-02-28 MirioMerge branch 'master' into kuniuthefrogg/boil
2017-01-31 MirioMerge branch 'master' into Justin/erbium
2017-01-17 MirioMerge branch 'master' into kuniuthefrogg/boil
2017-01-16 MirioMerge branch 'master' into kuniuthefrogg/boil
2017-01-16 MirioMerge branch 'master' into kuniuthefrogg/boil
2016-12-25 MirioMerge branch 'master' into Justin/erbium
2016-11-23 MirioMerge branch 'master' into kuniuthefrogg/boil
2016-11-22 MirioAdd textures + shader
2016-10-26 MirioMerge branch 'master' into justin/erbium
2016-10-26 MirioMerge branch 'master' into justin/erbium
2016-10-25 MirioMerge branch 'master' into justin/erbium
2016-10-15 MirioMerge branch 'master' into Justin/erbium
2016-03-09 MirioMerge branch 'master' into justin/erbium
2016-01-20 MirioMerge branch 'master' into Justin/erbium
2016-01-20 MirioMerge branch 'master' into Mirio/darkzone
2016-01-15 MirioMerge branch 'master' into mirio/fuse
2016-01-14 Rudolf PolzerUpdate shaderlist.
2015-10-28 MirioMerge branch 'Mirio/darkzone' of git://de.git.xonotic...
2015-10-27 MirioMerge branch 'master' into Justin/erbium
2015-10-27 Miriomap picture
2015-09-07 MirioMerge branch 'matthiaskrgr/atelier' into 'master'
2015-09-06 MirioMerge branch 'matthiaskrgr/afterslime_2' into 'master'
2015-09-06 MirioUpdate shaderlist
2015-09-06 MirioMerge branch 'master' into Mirio/catharsis
2015-09-05 MirioAdd map_warfare to shaderlist
2015-08-31 MirioMerge branch 'master' into justin/erbium
2015-08-27 MirioFix shader list
2015-08-25 MirioLets try again
2015-07-11 MarioRemove another trace of lightspeed
2015-03-06 Matthias KrügerMerge branch 'master' into matthiaskrgr/hudsetup
2015-02-08 Matthias KrügerMerge branch 'master' into matthiaskrgr/dance
2015-01-24 MarioMerge remote-tracking branch 'origin/master' into debug...
2015-01-24 MarioMerge remote-tracking branch 'origin/master' into maddi...
2015-01-23 MirioMerge branch 'master' into mirio/glowplant
2014-12-20 MarioMerge branch 'Mario/cubemaps_revert_new'
2014-12-20 MarioThe beginning of the end
2014-12-13 MarioMerge branch 'mirceakitsune/world_cubemaps'
2014-12-13 MarioMerge branch 'master' into mirceakitsune/world_cubemaps
2014-12-02 MarioMerge branch 'master' into itsme/vorix
2014-12-02 MarioMerge branch 'Mirio/implosion'
2014-12-02 MarioMerge branch 'master' into Mirio/implosion
2014-12-02 MarioMerge branch 'Mario/catharsis'
2014-12-02 MarioMerge branch 'master' into Mario/catharsis
2014-11-29 MarioMerge branch 'master' into itsme/vorix
2014-11-27 MarioMerge branch 'master' into mirceakitsune/world_cubemaps
2014-11-27 MirioMerge branch 'Mirio/implosion' of git://de.git.xonotic...
2014-11-26 MarioAdd implosion to shader list and add implosion rtlights
2014-11-21 MarioCatharsis, prepared for merge by Mirio
2014-11-16 MarioMerge branch 'master' into Mario/monsters 2/head
2014-06-19 MirioMerge branch 'master' into mirio/glowplant
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-09-01 MarioMerge branch 'master' into Mario/monsters
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-20 ItsMeMerge branch 'xonotic-maps.pk3dir/itsme/vorix' of git...
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-08-25 MirceaKitsuneMerge branch 'master' into mirceakitsune/world_cubemaps
2012-04-05 Rudolf PolzerMerge branch 'master' into mirceakitsune/world_cubemaps
2012-04-05 MirceaKitsuneMerge branch 'master' into mirceakitsune/world_cubemaps
2012-04-05 Rudolf Polzeralso make a shaderlist maker
2012-04-05 MirceaKitsuneAdd the reflections_off shader to shaderlist.txt (for...
2012-04-04 MirceaKitsuneMerge branch 'master' into mirceakitsune/world_cubemaps
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
next