Merge remote branch 'origin/cbrutail/trakmodelfixes'
[xonotic/xonotic-maps.pk3dir.git] / models / xonotic_jumppad01 /
2011-02-05 tzorkMerge remote branch 'origin/savagex/techassault'
2011-01-26 Rudolf PolzerMerge remote branch 'origin/tzork/glowplant'
2011-01-14 Rudolf PolzerSquashed commit of the following:
2010-11-26 FruitieXMerge remote branch 'origin/master' into fruitiex/freez...
2010-11-24 FruitieXMerge remote branch 'origin/master' into savagex/techas...
2010-11-18 Rudolf PolzerMerge remote branch 'origin/fruitiex/red-planet-zfight'
2010-11-17 FruitieXMerge branch 'master' into fruitiex/runningmanctf
2010-11-16 Rudolf PolzerMerge commit 'ceb1f044b89ba79c6f5f431cd43ebcfa431486eb...
2010-11-15 cbrutailFixed red launcpad lod skin typo, and added glowmaps...
2010-11-15 FruitieXMerge branch 'master' into savagex/techassault
2010-11-07 cbrutailFixes to the LOD models. May not fix anything at all.
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/fruitiex/jumppadlod'
2010-11-01 FruitieXfix paths in skin file
2010-11-01 FruitieXjumppad and launchpad lod models by morphed, all mapper...
2010-11-01 Rudolf PolzerMerge remote branch 'origin/mirceakitsune/red_planet'
2010-10-31 Rudolf PolzerMerge remote branch 'origin/cbrutail/moarmodels'
2010-10-31 cbrutailSome more variations for jumppad models. Added new...
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-04 Rudolf PolzerMerge branch 'master' into divVerent/skyboxes
2010-08-04 Rudolf PolzerMerge branch 'master' into m0rfar/heaven
2010-08-02 Rudolf Polzeradhere to xonotic shader naming convention
2010-08-02 Rudolf Polzeradd xonotic_jumppad01