Merge remote branch 'origin/master' into samual/runningman_separate
[xonotic/xonotic-maps.pk3dir.git] / models /
2012-01-20 SamualMerge remote branch 'origin/master' into samual/running...
2011-10-28 cbrutailMerge branch 'master' into cbrutail/map-lightspeed
2011-10-04 cbrutailMerge branch 'master' into cbrutail/map-lightspeed
2011-10-03 cbrutailMerge branch 'master' into cbrutail/map-lightspeed
2011-08-27 Rudolf Polzerupdate gitattributes and mark some files as text
2011-07-25 Rudolf PolzerMerge branch 'divVerent/courtfun2'
2011-07-24 Rudolf PolzerMerge remote branch 'origin/master' into divVerent...
2011-07-19 Rudolf PolzerMerge remote branch 'origin/morphed/teleporter'
2011-07-18 Morphedteleporter for darkzone map
2011-07-14 cbrutailMerge branch 'master' into cbrutail/map-lightspeed
2011-07-09 Rudolf PolzerMerge remote-tracking branch 'origin/master' into divVe...
2011-07-09 Rudolf PolzerMerge remote-tracking branch 'origin/master' into divVe...
2011-06-22 Jakob MGEditor models for vehicles
2011-06-18 cbrutailMerge branch 'master' into cbrutail/map-lightspeed
2011-06-16 Jakob MGMerge remote branch 'origin/cbrutail/trakmodelfixes'
2011-06-16 Jakob MGMerge remote branch 'origin/cbrutail/treeleavesfix'
2011-06-15 cbrutailMerge branch 'master' into cbrutail/map-lightspeed
2011-06-13 cbrutailnew, high-res textures
2011-06-13 cbrutailremoved some obviously floating leaves
2011-06-13 cbrutail4 times larger texture
2011-06-13 cbrutailModified two textures, to look better with ATC rendering
2011-06-13 cbrutailNew texture, modified shaders, new edtails etc.
2011-06-12 cbrutailMerge branch 'cbrutail/lightspeed_foliage_models' into...
2011-06-12 cbrutailA simple ase model for lightspeed
2011-06-12 cbrutailMerge branch 'master' into cbrutail/map-lightspeed
2011-06-06 cbrutailDeleted a backup file
2011-06-06 cbrutailMerge branch 'master' into cbrutail/map-lightspeed
2011-06-06 Jakob MGMerge remote branch 'origin/cbrutail/trakmodelfixes'
2011-06-05 cbrutailIntroducing .skin files for trak's models. Lot's of...
2011-06-04 cbrutailFixed trak's models, now they can be used.
2011-06-04 cbrutailAdding new files needed for red-details.
2011-05-24 Rudolf PolzerMerge branch 'master' of git://git.xonotic.org/xonotic...
2011-05-22 Rudolf PolzerMerge remote-tracking branch 'origin/mirceakitsune...
2011-05-18 cbrutailMerge branch 'master' into cbrutail/map-lightspeed
2011-05-16 Sahil SinghalMerge remote branch 'origin/master' into diabolik/after...
2011-05-14 Rudolf PolzerMerge remote-tracking branch 'origin/savagex/common'
2011-04-29 Rudolf PolzerSquashed commit of the following:
2011-04-22 Rudolf PolzerMerge remote-tracking branch 'origin/morphed/crate02'
2011-04-22 Morphedsmall fix, should be ready to merge now
2011-04-22 Morphedcrate model
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-09 Rudolf PolzerMerge remote branches 'origin/cbrutail/effects-beams...
2011-02-08 Rudolf PolzerMerge remote branch 'origin/cbrutail/model_walker-static'
2011-02-05 tzorkMerge remote branch 'origin/savagex/techassault'
2011-02-01 tzorkMerge remote branch 'origin/diabolik/more-lavacolors'
2011-01-30 MirceaKitsuneMerge branch 'master' into mirceakitsune/red_planet
2011-01-26 Rudolf PolzerMerge branch 'master' of git://git.xonotic.org/xonotic...
2011-01-26 Rudolf PolzerMerge remote branch 'origin/tzork/glowplant'
2011-01-25 tzorkMerge remote branch 'origin/diabolik/trak-textures'
2011-01-25 tzorkRename _s textures to _gloss
2011-01-25 ssinghalAdd traks map props.
2011-01-22 cbrutailStatic turret-walker models for maps, Current textures...
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 Rudolf PolzerMerge remote branch 'origin/fruitiex/fruitcampaign'
2010-11-15 Rudolf PolzerMerge remote branch 'origin/fruitiex/space-elevator'
2010-11-15 Rudolf PolzerMerge remote branch 'origin/fruitiex/dance'
2010-11-15 cbrutailFixed red launcpad lod skin typo, and added glowmaps...
2010-11-15 FruitieXMerge branch 'master' into savagex/techassault
2010-11-15 FruitieXMerge branch 'master' into fruitiex/mapinfo_improvements
2010-11-14 Rudolf PolzerMerge remote branch 'origin/divVerent/redplanet-recompile'
2010-11-14 Rudolf PolzerMerge remote branch 'origin/fruitiex/cuinnton_stormkeep'
2010-11-14 Rudolf PolzerMerge remote branch 'origin/tzork/glowplant'
2010-11-07 cbrutailFixes to the LOD models. May not fix anything at all.
2010-11-07 Maik MertenMerge branch 'master' of ssh://git.xonotic.org/xonotic...
2010-11-03 unknownAdd missing terrain model, tweak compile options.
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-10-22 FruitieXMerge branch 'master' into fruitiex/runningmanctf
2010-10-21 FruitieXMerge branch 'master' into fruitiex/glowplant
2010-10-21 FruitieXMerge branch 'master' into fruitiex/stormkeepsounds
2010-10-21 Rudolf PolzerMerge branch 'master' into fruitiex/g-23sounds
2010-10-21 Rudolf Polzernew .gitattributes file, and remove // comments from...
2010-10-20 FruitieXMerge branch 'master' into fruitiex/runningmanctf
2010-10-19 Rudolf PolzerMerge remote branch 'refs/remotes/origin/mirceakitsune...
2010-10-13 Rudolf PolzerAdded the map "glowplant" by Cuinnton, lighting setting...
2010-10-09 Maik MertenMerge branch 'morphed/ionpump' of ssh://git.xonotic...
2010-10-02 FruitieXMerge remote branch 'origin/divVerent/fruitiex-textures...
2010-10-02 FruitieXMerge remote branch 'origin/master' into fruitiex/runni...
2010-10-02 Rudolf PolzerMerge remote branch 'origin/fruitiex/effect_e8circle'
2010-10-02 Rudolf Polzerremove some unused textures
2010-10-01 Rudolf Polzerupdate converter
2010-10-01 Rudolf Polzeralso fix *BITMAP in the ase files
2010-10-01 Rudolf Polzerimport desertfactory assets
2010-09-29 Rudolf PolzerMerge remote branch 'origin/morphed/fruitiex-textures...
2010-09-29 Rudolf PolzerMerge branch 'master' into divVerent/fruitiex-textures
next