]> de.git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/history - scripts
Merge remote branch 'origin/morphed/hpitems'
[xonotic/xonotic-data.pk3dir.git] / scripts /
2011-04-03 mand1ngaMerge remote branch 'origin/morphed/hpitems'
2011-03-05 SamualMerge remote branch 'origin/master' into morphed/hpitems
2011-03-01 Rudolf PolzerMerge remote-tracking branch 'origin/mrbougo/tooltips_fix'
2011-02-03 Morphednew models for hp items, they still need a fix here...
2011-01-25 Maik MertenMerge branch 'master' of ssh://git.xonotic.org/xonotic...
2010-12-28 Rudolf PolzerMerge remote branch 'origin/fruitiex/bots'
2010-12-10 Rudolf PolzerMerge commit '7b4c329'
2010-12-10 Rudolf PolzerMerge remote branch 'origin/terencehill/WEP_constants_f...
2010-12-09 Rudolf PolzerMerge remote branch 'origin/terencehill/small_cleanup'
2010-12-04 terencehillMerge branch 'master' into terencehill/crosshair_colors
2010-12-01 Rudolf PolzerMerge remote branch 'origin/fruitiex/cl_vyes'
2010-12-01 Rudolf PolzerMerge remote branch 'origin/samual/newsounds'
2010-12-01 Rudolf PolzerMerge branch 'master' of git://git.xonotic.org/xonotic...
2010-11-30 Rudolf PolzerMerge remote branch 'refs/remotes/origin/fruitiex/balance'
2010-11-30 Rudolf PolzerMerge remote branch 'origin/fruitiex/freezetag_vs_keepaway'
2010-11-30 FruitieXMerge branch 'samual/keepaway' into fruitiex/freezetag_...
2010-11-30 FruitieXMerge branch 'master' into samual/keepaway
2010-11-30 Rudolf Polzermine layer: fix shader path :(
2010-11-30 Rudolf PolzerMerge remote branch 'origin/morphed/flag'
2010-11-30 Rudolf PolzerMerge remote branch 'origin/morphed/minelayer'
2010-11-30 Rudolf PolzerMerge remote branch 'origin/tzork/projetiles'
2010-11-29 unknownMerge remote branch 'origin/master' into samual/keepaway
2010-11-28 tzorkMorphed's nice new projecile models.
2010-11-27 unknownMerge remote branch 'origin/master' into samual/keepaway
2010-11-27 unknownACTUALLY commit the orbs now that I fixed their origin...
2010-11-17 Rudolf PolzerMerge remote branch 'origin/fruitiex/fullbrightskin'
2010-11-17 unknownMerge remote branch 'origin/master' into samual/keepaway
2010-11-17 FruitieXMerge remote branch 'origin/master' into fruitiex/fruit...
2010-11-16 Rudolf Polzermodels and content for freezetag (no code yet)
2010-11-16 FruitieXno cull none in the ice shader, helps fps here
2010-11-15 FruitieXa number of fixes.
2010-11-15 FruitieXFreeze Tag. It compiles. Untested. (don't test :P)
2010-11-14 FruitieXMerge branch 'master' into fruitiex/dryfirefix
2010-11-13 Morphednew flag models
2010-11-12 FruitieXMerge branch 'terencehill/crosshair_colors' into fruiti...
2010-11-12 FruitieXMerge remote branch 'origin/terencehill/newpanelhud...
2010-11-12 FruitieXMerge remote branch 'origin/terencehill/colorpicker_pos...
2010-11-07 FruitieXshader to reference the correct nexball texture path...
2010-10-22 Rudolf PolzerMerge branch 'master' of ssh://git.xonotic.org/xonotic...
2010-10-22 Rudolf PolzerMerge remote branch 'refs/remotes/origin/fruitiex/domfix'
2010-10-22 FruitieXfinally fix the darn dom points, also remove nexuiz...
2010-10-22 Rudolf PolzerMerge remote branch 'refs/remotes/origin/ThePWTULN...
2010-10-13 Rudolf PolzerMerge remote branch 'refs/remotes/origin/fruitiex/viewo...
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-05 Rudolf PolzerMerge remote branch 'origin/master' into divVerent...
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...
next