Merge branch 't0uYK8Ne/catharsis' into 'master'
[xonotic/xonotic-maps.pk3dir.git] / scripts /
2017-03-13 MirioMerge branch 'matthiaskrgr/glowplant' into 'master'
2017-03-13 MirioMerge branch 'master' into matthiaskrgr/glowplant
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/final_rage
2017-03-13 MirioMerge branch 'master' into matthiaskrgr/SE
2017-03-13 MirioMerge branch 'master' into matthiaskrgr/darkzone
2017-03-13 Matthias Krügerglowplant: fix samplesize, make map a bit darker to...
2017-03-13 MirioMerge branch 't0uYK8Ne/textures-logos' into 'master'
2017-03-12 MirioMerge branch 'master' into packer/warpzones
2017-03-12 MirioMerge branch 'master' of git://de.git.xonotic.org/xonot...
2017-03-12 MarioRemove runematch_spawn_point from entities.ent, also...
2017-03-12 t0uYK8NeAdd more logo variations. 74/head
2017-03-12 MirioFix pathnames in erbium shader
2017-03-10 MirioMerge branch 'Justin/erbium' into 'master'
2017-03-10 MirioFix conflict 30/head
2017-03-10 MirioMerge branch 'master' into Justin/erbium
2017-03-10 MirioMerge branch 'Mirio/geoplanetary' into 'master'
2017-03-10 MirioMerge branch 'master' into Mirio/geoplanetary 67/head
2017-03-10 MirioMerge branch 'master' into Justin/erbium
2017-03-10 MirioMerge branch 'master' into Mirio/geoplanetary
2017-03-08 MirioMerge branch 'master' into Mirio/geoplanetary
2017-03-08 MirioUpdate shader
2017-03-08 MirioUpdate shader
2017-03-08 MirioMerge branch 'master' into Mirio/geoplanetary
2017-03-07 MirioMerge branch 'master' into justin/erbium
2017-03-07 Miriomerge conflict
2017-03-07 MirioMerge branch 'master' into justin/erbium
2017-03-07 MarioRemove g-23 (poll passed)
2017-03-06 MirioMerge branch 'master' into justin/erbium
2017-03-03 MirioMerge branch 'Mirio/dance' into 'master'
2017-03-03 t0uYK8NeMerge branch 'master' into t0uYK8Ne/afterslime 64/head
2017-03-03 MirioMerge conflict
2017-03-03 MirioMerge branch 'kuniuthefrogg/boil' into 'master'
2017-03-03 MirioMerge branch 'master' into kuniuthefrogg/boil
2017-02-28 MirioMerge branch 'master' into kuniuthefrogg/boil
2017-02-26 MirioMerge branch 'master' into Mirio/silentsiege
2017-02-26 Miriomerge conflict
2017-02-20 Miriomerge conflict 56/head
2017-02-09 MirioMerge branch 't0uYK8Ne/ent-typos-fix' into 'master' 21/head
2017-02-08 t0uYK8NeFix typos in entities.ent 62/head
2017-01-31 MirioMerge branch 'master' into Justin/erbium
2017-01-17 MirioMerge branch 'master' into kuniuthefrogg/boil
2017-01-16 MirioFix #123
2017-01-16 MirioMerge branch 'master' into kuniuthefrogg/boil
2017-01-16 MirioMerge branch 'master' into kuniuthefrogg/boil
2016-12-27 MirioMerge branch 'DefaultUser/entity_def' into 'master'
2016-12-25 MirioMerge branch 'master' into Justin/erbium
2016-11-27 MirioAdd nopicmip to shader file
2016-11-26 MirioUpdate texture, add new texture
2016-11-23 MirioFix shader file
2016-11-23 MirioMerge branch 'master' into kuniuthefrogg/boil
2016-11-22 MirioAdd textures + shader
2016-11-05 FreddyRename item_health_large to item_health_big 57/head
2016-11-04 FreddyRename item_armor_large to item_armor_mega
2016-10-26 MirioMerge branch 'master' into justin/erbium
2016-10-26 MirioMerge branch 'master' into justin/erbium
2016-10-25 MirioMerge branch 'master' into Mirio/geoplanetary
2016-10-25 MirioMerge branch 'master' into justin/erbium
2016-10-15 MirioMerge branch 'master' into Justin/erbium
2016-03-09 MirioMerge branch 'master' into justin/erbium
2016-03-09 MirioMerge branch 'master' into mirio/geoplanetary
2016-01-20 MirioMerge branch 'master' into Justin/erbium
2016-01-20 MirioMerge branch 'master' into Mirio/darkzone
2016-01-20 MirioMerge branch 'master' into Mirio/geoplanetary
2016-01-15 MirioMerge branch 'master' into mirio/fuse
2016-01-15 Rudolf PolzerFix most of solarpanel.
2016-01-14 Rudolf PolzerUpdate shaderlist.
2016-01-14 Rudolf PolzerFix catharsis and crystals shader (make them conform...
2016-01-14 Rudolf PolzerFix blendfunc auditing for texture blending shaders.
2016-01-14 Rudolf Polzerminor fixes
2015-12-30 MarioAdd a note to misc_gamemodel preferring use of misc_cli...
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-26 MirioMerge branch 'maddin/textures-phillipk2x-fixes' into...
2015-10-23 mschwanadded transparent and opaque variations for grate shade...
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-30 mschwanadded missing empty lines, formatting 46/head
2015-09-29 MirioMerge branch 'matthiaskrgr/light_misc' into 'master'
2015-09-28 mschwanadded polygonoffset and sort keys for proper decals
2015-09-28 mschwanminor shader adjustments
2015-09-28 mschwanpanels done, pipes done, trims done, walls done
2015-09-28 mschwanlights done, natural done, natural shader are now impro...
2015-09-28 mschwanfloor done, grates know render correctly using their...
2015-09-28 mschwanbase done, ceiling done, computer done
2015-09-21 Matthias Krügerspace-elevator: fix skylight position, make map a bit...
2015-09-21 mschwanchanged glow textures to include colour, removed redund...
2015-09-20 mschwansmall visual improvements, shader clean-up
2015-09-20 mschwanremoved trailing whitespace, testing decal shader
2015-09-15 mschwanoverhaul of the common textures with a uniform design...
2015-09-07 MirioMerge branch 'matthiaskrgr/atelier' into 'master'
2015-09-06 MirioMerge branch 'matthiaskrgr/afterslime_2' into 'master'
2015-09-06 MirioUpdate shaderlist
2015-09-06 MirioMerge branch 'matthiaskrgr/silentsiege_stuckfix' into...
2015-09-06 MirioMerge branch 'Mirio/catharsis' into 'master'
2015-09-06 MirioMerge branch 'master' into Mirio/catharsis
next