Merge branch 'Mario/bd_tweak' into 'master'
[xonotic/xonotic-data.pk3dir.git] / scripts / monsters.shader
2015-03-06 Matthias Kr├╝gerMerge branch 'master' into matthiaskrgr/hudsetup
2015-01-20 terencehillMerge branch 'master' into terencehill/itemstime
2014-12-20 MarioMerge branch 'master' into Mario/notifications
2014-12-17 TimePathMerge branch 'master' into terencehill/music_player
2014-12-13 MarioMerge branch 'master' into mirceakitsune/player_cubemaps
2014-11-13 MarioMerge branch 'master' into Mario/domination_roundbased
2014-06-04 Rudolf PolzerMerge remote-tracking branch 'origin/Mario/hook_refire'
2014-03-20 MarioMerge branch 'master' into Mario/turrets
2014-03-20 MarioMerge branch 'master' into Mario/vehicles
2014-02-26 Samual LenksMerge remote-tracking branch 'origin/Mario/train_fix'
2014-02-26 Samual LenksMerge remote-tracking branch 'origin/Mario/teams_override'
2014-02-26 Samual LenksMerge remote-tracking branch 'origin/sev/waypointarrow'
2014-01-30 terencehillMerge branch 'master' into terencehill/hud_code_cleanup
2014-01-30 terencehillMerge branch 'master' into terencehill/hud_fixes
2014-01-28 MarioMerge branch 'master' into Mario/spawnsystem_mutator
2014-01-28 MarioMerge branch 'master' into Mario/overkill
2014-01-28 MarioMerge branch 'master' into Mario/nade_drop
2014-01-28 MarioMerge branch 'master' into divVerent/4team_ctf
2014-01-27 MarioMerge branch 'master' into Mario/showspecs
2014-01-25 Samual LenksMerge remote-tracking branch 'origin/master' into samua...
2014-01-21 terencehillMerge branch 'master' into terencehill/quickmenu_UPDATE
2014-01-18 Rudolf PolzerMerge branch 'master' of git://nl.git.xonotic.org/xonot...
2014-01-13 Samual LenksMerge remote-tracking branch 'origin/master' into samua...
2014-01-06 MarioMerge branch 'master' into samual/weapons
2014-01-06 Samual LenksMerge remote-tracking branch 'origin/Mario/monsters'
2014-01-06 MarioMerge branch 'master' into Mario/monsters
2014-01-01 Samual LenksMerge remote-tracking branch 'origin/master' into Mario...
2013-12-20 MarioMerge branch 'master' into Mario/monsters
2013-12-03 MarioMerge branch 'master' into Mario/monsters
2013-11-03 MarioMerge branch 'master' into Mario/monsters
2013-10-18 MarioMerge branch 'master' into Mario/monsters
2013-10-12 MarioRemove disabled monsters (they don't fit very well...
2013-10-12 MarioMerge branch 'master' into Mario/monsters
2013-10-02 MarioMerge branch 'master' into Mario/monsters
2013-10-01 MarioMerge branch 'master' into Mario/monsters
2013-09-28 MarioMerge branch 'master' into Mario/monsters
2013-09-15 MarioMerge branch 'master' into Mario/monsters
2013-09-04 MarioMerge branch 'master' into Mario/monsters
2013-08-30 MarioMerge branch 'master' into Mario/monsters
2013-08-29 MarioMerge branch 'master' into Mario/monsters
2013-08-28 MarioMerge branch 'master' into Mario/monsters
2013-08-21 MarioMerge branch 'master' into Mario/monsters
2013-08-16 MarioMerge branch 'master' into Mario/monsters
2013-08-04 MarioMerge branch 'master' into Mario/monsters
2013-07-11 MarioMerge branch 'master' into Mario/monsters
2013-06-25 MarioMerge branch 'master' into Mario/monsters
2013-06-16 MarioMerge branch 'master' into Mario/monsters
2013-06-14 MarioMerge branch 'master' into Mario/monsters
2013-06-12 MarioMerge branch 'master' into Mario/monsters
2013-06-05 MarioMerge branch 'master' into Mario/monsters
2013-06-04 MarioMerge branch 'master' into Mario/monsters
2013-06-01 MarioMerge branch 'master' into Mario/monsters
2013-05-31 MarioMerge branch 'master' into Mario/monsters
2013-05-30 MarioMerge branch 'master' into Mario/monsters
2013-05-26 MarioMerge branch 'master' into Mario/monsters
2013-05-15 MarioMerge branch 'master' into Mario/monsters
2013-05-14 MarioMerge branch 'master' into Mario/monsters
2013-05-11 MarioMerge branch 'master' into Mario/monsters
2013-05-10 MarioMerge branch 'master' into Mario/monsters
2013-05-07 MarioMerge branch 'master' into Mario/monsters
2013-05-06 MarioMerge branch 'master' into Mario/monsters
2013-04-30 MarioMerge branch 'master' into Mario/monsters
2013-04-28 MarioMerge branch 'master' into Mario/monsters
2013-04-26 MarioAdd a new model for tarbaby
2013-04-22 MarioMerge branch 'master' into Mario/monsters
2013-04-13 MarioBig load of updates (attempted CSQC monsters)