Merge branch 'martin-t/okc' into martin-t/okc2
[xonotic/xonotic-data.pk3dir.git] / scripts / ok_nade_counter.shader
2017-08-25 Martin TaibrMerge branch 'martin-t/okc' into martin-t/okc2
2017-08-25 Martin TaibrMerge branch 'master' into martin-t/okc
2017-08-25 MarioMerge branch 'martin-t/gunalign' into 'master'
2017-08-25 MarioMerge branch 'martin-t/insta' into 'master'
2017-08-25 MarioMerge branch 'marin-t/nadectr' into 'master'
2017-08-12 Martin Taibrremove `dppolygonoffset -6000` from nade countdown... 466/head
2015-01-20 terencehillMerge branch 'master' into terencehill/itemstime
2014-12-13 MarioMerge branch 'master' into mirceakitsune/player_cubemaps
2014-01-06 terencehillMerge branch 'master' into terencehill/hud_code_cleanup
2013-12-29 Samual LenksMerge remote-tracking branch 'origin/terencehill/color_...
2013-12-23 MarioMerge branch 'master' into terencehill/music_player
2013-10-11 Rudolf PolzerMerge remote-tracking branch 'origin/mirceakitsune...
2013-10-06 Samual LenksMerge remote-tracking branch 'origin/master' into samua...
2013-10-01 MarioMerge branch 'master' into Mario/respawn_delays
2013-09-16 terencehillMerge branch 'master' into terencehill/ca_ft_fixes
2013-09-12 Rudolf PolzerMerge remote-tracking branch 'origin/divVerent/merged...
2013-09-10 MarioMerge branch 'master' into Mario/quickmenu_merge
2013-09-04 DebuggerMerge branch 'master' into debugger/tdm_netscore
2013-08-31 terencehillMerge branch 'master' into terencehill/vehicles_fixes
2013-08-26 Samual LenksMerge remote-tracking branch 'origin/debugger/superspec...
2013-08-19 Samual LenksMerge remote-tracking branch 'origin/terencehill/HUD_co...
2013-08-19 Samual LenksMerge remote-tracking branch 'origin/terencehill/mapvot...
2013-08-19 Samual LenksMerge remote-tracking branch 'origin/zykure/playerstats...
2013-08-19 Samual LenksMerge remote-tracking branch 'origin/zykure/playerstats...
2013-08-18 Samual LenksMerge remote-tracking branch 'origin/terencehill/menu_f...
2013-08-18 Samual LenksMerge remote-tracking branch 'origin/master' into teren...
2013-08-18 Samual LenksMerge remote-tracking branch 'origin/master' into samua...
2013-08-16 MarioMerge branch 'master' into Mario/monsters
2013-08-15 MarioMerge branch 'master' into divVerent/4team_ctf
2013-08-14 Samual LenksMerge remote-tracking branch 'origin/master' into samua...
2013-08-09 Rudolf PolzerMerge branch 'master' of git://nl.git.xonotic.org/xonot...
2013-08-08 Samual LenksMerge remote-tracking branch 'origin/ablu/vehiclebalance'
2013-08-08 Samual LenksMerge remote-tracking branch 'origin/Mario/mutators'
2013-08-08 Samual LenksMerge remote-tracking branch 'origin/master' into Mario...
2013-07-12 MarioMerge branch 'master' into Mario/mutators
2013-06-25 MarioMerge branch 'master' into Mario/mutators
2013-06-11 MarioMerge branch 'master' into Mario/mutators
2013-06-11 MarioMerge branch 'Mario/nades_mutator' into Mario/mutators
2013-06-11 MarioMerge branch 'master' into Mario/nades_mutator
2013-06-05 MarioBegin making nades a separate mutator
2013-06-05 MarioMerge branch 'master' into Mario/rifle_arena
2013-06-05 MarioMerge branch 'master' into Mario/rifle_arena
2013-05-26 MarioMerge branch 'master' into Mario/rifle_arena
2013-05-03 MarioRemove duplicate content