Add Cushion texture - thanks hotdog
[xonotic/xonotic-maps.pk3dir.git] / maps /
2019-09-01 terencehillMerge branch 'terencehill/bot_waypoints' into 'master'
2019-08-03 MirioFix #160
2019-02-28 MirioHopefully final jumppad fix
2019-02-24 MirioRevert lod models, it is causing issues with older...
2018-10-20 Martin TaibrMerge branch 'Spike29/space-elevator_fix154' into ...
2018-10-20 SpiKeAdd two missing patches below the map, fix #154
2018-06-11 MirioAdd lodmodels to jumppads. Also update to new entity...
2017-03-30 MirioMerge branch 'master' into maddin/shader-weapclip
2017-03-21 MirioFix conflict 94/head
2017-03-21 MirioCleanup mapinfos and options
2017-03-18 MirioMerge branch 'packer/space-elevator' into 'master'
2017-03-18 packerlightgrid box and clips 89/head
2017-03-13 MirioMerge branch 'master' into matthiaskrgr/glowplant
2017-03-13 MirioMerge branch 'master' into matthiaskrgr/erbium 78/head
2017-03-13 MirioMerge branch 'master' into matthiaskrgr/atelier
2017-03-13 MirioMerge branch 'matthiaskrgr/final_rage' into 'master'
2017-03-13 MirioMerge branch 'matthiaskrgr/SE' into 'master'
2017-03-13 MirioMove trigger to bottom 79/head
2017-03-13 MirioMerge branch 't0uYK8Ne/textures-logos' into 'master'
2017-03-12 MirioMerge branch 'packer/warpzones' into 'master'
2017-03-12 MirioUpdate versioning 75/head
2017-03-08 MirioMerge branch 'master' into Mirio/geoplanetary
2017-03-03 MirioMerge conflict
2017-02-26 MirioMerge branch 'master' into Mirio/silentsiege
2017-02-26 Miriomerge conflict
2017-02-20 Miriomerge conflict
2017-01-31 MirioMerge branch 'master' into Justin/erbium
2017-01-16 MirioMerge branch 'master' into kuniuthefrogg/boil
2016-12-27 MirioUpdate versioning
2015-10-28 MirioMerge branch 'Mirio/darkzone' of git://de.git.xonotic...
2015-10-27 MirioMerge branch 'master' into Justin/erbium
2015-10-27 Miriomap picture
2015-10-27 MirioMerge branch 'master' into mirio/geoplanetary
2015-10-01 MirioMerge branch 'maddin/textures-phillipk2x-cleanup' into...
2015-10-01 MirioMerge branch 'maddin/textures-common' into 'master'
2015-10-01 MirioMerge branch 'maddin/map-warfare' into 'master'
2015-09-29 MirioMerge branch 'matthiaskrgr/light_misc' into 'master'
2015-09-22 Matthias Krügerdance: gamma 0.7
2015-09-21 Matthias Krügerspace-elevator: fix skylight position, make map a bit...
2015-09-05 MirioMerge branch 'master' into Mirio/geoplanetary
2015-09-04 MirioSet author, message and _description in map files
2015-09-04 MirioMerge branch 'matthiaskrgr/srgb' into 'master'
2015-09-04 MirioMerge branch 'matthiaskrgr/srgb' of ssh://
2015-08-31 Matthias KrügerMerge remote-tracking branch 'origin/master' into matth...
2015-08-31 Matthias KrügerMerge branch 'master' into matthiaskrgr/srgb
2015-08-31 Matthias Krügerspace-elevator: bounce 8
2015-08-31 Matthias Krügerspace-elevator: sRGBify, add custom skybox shader
2015-08-31 MirioMerge branch 'master' into justin/erbium
2015-08-31 MirioMerge branch 'master' into mirio/geoplanetary
2015-08-31 MirioMerge branch 'Melanosuchus/entities_func_door_rotating...
2015-08-28 MirioMerge branch 'matthiaskrgr/dance_unstuck'
2015-08-27 MirioMerge branch 'Mirio/universaltrigger'
2015-08-27 MirioAnd Space-Elevator
2015-08-25 MirioSpace-Elevator
2015-08-25 MirioImprove Space-Elevator triggers
2015-08-20 MirioFix #99 and make the jumppad triggers universal
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 MirioFix trigger_hurt, add screenshot
2013-04-21 MirioDifferent changes, map cleanup
2012-04-04 MirceaKitsuneMerge branch 'master' into mirceakitsune/world_cubemaps
2012-01-20 SamualMerge remote branch 'origin/master' into samual/running...
2011-12-30 cbrutailMerge branch 'master' into cbrutail/darkzone
2011-12-25 Rudolf Polzerstate lighting mode explicitly in all options files...
2010-11-15 FruitieXMerge branch 'master' into savagex/techassault
2010-11-07 Maik MertenMerge branch 'master' of ssh://
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 Polzerplease recompile the other maps with the q3map2 fix
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: