Merge branch 'master' into terencehill/music_player
[xonotic/xonotic-data.pk3dir.git] / models / sprites / make-sprites.sh
2014-12-17 TimePathMerge branch 'master' into terencehill/music_player
2014-12-14 TimePathMerge remote-tracking branch 'origin/master' into TimeP...
2014-12-13 MarioMerge branch 'master' into mirceakitsune/player_cubemaps
2014-12-13 MarioMerge branch 'Mario/ctf_leadlimit' into 'master'
2014-12-13 MarioMerge branch 'master' into terencehill/insta_notifications
2014-12-13 MarioMerge branch 'terencehill/centerprint_panel_fix' into...
2014-12-13 MarioMerge branch 'terencehill/misc_cleanups' into 'master'
2014-12-13 TimePathMerge branch 'master' into TimePath/issue-1170
2014-12-11 MarioMerge remote-tracking branch 'origin/Mirio/credits'
2014-12-11 MarioMerge branch 'Mario/weapons_new'
2014-12-09 MarioMerge branch 'master' into Mario/weapons_new
2014-12-05 MarioMerge branch 'master' into Mario/weapons_new
2014-11-28 MarioMerge branch 'master' into Mario/weapons_new
2014-11-27 MarioMerge branch 'master' into Mario/weapons_new
2014-11-27 MarioRemove weapons from the old sprite script (we no longer...
2013-06-10 Samual LenksMerge remote-tracking branch 'origin/master' into samua...
2012-01-25 terencehillMerge branch 'master' into terencehill/clear_button
2012-01-09 Rudolf PolzerMerge remote-tracking branch 'origin/divVerent/allow...
2011-09-17 terencehillMerge branch 'master' into terencehill/menu_tooltips_2
2011-07-12 SamualMerge remote branch 'origin/master' into samual/updatec...
2011-07-12 SamualMerge remote branch 'origin/master' into samual/waypoin...
2011-05-19 terencehillMerge branch 'master' into terencehill/infinite_ammo
2011-05-14 Rudolf PolzerMerge remote-tracking branch 'origin/terencehill/fexists'
2011-05-13 Rudolf PolzerMerge remote branch 'origin/akari/freezetag-fixes'
2011-04-20 SamualMerge remote branch 'origin/master' into samual/flyings...
2011-04-11 FruitieXMerge remote-tracking branch 'origin/master' into teren...
2011-04-09 terencehillMerge branch 'master' into terencehill/screenshot_viewer
2011-04-03 mand1ngaMerge remote branch 'origin/morphed/hpitems'
2011-04-03 terencehillMerge branch 'master' into terencehill/newpanelhud
2011-04-01 Mircea KitsuneMerge branch 'master' into mirceakitsune/hud_postprocessing
2011-03-31 Mircea KitsuneMerge branch 'master' into mirceakitsune/event_chasecam
2011-03-31 Rudolf PolzerMerge remote branch 'origin/mirceakitsune/cvared_gib_he...
2011-03-31 Rudolf PolzerMerge remote branch 'origin/mand1nga/i18n-ES'
2011-03-30 sevMerge branch 'master' of ssh://git.xonotic.org/xonotic...
2011-03-30 SamualMerge remote branch 'origin/master' into sev/hudlayout
2011-03-30 SamualMerge remote branch 'origin/master' into samual/fixes_f...
2011-03-29 Jakob MGMerge master
2011-03-28 SamualMerge remote branch 'origin/master' into samual/mutator_ctf
2011-03-28 Rudolf PolzerMerge remote-tracking branch 'origin/samual/change_defa...
2011-03-24 SamualMerge remote branch 'origin/master' into samual/change_...
2011-03-23 Rudolf PolzerMerge branch 'master' into samual/change_default_balance
2011-03-21 SamualMerge branch 'samual/crylink_updates' into samual/chang...
2011-03-21 SamualMerge branch 'samual/seeker_updates' into samual/change...
2011-03-21 SamualMerge remote branch 'origin/master' into samual/seeker_...
2011-03-21 SamualChange the effect slightly for the seeker, and swap...
2011-03-01 Rudolf PolzerMerge remote-tracking branch 'origin/mrbougo/tooltips_fix'
2011-02-02 terencehillMerge branch 'master' into terencehill/screenshot_viewer
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-18 mand1ngaMerge branch 'master' into mand1nga/bot-navigation...
2010-12-15 terencehillMerge branch 'master' into terencehill/newpanelhud
2010-12-15 FruitieXMerge remote branch 'origin/terencehill/newpanelhud...
2010-12-15 FruitieXMerge branch 'master' into terencehill/newpanelhud
2010-12-13 Rudolf PolzerMerge branch 'master' of git://git.xonotic.org/xonotic...
2010-12-12 SamualMerge remote branch 'origin/master' into samual/keepaway
2010-12-12 Rudolf PolzerMerge remote branch 'origin/fruitiex/rzde_loadscreen'
2010-12-12 FruitieXMerge branch 'fruitiex/xpm' into fruitiex/ctsfix
2010-12-10 Rudolf PolzerMerge commit 'c5518de'
2010-12-10 Rudolf PolzerMerge commit '7b4c329'
2010-12-10 FruitieXMerge remote branch 'origin/fruitiex/ctsfix' into fruit...
2010-12-10 Rudolf PolzerMerge remote branch 'origin/terencehill/WEP_constants_f...
2010-12-10 Rudolf PolzerMerge remote branch 'origin/fruitiex/miscfixes' into...
2010-12-09 Rudolf PolzerMerge remote branch 'origin/terencehill/small_cleanup'
2010-12-09 FruitieXminelayer sprite
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 FruitieXMerge branch 'samual/keepaway' into fruitiex/freezetag_...
2010-11-30 FruitieXMerge branch 'master' into samual/keepaway
2010-11-30 Rudolf PolzerMerge remote branch 'origin/morphed/flag'
2010-11-29 unknownMerge remote branch 'origin/master' into samual/keepaway
2010-11-27 unknownMerge remote branch 'origin/master' into samual/keepaway
2010-11-27 unknownMerge remote branch 'origin/master' into samual/keepaway
2010-11-26 unknownMerge remote branch 'origin/master' into samual/keepaway
2010-11-25 unknownMerge remote branch 'origin/master' into samual/keepaway
2010-11-25 unknownMerge remote branch 'origin/master' into samual/keepaway
2010-11-23 unknownMerge remote branch 'origin/master' into samual/keepaway
2010-11-21 unknownMerge remote branch 'origin/master' into samual/keepaway
2010-11-20 unknownMerge remote branch 'origin/master' into samual/keepaway
2010-11-20 unknownMerge remote branch 'origin/master' into samual/keepaway
2010-11-20 unknownAlmost fully functioning now! Just a couple more things...
2010-11-17 terencehillMerge branch 'master' into terencehill/newpanelhud
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 FruitieXwaypoints for frozen teammates
2010-03-18 Rudolf Polzerrebrand nexuiz -> xonotic, will fix possible mess later
2010-03-18 xonoticinitial checkin from nexuiz svn r8756 initial