Merge branch 'master' into Mirio/implosion
[xonotic/xonotic-maps.pk3dir.git] / textures /
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-27 MirioMerge branch 'master' into mirio/implosion
2014-11-21 MarioCatharsis, prepared for merge by Mirio
2014-11-18 MirioMerge branch 'master' into mirio/implosion
2014-11-16 MarioMerge branch 'master' into Mario/monsters 2/head
2014-07-31 MirioPush Implosion
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 PolzerRevert "moving 2 textures to 'base'"
2013-08-14 Rudolf PolzerRevert "renaming a few textures" as that breaks existin...
2013-08-14 Rudolf PolzerMerge remote-tracking branch 'origin/debugger/exomorphx...
2013-08-12 Debuggermoving 2 textures to 'base'
2013-08-11 Debuggerrenaming a few textures
2013-07-13 Rudolf Polzerfix glassx shader
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/surfa...
2013-07-13 Rudolf PolzerMerge remote-tracking branch 'origin/matthiaskrgr/scrns...
2013-07-13 Rudolf PolzerMerge remote-tracking branch 'origin/matthiaskrgr/respa...
2013-07-13 Rudolf PolzerMerge remote-tracking branch 'origin/matthiaskrgr/exx_f...
2013-07-13 Matthias Krügerrespawnrings: ensure backwards compatibility for maps...
2013-07-10 Matthias Krügeradd hexglass texture by Morphed.
2013-07-10 Matthias Krügernew high-res respawnring textures
2013-07-08 Rudolf PolzerMerge commit '145caec5a836be05bfd091f175605bed237516e3'
2013-06-20 Matthias Krügertextures: exx/floor_wrn01-red: properly recolor from...
2013-06-08 Matthias Krügermap: solarium: remove textures/map_solarium/waterfall...
2013-06-08 Matthias Krügermap: lightspeed: remove textures/map_lightspeed/light...
2013-06-08 Matthias Krügermaps: glowplant: remove textures/map_glowplant/gradient...
2013-06-08 Matthias Krügermaps: g-23: remove textures/map_g-23/conveyorbelt/conve...
2013-06-08 Matthias Krügermaps: darkzone: remove textures/map_darkzone/light...
2013-05-31 Samual LenksMerge remote-tracking branch 'origin/debugger/glowplant'
2013-05-31 Samual LenksMerge remote-tracking branch 'origin/debugger/dance'
2013-05-18 Debuggermore textures for the exomorphx texture set; extended...
2013-05-15 MarioMerge branch 'master' into Mario/monsters
2013-05-14 kuniuthefroggMerge branch 'master' into kuniuthefrogg/silentsiege
2013-05-14 Samual LenksMerge remote-tracking branch 'origin/fruitiex/runningma...
2013-05-14 Samual LenksMerge remote-tracking branch 'origin/debugger/solarium'
2013-05-14 Samual LenksMerge remote-tracking branch 'origin/kuniuthefrogg...
2013-05-14 Samual LenksMerge remote-tracking branch 'origin/Mirio/space-elevator'
2013-05-14 Samual LenksMerge remote-tracking branch 'origin/master' into debug...
2013-05-14 Samual LenksMerge remote-tracking branch 'origin/master' into debug...
2013-05-14 Samual LenksMerge remote-tracking branch 'origin/debugger/oilrig'
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-21 Debuggeroilrig.map
2013-04-21 Debuggeradapted textures follow the texture naming convention now
2013-04-16 kuniuthefroggforgot to commit custom shaders ... also some compile...
2013-04-13 Debuggerretextured oilrig and rebuilt a few things
2012-08-28 Samual LenksMerge remote-tracking branch 'origin/master' into samua...
2012-03-06 Rudolf PolzerSquashed commit of the following:
2012-02-29 Rudolf PolzerMerge remote-tracking branch 'origin/cbrutail/darkzone'
2012-02-13 cbrutailMerge branch 'cbrutail/texture-exx_wall-metal01c' into...
2012-02-13 cbrutailA new texture and modified shader for darkzone
2012-02-11 cbrutailMerge branch 'master' into cbrutail/darkzone
2012-02-11 Rudolf PolzerMerge remote-tracking branch 'origin/cbrutail/map-light...
2012-02-10 cbrutailMerge branch 'master' into cbrutail/map-lightspeed_dome...
2012-02-05 cbrutailFixing the screen, it was never ok.
2012-02-05 cbrutailReplaced the ugly patch domes with models from THEFTBOT...
2012-01-21 cbrutailMerge branch 'master' into cbrutail/darkzone
2012-01-20 SamualMerge remote branch 'origin/master' into samual/running...
2012-01-06 cbrutailMerge branch 'cbrutail/darkzone' of git://de.git.xonoti...
2012-01-06 cbrutailAdding said textures and shaders.
2011-12-30 cbrutailMerge branch 'master' into cbrutail/darkzone
2011-12-30 Rudolf PolzerMerge branch 'cbrutail/g-23_cant_take_it_anymore'
2011-12-30 Rudolf PolzerMerge branch 'master' into cbrutail/g-23_cant_take_it_a...
2011-12-30 cbrutailMerge branch 'master' into cbrutail/g-23_cant_take_it_a...
2011-12-29 cbrutailMerge branch 'master' into cbrutail/g-23_cant_take_it_a...
2011-12-28 cbrutailFixed scale of forklifts on the map (0.65), and made...
2011-12-15 Rudolf Polzerfix wrong keyword
2011-12-15 Rudolf Polzerhelp radiant
2011-12-15 Rudolf Polzeradd alphamod shaders :)
2011-11-20 Rudolf Polzerphilipk1x and philipk2x texture sets
2011-10-28 cbrutailMerge branch 'master' into cbrutail/map-lightspeed
2011-10-27 Rudolf PolzerMerge remote-tracking branch 'origin/atheros/secret'
2011-10-24 Rudolf PolzerMerge remote-tracking branch 'origin/atheros/item_keys'
2011-10-18 Rudolf PolzerMerge remote-tracking branch 'origin/cbrutail/textures...
2011-10-14 cbrutailRed and green jumppad textures + shaders.
2011-10-09 Rudolf PolzerMerge remote-tracking branch 'origin/cbrutail/texturese...
2011-10-09 cbrutailGreenedge warpzone
2011-10-06 cbrutailHAH! I LIED! These are not trim recolors, but light...
2011-10-04 cbrutailMerge branch 'master' into cbrutail/map-lightspeed
2011-10-03 cbrutailMerge branch 'master' into cbrutail/map-lightspeed
2011-10-03 Rudolf PolzerMerge remote-tracking branch 'origin/cbrutail/newtextur...
2011-10-03 cbrutailNew green trim textures + shaders.
2011-09-03 Rudolf Polzeradd one missing heightmap to narmorx
2011-09-03 Rudolf Polzerfix alpha channel auditing
2011-09-03 Rudolf PolzerMerge branch 'master' of git://de.git.xonotic.org/xonot...
2011-09-02 Rudolf Polzertexture fixes for trak7x
2011-09-01 Rudolf Polzeruse match8 here too
2011-08-30 Rudolf PolzerSquashed commit of the following (exomorph by morphed):
2011-07-25 Rudolf PolzerMerge branch 'divVerent/courtfun2'
2011-07-24 Rudolf PolzerMerge remote branch 'origin/master' into divVerent...
2011-07-24 Maik Mertenfix shader and textures for courtfun screen messages
2011-07-19 Rudolf PolzerMerge remote branch 'origin/morphed/teleporter'
next