Merge remote-tracking branch 'origin/divVerent/new-laser-by-morphed'
[xonotic/xonotic-data.pk3dir.git] / scripts / weapons.shader
2012-02-18 Rudolf PolzerMerge remote-tracking branch 'origin/divVerent/new...
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
2012-01-02 SamualMerge remote branch 'origin/master' into mirceakitsune...
2011-12-22 SamualMerge remote branch 'origin/master' into samual/config_...
2011-12-12 Rudolf PolzerMerge remote-tracking branch 'origin/terencehill/g_chan...
2011-12-12 Rudolf PolzerMerge remote-tracking branch 'origin/nifrek/hagar_own_t...
2011-12-12 Rudolf PolzerMerge remote-tracking branch 'origin/terencehill/m_togg...
2011-12-04 mand1ngaMerge master
2011-12-04 Rudolf PolzerMerge remote-tracking branch 'origin/mirceakitsune...
2011-12-04 Mircea KitsuneMerge branch 'master' into mirceakitsune/sandbox
2011-12-04 Rudolf PolzerMerge branch 'master' into divVerent/csqcmodel
2011-12-04 mand1ngaMerge remote-tracking branch 'origin/terencehill/hud_up...
2011-12-03 SamualMerge remote-tracking branch 'origin/master' into samua...
2011-12-03 Rudolf Polzerremove old minstanex textures :)
2011-09-07 Rudolf Polzernew laser model (needs testing)
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...
2010-12-28 Rudolf PolzerMerge remote branch 'origin/fruitiex/bots'
2010-12-15 FruitieXMerge remote branch 'origin/terencehill/newpanelhud...
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 'terencehill/newpanelhud' into terencehill...
2010-12-04 terencehillMerge branch 'master' into terencehill/crosshair_colors
2010-12-04 terencehillMerge notes, PLEASE READ:
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 Rudolf Polzermine layer: fix shader path :(
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 a dupe shader
2010-05-11 Rudolf Polzerget rid of redundant textures/ prefix in more shader...
2010-05-11 Morphedreflection shader for all weapons