]> git.xonotic.org Git - xonotic/xonotic-maps.pk3dir.git/history - scripts/ex2x.shader
Merge branch 'master' of git://de.git.xonotic.org/xonotic/xonotic-maps.pk3dir
[xonotic/xonotic-maps.pk3dir.git] / scripts / ex2x.shader
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-09 Rudolf PolzerMerge remote-tracking branch 'origin/cbrutail/texturese...
2011-10-06 cbrutailHAH! I LIED! These are not trim recolors, but light...
2011-10-03 cbrutailMerge branch 'master' into cbrutail/map-lightspeed
2011-09-03 Rudolf Polzerheight-match ex2x (safe to do, no xonotic map uses it)
2011-05-18 cbrutailMerge branch 'master' into cbrutail/map-lightspeed
2011-03-19 Maik MertenMerge branch 'master' of ssh://git.xonotic.org/xonotic...
2011-01-26 Rudolf PolzerMerge remote branch 'origin/tzork/glowplant'
2010-12-28 Maik MertenMerge branch 'master' of ssh://git.xonotic.org/xonotic...
2010-12-27 FruitieXMerge remote branch 'origin/master' into fruitiex/runni...
2010-12-04 Rudolf PolzerMerge remote branch 'origin/mand1nga/waypoints_space...
2010-12-03 Rudolf Polzeralso add its shader back
2010-12-01 FruitieXMerge branch 'master' into fruitiex/runningmanctf
2010-11-30 Rudolf PolzerSquashed commit of the following:
2010-11-15 FruitieXMerge branch 'master' into savagex/techassault
2010-11-07 Maik MertenMerge branch 'master' of ssh://git.xonotic.org/xonotic...
2010-10-02 FruitieXMerge remote branch 'origin/divVerent/fruitiex-textures...
2010-10-02 FruitieXMerge remote branch 'origin/master' into fruitiex/runni...
2010-09-29 Rudolf Polzerex2x needs a quarter of its offsetmapping scale to...
2010-09-28 Rudolf PolzerMerge commit 'c87167c'
2010-09-28 Rudolf PolzerMerge branch 'master' into divVerent/archived/fruitiex...
2010-09-25 Rudolf PolzerMerge branch 'master' into cbrutail/shaders_fx_xonotic2
2010-09-25 Rudolf PolzerMerge branch 'master' into fruitiex/runningmanctf
2010-08-24 Rudolf PolzerMerge remote branch 'origin/fruitiex/warpzone'
2010-08-24 Rudolf PolzerMerge remote branch 'origin/fruitiex/lightshaders'
2010-08-24 Rudolf PolzerMerge remote branch 'refs/remotes/origin/mookow/map...
2010-08-21 Sahil SinghalMerge remote branch 'origin/master' into diabolik/techpanel
2010-08-20 Rudolf PolzerSquashed commit of the following: