Merge remote branch 'origin/fruitiex/fruitbalance'
[xonotic/xonotic-data.pk3dir.git] / scripts /
2010-09-28 Jakob MGMerge branch 'tzork/ents-onoff' of ssh://git.xonotic...
2010-09-28 Jakob MGMerge branch 'master' into tzork/ents-onoff
2010-09-10 Rudolf PolzerMerge remote branch 'refs/remotes/origin/terencehill...
2010-09-04 Rudolf PolzerMerge remote branch 'refs/remotes/origin/fruitiex/fruit...
2010-09-03 Rudolf Polzermore needed stuff from nexcompat
2010-08-15 FruitieXMerge remote branch 'origin/master' into fruitiex/newpa...
2010-08-13 terencehillMerge branch 'master' into terencehill/misc_bugfixes
2010-08-13 terencehillMerge commit 'aa4c896acf8088d26fcbd5ff4e3f6e7a0acb0600...
2010-08-09 FruitieXMerge branch 'master' into mirceakitsune/multijump
2010-08-08 Rudolf PolzerMerge remote branch 'refs/remotes/origin/terencehill...
2010-08-05 Rudolf PolzerMerge remote branch 'origin/savagex/assaultfixes'
2010-08-05 Rudolf PolzerMerge branch 'master' of ssh://git.xonotic.org/xonotic...
2010-08-05 Rudolf Polzerdelete quite some stuff that rather belongs in xonotic...
2010-07-29 Rudolf PolzerMerge commit '9805d7cf0ce8875950b667e16982fcecd02068ad'
2010-07-29 Rudolf PolzerMerge commit '3f5af11a8794a82f13d066452580dd8d0cc756bc'
2010-07-21 FruitieXMerge branch 'fruitiex/newpanelhud' into fruitiex/newpa...
2010-07-21 Rudolf PolzerCRLF fixes, .gitattributes file updated
2010-07-21 Rudolf PolzerCRLF fixes, .gitattributes file updated
2010-07-21 Rudolf PolzerCRLF fixes, .gitattributes file updated
2010-07-21 Rudolf PolzerCRLF fixes, .gitattributes file updated
2010-07-18 Rudolf PolzerMerge branch 'fruitiex/fruitbalance' of ssh://git.xonot...
2010-07-18 Rudolf PolzerMerge branch 'master' into fruitiex/fruitbalance
2010-07-18 Rudolf PolzerCRLF fixes
2010-07-14 terencehillMerge remote branch 'remotes/origin/fruitiex/newpanelhu...
2010-06-29 Mircea KitsuneMerge branch 'master' into mirceakitsune/nex_reticle
2010-06-29 FruitieXMerge branch 'master' into terencehill/newpanelhud
2010-06-29 FruitieXMerge branch 'master' into fruitiex/newpanelhud
2010-06-25 FruitieXMerge branch 'master' into fruitiex/fruitbalance
2010-06-24 Rudolf Polzermove shaderlist.txt into the individual dirs again...
2010-06-23 Rudolf PolzerMerge remote branch 'refs/remotes/origin/mirceakitsune...
2010-06-16 terencehillMerge remote branch 'remotes/origin/fruitiex/newpanelhu...
2010-06-16 FruitieXMerge branch 'fruitiex/newpanelhud_stable' into fruitie...
2010-06-15 Sahil SinghalMerge commit 'origin/master' into diabolik/nexmodel
2010-06-15 FruitieXMerge branch 'fruitiex/newpanelhud' into fruitiex/newpa...
2010-06-15 FruitieXMerge branch 'master' into fruitiex/newpanelhud_stable
2010-06-15 Rudolf Polzerfix morphed's tree model
2010-06-15 Rudolf PolzerMerge remote branch 'refs/remotes/origin/terencehill...
2010-06-06 mand1ngaMerge branch 'mand1nga/rebrand' of ssh://git.xonotic...
2010-05-18 Rudolf PolzerMerge remote branch 'refs/remotes/origin/terencehill...
2010-05-17 FruitieXMerge branch 'master' into fruitiex/newpanelhud
2010-05-16 Sahil SinghalMerge commit 'origin/master' into diabolik/ignisplayermodel
2010-05-15 Sahil SinghalMerge commit 'origin/master' into diabolik/weaponscale
2010-05-15 Rudolf Polzera new shader file with some very short names for certai...
2010-05-15 Rudolf PolzerMerge remote branch 'refs/remotes/origin/diabolik/umbra...
2010-05-15 Rudolf PolzerMerge remote branch 'refs/remotes/origin/tzork/turrets'
2010-05-15 Rudolf PolzerMerge remote branch 'refs/remotes/origin/fruitiex/xpmba...
2010-05-15 Jakob MGAdd turrets.shader
2010-05-14 FruitieXMerge branch 'fruitiex/newpanelhud' of ssh://git.xonoti...
2010-05-13 Sahil SinghalMerge commit 'origin/master' into diabolik/ignisplayermodel
2010-05-13 Sahil SinghalAdd shader. delete screenshot.
2010-05-13 Sahil SinghalFix shader file name too.
2010-05-13 Rudolf PolzerMerge remote branch 'origin/diabolik/pyriaplayermodel'
2010-05-13 Rudolf PolzerMerge branch 'fruitiex/newpanelhud' of ssh://git.xonoti...
2010-05-13 Rudolf PolzerMerge branch 'master' into fruitiex/newpanelhud
2010-05-13 Rudolf PolzerMerge branch 'divVerent/model-textures-prefix-removal-v2'
2010-05-13 FruitieXMerge branch 'diabolik/pyriaplayermodel' of ssh://git...
2010-05-13 Sahil SinghalAdd a shader to fix hair.
2010-05-11 Rudolf Polzerget rid of a dupe shader
2010-05-11 Rudolf Polzerget rid of redundant textures/ prefix in more shader...
2010-05-11 Morphedreflection shader for all weapons
2010-05-08 Sahil SinghalMerge commit 'origin/master' into diabolik/umbraplayermodel
2010-05-08 Rudolf PolzerMerge commit 'origin/master' into divVerent/tag_seeker
2010-05-04 Mircea KitsuneMerge branch 'master' into mirceakitsune/per_character_...
2010-05-04 Rudolf PolzerMerge remote branch 'origin/mirceakitsune/respawn_ghosts'
2010-05-03 Mircea KitsuneRemove test map and fix one last comment. entities...
2010-05-03 Mircea KitsuneSTICKY spawnflag. When enabled, entities keep their...
2010-05-03 Mircea KitsuneName and comment optimizations. Remove test code.
2010-05-03 Mircea KitsuneUse div0's idea for untouch detection.
2010-05-03 Mircea KitsuneAttempt to implement gravity zones. So far there is...
2010-04-28 Rudolf PolzerMerge remote branch 'origin/divVerent/bastet'
2010-04-27 Rudolf Polzerrename the shader files back to original names
2010-04-27 Rudolf Polzeradd back some shaders that were missing here
2010-04-22 Rudolf PolzerMerge commit 'origin/tzork/pathlib'
2010-04-22 Rudolf PolzerMerge commit 'origin/tzork/pathlib' into divVerent...
2010-04-22 Rudolf PolzerMerge commit '54e0ccd220df'
2010-04-22 Rudolf PolzerMerge commit 'origin/tzork/pathlib' into divVerent...
2010-04-22 Rudolf PolzerMerge commit 'origin/tzork/pathlib'
2010-04-14 Rudolf PolzerMerge commit 'origin/tzork/vehicles'
2010-04-02 Rudolf PolzerMerge commit 'origin/tzork/vehicles'
2010-04-02 Rudolf Polzerwe need the .def stuff in the -maps repo, so we can...
2010-04-02 Rudolf Polzermore .def files for xonotic-data
2010-03-28 Rudolf PolzerMerge commit 'origin/diabolik/iqmsupport'
2010-03-22 Rudolf PolzerMerge branch 'div0/mutatorsystem'
2010-03-22 Rudolf Polzermore warpzone randomization stuff
2010-03-22 Rudolf Polzerentities.def be here
2010-03-18 Rudolf Polzermove scripts and env into the maps repo, as they really...
2010-03-18 Rudolf Polzerrebrand nexuiz -> xonotic, will fix possible mess later
2010-03-18 xonoticinitial checkin from nexuiz svn r8756 initial