]> de.git.xonotic.org Git - xonotic/xonotic-maps.pk3dir.git/history - maps/silentsiege.map
merge conflict
[xonotic/xonotic-maps.pk3dir.git] / maps / silentsiege.map
2017-02-20 Miriomerge conflict
2016-12-27 MirioUpdate maps with new entity maps
2016-10-25 MirioMerge branch 'master' into packer/vorix
2016-03-24 MirioRevert stuff
2016-03-23 MirioClips clips clip
2015-09-07 MirioMerge branch 'matthiaskrgr/silentsiege' into 'master'
2015-09-07 MirioMerge branch 'matthiaskrgr/atelier' into 'master'
2015-09-07 Matthias Krügersilentsiege: fix pipe and other small glitch
2015-09-07 Matthias Krügersilentsiege: in the pk3, the bug still existed, try...
2015-09-07 Matthias Krügersilentsiege: second attempt to fix getting stuck on...
2015-09-06 MirioMerge branch 'matthiaskrgr/afterslime_2' into 'master'
2015-09-06 MirioMerge branch 'matthiaskrgr/silentsiege_stuckfix' into...
2015-09-05 Matthias Krügersilentsiege: fix player getting stuck on edge underneat...
2015-09-04 MirioSet author, message and _description in map files
2015-03-16 MirioMerge branch 'master' into amade/finalrage
2015-03-06 MirioMerge branch 'master' into debugger/shadow/atelier
2015-03-06 Matthias KrügerMerge branch 'master' into matthiaskrgr/dance
2015-03-06 Matthias KrügerMerge branch 'master' into matthiaskrgr/hudsetup
2015-02-12 Mirionn
2015-02-11 MirioMerge branch 'master' into maddin/map-warfare
2015-02-11 MirioAdd strength and autoscreenshot entity
2015-02-08 Matthias KrügerMerge branch 'master' into matthiaskrgr/dance
2015-01-24 MarioMerge remote-tracking branch 'origin/master' into debug...
2015-01-24 MarioMerge remote-tracking branch 'origin/master' into maddi...
2015-01-23 MirioMerge branch 'master' into mirio/glowplant
2015-01-21 MarioMerge remote-tracking branch 'origin/Mirio/silentsiege'
2015-01-04 MirioFix an edge that makes you stuck in the wall/air
2014-11-29 MarioMerge branch 'master' into itsme/vorix
2014-11-27 MarioMerge branch 'nyov/instagib-rename'
2014-11-27 MarioMerge branch 'master' into mirceakitsune/world_cubemaps
2014-11-18 MirioMerge branch 'master' into mirio/implosion
2014-11-16 MarioMerge branch 'master' into Mario/monsters 2/head
2014-11-13 MarioMerge branch 'Mirio/map_updates'
2014-06-18 MirioFix the leak
2014-06-17 MirioFix Bugs #1679, #1705, #1708
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ügersilentsiege: remove red respawnrings.
2013-06-20 ItsMeMerge branch 'xonotic-maps.pk3dir/itsme/vorix' of git...
2013-06-04 Samual LenksMerge remote-tracking branch 'origin/kuniuthefrogg... xonotic-v0.7.0
2013-06-04 kuniuthefroggfix damn lost wrong texture
2013-06-04 Samual LenksMerge remote-tracking branch 'origin/Mirio/afterslime'
2013-06-04 Samual LenksMerge remote-tracking branch 'origin/Mirio/campaign'
2013-06-04 Samual LenksMerge remote-tracking branch 'origin/Mirio/runningmanctf'
2013-06-03 Samual LenksMerge remote-tracking branch 'origin/Mirio/mapoptions'
2013-06-03 Samual LenksMerge remote-tracking branch 'origin/Mirio/silentsiege'
2013-06-03 Samual LenksMerge remote-tracking branch 'origin/Mirio/stormkeep'
2013-06-03 Samual LenksMerge remote-tracking branch 'origin/Mirio/runningman'
2013-06-03 Samual LenksMerge remote-tracking branch 'origin/Mirio/glowplant'
2013-06-03 Samual LenksMerge remote-tracking branch 'origin/Mirio/runningmanctf'
2013-06-03 Samual LenksMerge remote-tracking branch 'origin/Mirio/drain'
2013-06-03 Samual LenksMerge remote-tracking branch 'origin/Mirio/afterslime'
2013-06-03 Samual LenksMerge remote-tracking branch 'origin/master' into Mirio...
2013-06-02 Miriodomination entities message added
2013-06-02 MirioFix previous leak
2013-06-02 Matthias KrügerMerge branch 'master' into matthiaskrgr/space-elevator_...
2013-06-02 Rudolf Polzertry fixing silentsiege by importing the gspawn1 model...
2013-06-02 MirioFix DOM entities, fix ticket 1593
2013-05-31 Samual LenksMerge remote-tracking branch 'origin/Mirio/campaign'
2013-05-31 Samual LenksMerge remote-tracking branch 'origin/debugger/glowplant'
2013-05-31 Samual LenksMerge remote-tracking branch 'origin/debugger/dance'
2013-05-31 Samual LenksMerge remote-tracking branch 'origin/kuniuthefrogg...
2013-05-20 kuniuthefroggadd domination support
2013-05-16 kuniuthefrogglast time compiling failed at vis stage, so i tried...
2013-05-15 MarioMerge branch 'master' into Mario/monsters
2013-05-14 kuniuthefroggscaling by 0.9
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-05-14 Samual LenksMerge remote-tracking branch 'origin/master' into debug...
2013-05-14 Samual LenksMerge remote-tracking branch 'origin/debugger/oilrig'
2013-05-14 Samual LenksMerge remote-tracking branch 'origin/kuniuthefrogg...
2013-05-13 kuniuthefroggscale 0.9
2013-05-08 kuniuthefrogghopefully final bugfix
2013-05-06 kuniuthefroggnew map pic, fix some reported bugs
2013-04-29 kuniuthefroggmore clipping, texture alignments, minor architecture...
2013-04-22 kuniuthefroggSilent Siege - duel/ffa map by Justin