Merge branch 'Spike29/implosion_fixes' into 'master'
[xonotic/xonotic-maps.pk3dir.git] / textures / effects_item /
2014-11-29 MarioMerge branch 'master' into itsme/vorix
2014-11-27 MarioMerge branch 'master' into mirceakitsune/world_cubemaps
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/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 Matthias Krügerrespawnrings: ensure backwards compatibility for maps...
2013-07-10 Matthias Krügernew high-res respawnring textures
2010-11-15 FruitieXMerge branch 'master' into savagex/techassault
2010-11-07 Maik MertenMerge branch 'master' of ssh://git.xonotic.org/xonotic...
2010-10-03 Rudolf PolzerMerge branch 'savagex/g-23-relight' of ssh://git.xonoti...
2010-10-02 Rudolf PolzerMerge remote branch 'origin/savagex/g-23-relight'
2010-10-02 Rudolf PolzerMerge remote branch 'origin/savagex/g-23-relight'
2010-10-02 FruitieXMerge remote branch 'origin/divVerent/fruitiex-textures...
2010-10-02 FruitieXMerge remote branch 'origin/master' into fruitiex/runni...
2010-10-02 Rudolf PolzerMerge remote branch 'origin/fruitiex/effect_e8circle'
2010-10-02 FruitieXrespawn ring effect from the e8 set (could use some...