Merge branch 'martin-t/okc' into martin-t/okc2
[xonotic/xonotic-data.pk3dir.git] / scripts / fireball.shader
2016-12-31 MarioMerge branch 'master' into Mirio/balance
2016-08-15 MarioMerge branch 'TimePath/globalforces' into 'master'
2016-08-06 TimePathMerge branch 'master' into TimePath/scoreboard_elo
2016-08-06 TimePathMerge branch 'TimePath/slist_refresh' into 'master'
2016-07-31 TimePathMerge branch 'master' into TimePath/physics
2016-07-25 terencehillMerge branch 'master' into terencehill/infomessages_pan...
2016-07-21 MarioMerge branch 'master' into Mario/showspecs
2016-07-13 MarioMerge branch 'master' into Mario/balance
2016-07-10 MarioMerge branch 'master' into Mario/teams_bitflag
2016-07-03 MarioMerge remote-tracking branch 'origin/Mario/gameover_fixes'
2016-07-03 MarioMerge remote-tracking branch 'origin/Mario/tweaks'
2016-07-03 MarioMerge remote-tracking branch 'origin/DefaultUser/ca_spe...
2016-06-28 MarioMerge branch 'Mario/fireball_merge' into 'master'
2016-06-24 MarioRestore a legacy branch (not currently working)
2010-08-09 FruitieXMerge branch 'master' into mirceakitsune/multijump
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-14 FruitieXMerge branch 'fruitiex/newpanelhud' of ssh://git.xonoti...
2010-05-13 Sahil SinghalMerge commit 'origin/master' into diabolik/ignisplayermodel
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-11 Rudolf Polzerget rid of redundant textures/ prefix in more shader...
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-04-28 Rudolf PolzerMerge remote branch 'origin/divVerent/bastet'
2010-04-27 Rudolf Polzerrename the shader files back to original names
2010-03-18 Rudolf Polzermove scripts and env into the maps repo, as they really...
2010-03-18 xonoticinitial checkin from nexuiz svn r8756 initial