Remove r_water* client settemps (these are blacklisted, fixes warning)
[xonotic/xonotic-maps.pk3dir.git] / maps / space-elevator.mapinfo
2020-01-17 bones_was_hereRemove r_water* client settemps (these are blacklisted...
2017-03-30 MirioMerge branch 'master' into maddin/shader-weapclip 54/head
2017-03-21 MirioFix conflict 94/head
2017-03-21 MirioCleanup mapinfos and options
2015-03-16 MirioMerge branch 'master' into amade/finalrage
2015-03-06 MirioMerge branch 'master' into debugger/shadow/atelier
2015-03-06 MirioMerge branch 'master' into mirio/geoplanetary
2015-03-06 Matthias KrügerMerge branch 'master' into matthiaskrgr/dance
2015-03-06 Matthias KrügerMerge branch 'master' into matthiaskrgr/hudsetup
2015-02-11 MirioMerge branch 'master' into maddin/map-warfare
2015-02-11 Miriomapinfo
2015-02-10 MirioAdjust cdtracks
2015-02-09 MirioMerge branch 'master' into mirio/mapfixes
2015-02-09 MirioMerge branch 'Mirio/mapinfos'
2015-01-24 MirioUpdate mapinfos with new cvars names and cdtracks
2014-11-27 MarioMerge branch 'master' into mirceakitsune/world_cubemaps
2013-08-14 Rudolf PolzerMerge remote-tracking branch 'origin/debugger/exomorphx...
2013-06-20 ItsMeMerge branch 'xonotic-maps.pk3dir/itsme/vorix' of git...
2013-05-31 Samual LenksMerge remote-tracking branch 'origin/debugger/glowplant'
2013-05-31 Samual LenksMerge remote-tracking branch 'origin/debugger/dance'
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-04-21 MirioDifferent changes, map cleanup
2011-05-18 cbrutailMerge branch 'master' into cbrutail/map-lightspeed
2011-04-03 mand1ngaMerge remote branch 'origin/mirceakitsune/red_planet'
2011-03-19 Maik MertenMerge branch 'master' of ssh://git.xonotic.org/xonotic...
2011-02-17 ssinghalMerge remote branch 'origin/master' into diabolik/after...
2011-02-10 Rudolf Polzerfix space_elevator mapinfo
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-28 Rudolf Polzerforce on the warpzone in space ellelator
2010-12-27 FruitieXMerge remote branch 'origin/master' into fruitiex/runni...
2010-12-10 Rudolf Polzerspace-elevator: use cdtrack number
2010-11-24 FruitieXMerge remote branch 'origin/master' into savagex/techas...
2010-11-17 FruitieXMerge branch 'master' into fruitiex/runningmanctf
2010-11-16 Rudolf PolzerMerge commit 'ceb1f044b89ba79c6f5f431cd43ebcfa431486eb...
2010-11-15 Rudolf PolzerMerge remote branch 'origin/fruitiex/stormkeep_playerclip'
2010-11-15 Rudolf PolzerMerge remote branch 'origin/fruitiex/space-elevator'
2010-11-15 Rudolf PolzerMerge remote branch 'origin/fruitiex/dance'
2010-11-15 FruitieXMerge branch 'master' into savagex/techassault
2010-11-15 Rudolf PolzerMerge remote branch 'origin/divVerent/map-weapon-rebalance'
2010-11-15 Rudolf PolzerMerge remote branch 'origin/fruitiex/mapinfo_improvements'
2010-11-15 FruitieXMerge branch 'master' into fruitiex/mapinfo_improvements
2010-11-10 FruitieXfix space-elevator.mapinfo
2010-11-07 Maik MertenMerge branch 'master' of ssh://git.xonotic.org/xonotic...
2010-11-02 Rudolf PolzerMerge remote branch 'origin/fruitiex/nexballarena'
2010-11-02 FruitieXMerge branch 'master' into fruitiex/runningmanctf
2010-11-01 Rudolf PolzerMerge remote branch 'origin/mirceakitsune/red_planet'
2010-10-30 Rudolf PolzerMerge remote branch 'origin/fruitiex/stormkeep'
2010-10-30 Rudolf PolzerMerge remote branch 'origin/savagex/glowplant-warpzonefix'
2010-10-30 Rudolf PolzerSquashed commit of the following: