Merge remote-tracking branch 'origin/samual/serverlist'
[xonotic/xonotic-data.pk3dir.git] / particles /
2013-05-22 Samual LenksMerge remote-tracking branch 'origin/master' into samua...
2012-03-09 nyovMerge tag 'xonotic-v0.6.0' into nyov/dedicated-startups...
2012-02-29 SamualMerge remote branch 'origin/terencehill/minstagib_outof...
2012-02-26 SamualMerge remote branch 'origin/terencehill/powerups_respaw...
2012-02-26 SamualMerge remote branch 'origin/terencehill/physics_panel_u...
2012-02-18 Rudolf PolzerMerge remote-tracking branch 'origin/divVerent/new...
2012-02-08 SamualMerge remote branch 'origin/master' into samual/mutator_ctf
2012-01-31 Rudolf PolzerMerge branch 'master' of git://de.git.xonotic.org/xonot...
2012-01-29 terencehillMerge branch 'master' into terencehill/cursormode
2012-01-25 terencehillMerge branch 'master' into terencehill/clear_button
2012-01-14 Mircea KitsuneMerge branch 'master' into mirceakitsune/damage_effects
2012-01-14 Jakob MGMerge branch 'tzork/gm_nexball' of git://de.git.xonotic...
2012-01-14 Jakob MGMerge remote-tracking branch 'origin/master' into tzork...
2012-01-12 terencehillMerge branch 'master' into terencehill/arena_and_ca_fixes
2012-01-12 SamualMerge remote branch 'origin/master' into mirceakitsune...
2012-01-11 SamualMerge remote branch 'origin/master' into samual/menu_up...
2012-01-11 Rudolf Polzerdon't ask. Fixed missing text.
2012-01-11 Rudolf Polzerargh, why is the template borked
2012-01-11 Rudolf Polzerfix the template pic
2012-01-09 Rudolf PolzerMerge remote-tracking branch 'origin/divVerent/allow...
2012-01-03 SamualMerge remote branch 'origin/master' into samual/menu_up...
2012-01-03 Mircea KitsuneMerge branch 'master' into mirceakitsune/damage_effects
2011-12-28 Jakob MGMerge remote-tracking branch 'origin/master' into tzork...
2011-12-22 SamualMerge remote branch 'origin/master' into samual/config_...
2011-12-04 mand1ngaMerge master
2011-11-29 terencehillMerge branch 'master' into terencehill/physics_panel_up...
2011-11-29 Mircea KitsuneMerge branch 'master' into mirceakitsune/sandbox
2011-11-23 terencehillMerge branch 'master' into terencehill/g_changeteam_ban...
2011-11-17 SamualMerge remote-tracking branch 'origin/master' into samua...
2011-11-16 Rudolf PolzerMerge branch 'master' into divVerent/csqcmodel
2011-11-16 Rudolf PolzerMerge remote-tracking branch 'origin/nifrek/framegroupsfix'
2011-11-15 Morphednew blood for humans, aliens and robots, new mg trail...
2011-03-01 Rudolf PolzerMerge remote-tracking branch 'origin/mrbougo/tooltips_fix'
2011-01-25 Maik MertenMerge branch 'master' of ssh://git.xonotic.org/xonotic...
2011-01-10 SamualMerge branch 'master' into samual/keepaway
2010-12-28 Rudolf PolzerMerge remote branch 'origin/fruitiex/bots'
2010-12-25 terencehillMerge branch 'master' into terencehill/newpanelhud
2010-12-18 mand1ngaMerge branch 'master' into mand1nga/bot-navigation...
2010-12-15 Rudolf Polzerget rid of the nex beam tga, nobody needs this any...
2010-10-22 Rudolf PolzerMerge remote branch 'refs/remotes/origin/ThePWTULN...
2010-10-20 terencehillMerge branch 'master' into terencehill/newpanelhud...
2010-10-19 Rudolf PolzerMerge remote branch 'refs/remotes/origin/tzork/turrets'
2010-10-19 Rudolf PolzerMerge remote branch 'refs/remotes/origin/mirceakitsune...
2010-10-16 Rudolf PolzerMerge remote branch 'origin/tzork/turrets'
2010-10-15 Rudolf PolzerMerge remote branch 'origin/master' into divVerent...
2010-10-14 terencehillMerge branch 'master' into terencehill/newpanelhud
2010-10-13 Rudolf PolzerMerge remote branch 'refs/remotes/origin/fruitiex/viewo...
2010-10-13 Rudolf PolzerMerge remote branch 'refs/remotes/origin/fruitiex/gakarmor'
2010-10-13 Rudolf PolzerMerge remote branch 'refs/remotes/origin/fruitiex/fruit...
2010-10-13 FruitieXchange color of lgbeam to match the electro blobs,...
2010-08-13 terencehillMerge branch 'master' into terencehill/newpanelhud...
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-04 FruitieXMerge branch 'terencehill/newpanelhud' into fruitiex...
2010-08-04 FruitieXMerge remote branch 'origin/master' into terencehill...
2010-08-04 Rudolf PolzerMerge remote branch 'refs/remotes/origin/fruitiex/dtghook'
2010-08-04 Rudolf PolzerMerge remote branch 'refs/remotes/origin/fruitiex/fruit...
2010-08-04 Rudolf PolzerMerge remote branch 'refs/remotes/origin/divVerent...
2010-08-04 FruitieXdietunichguten hook texture by Fusselkroete
2010-07-31 FruitieXMerge remote branch 'origin/master' into fruitiex/fruit...
2010-07-31 Rudolf Polzerbetter lgbeam texture
2010-07-29 Rudolf PolzerMerge commit '9805d7cf0ce8875950b667e16982fcecd02068ad'
2010-07-29 Rudolf PolzerMerge commit '3f5af11a8794a82f13d066452580dd8d0cc756bc'
2010-07-29 Rudolf PolzerMerge remote branch 'refs/remotes/origin/fruitiex/conback'
2010-07-24 Rudolf PolzerMerge remote branch 'origin/fruitiex/fruitbalance'
2010-07-24 FruitieXMerge branch 'fruitiex/newpanelhud' into fruitiex/newpa...
2010-07-24 FruitieXMerge remote branch 'origin/sev/newpanelhudskin' into...
2010-07-24 FruitieXMerge branch 'fruitiex/newpanelhud' into fruitiex/fruit...
2010-07-23 Rudolf PolzerMerge branch 'master' into divVerent/fruitbalance
2010-07-22 FruitieXMerge branch 'master' into fruitiex/fruitbalance
2010-07-22 FruitieXMerge remote branch 'origin/master' into fruitiex/fruit...
2010-07-21 Rudolf PolzerMerge branch 'master' into divVerent/fruitbalance
2010-07-21 Rudolf PolzerMerge remote branch 'origin/fruitiex/fruitbalance'...
2010-07-21 FruitieXMerge branch 'fruitiex/fruitbalance' of ssh://git.xonot...
2010-07-21 FruitieXlaser secondary gauntlet, lots of improvements to code
2010-07-21 FruitieXMerge branch 'master' into fruitiex/fruitbalance
2010-07-21 Rudolf PolzerMerge branch 'master' into fruitiex/fruitbalance
2010-07-20 FruitieXMerge branch 'master' into fruitiex/fruitbalance
2010-07-20 FruitieXnew lg beam, and use CHAN_WEAPON. However now the secon...
2010-07-19 Rudolf PolzerMerge branch 'divVerent/fruitbalance' of ssh://git...
2010-07-19 FruitieXlgbeam
2010-06-06 mand1ngaMerge branch 'mand1nga/rebrand' of ssh://git.xonotic...
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-10 Rudolf PolzerMerge branch 'master' into fruitiex/newpanelhud
2010-05-09 Rudolf PolzerMerge branch 'master' into mirceakitsune/per_character_...
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-08 Rudolf PolzerMerge commit 'origin/morphed/particles'
2010-05-08 Rudolf PolzerMerge branch 'master' into morphed/particles
2010-05-05 Morphednew particles effects
2010-05-04 Mircea KitsuneMerge branch 'master' into mirceakitsune/per_character_...
2010-05-04 Rudolf PolzerMerge remote branch 'origin/mirceakitsune/respawn_ghosts'
2010-04-28 Rudolf PolzerMerge branch 'master' of ssh://git.xonotic.org/xonotic...
2010-04-28 Rudolf Polzerupdated particlefont template
2010-03-18 xonoticinitial checkin from nexuiz svn r8756 initial