Merge branch 'master' into Mario/turrets
[xonotic/xonotic-data.pk3dir.git] / crosshairs.cfg
2015-04-14 MarioMerge branch 'master' into Mario/turrets
2015-03-06 Matthias Kr├╝gerMerge branch 'master' into matthiaskrgr/hudsetup
2015-02-09 Rudolf PolzerMerge remote-tracking branch 'origin/divVerent/crypto...
2015-02-04 MarioMerge branch 'sev/crosshairs_size' into 'master'
2015-02-03 Severin MeyerSlightly increase the default scale of the crosshairs
2015-02-03 terencehillMerge branch 'master' into terencehill/string_prefixes_...
2015-01-30 MarioMerge branch 'sev/luma_supplement' into 'master'
2015-01-30 MarioMerge branch 'sev/luma' into 'master'
2015-01-30 Mattia BasagliaMerge branch 'master' of ssh://gitlab.com/xonotic/xonot... 95/head
2015-01-24 terencehillMerge branch 'master' into terencehill/menu_optimizations
2015-01-23 MarioMerge branch 'sev/hud_weapon_panel' into 'master'
2015-01-23 MarioMerge branch 'sev/menu_play_char' into 'master'
2015-01-23 MarioMerge branch 'terencehill/cvar_updates' into 'master'
2015-01-20 MarioMerge branch 'master' into Mario/turrets
2015-01-12 terencehillImprove a few cvar descriptions
2015-01-12 terencehillAdd missing crosshair_ring_arc* to crosshairs.cfg so...
2015-01-11 Rudolf PolzerMerge remote-tracking branch 'origin/mrbougo/clonefixes'
2015-01-02 Severin MeyerMerge branch 'master' into sev/luma
2014-12-20 MarioMerge branch 'master' into Mario/notifications
2014-12-17 TimePathMerge branch 'master' into terencehill/music_player
2014-12-16 MarioMerge branch 'master' into Mario/overkill
2014-12-15 TimePathMerge branch 'master' into TimePath/issue-1170
2014-12-14 terencehillMerge branch 'master' into terencehill/eventchase
2014-12-14 terencehillMerge branch 'master' into terencehill/start_ammo
2014-12-14 MarioMerge branch 'TimePath/combined_updates' into 'master'
2014-12-14 TimePathMerge branch 'master' into TimePath/combined_updates
2014-12-14 TimePathMerge remote-tracking branch 'origin/master' into TimeP...
2014-12-14 TimePathMerge branch 'master' into TimePath/combined_updates
2014-12-14 nyovMerge branch 'master' into samual/combined_updates
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 Mario(Untested) Merge branch 'master' into Mario/overkill
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 MarioFix some cases of "nex"
2014-11-27 MarioMerge branch 'master' into Mario/weapons_new
2014-11-27 MarioMerge remote-tracking branch 'origin/master' into Mario...
2014-11-27 MarioMerge remote-tracking branch 'origin/master' into Mario...
2014-11-26 MarioMerge branch 'master' into Mario/weapons_new
2014-11-26 nyovMerge branch 'nyov/samual/combined_updates' into nyov...
2014-11-26 MarioWeapons branch reloaded
2014-11-25 nyovMerge branch 'master' into samual/combined_updates
2014-11-17 MarioMerge branch 'master' into samual/combined_updates
2014-11-14 MarioRevert "Merge branch 'Mario/despawn_effects'"
2014-11-14 MarioMerge branch 'Mario/despawn_effects'
2014-11-14 MarioMerge branch 'master' into Mario/despawn_effects
2014-11-14 MarioMerge branch 'master' into Mario/weapons
2014-10-16 Rudolf PolzerMerge branch 'master' into samual/weapons
2014-09-25 Rudolf PolzerMerge branch 'master' into samual/weapons
2014-06-15 MarioMerge branch 'master' into Mario/weapons
2014-04-07 Rudolf PolzerMerge branch 'master' into samual/weapons
2014-03-09 Samual LenksMerge remote-tracking branch 'origin/master' into samua...
2014-03-09 Samual LenksMerge remote-tracking branch 'origin/master into samual...
2014-02-26 Samual LenksMerge remote-tracking branch 'origin/master' into samua...
2014-02-26 Samual LenksMerge remote-tracking branch 'origin/master' into samua...
2014-02-17 Samual LenksMerge remote-tracking branch 'origin/master' into samua...
2014-02-16 Samual LenksMerge remote-tracking branch 'origin/master' into samua...
2014-01-26 Samual LenksMerge remote-tracking branch 'origin/master' into samua...
2014-01-25 Samual LenksMerge remote-tracking branch 'origin/master' into samua...
2014-01-24 Samual LenksMerge remote-tracking branch 'origin/master' into samua...
2014-01-13 Samual LenksMerge remote-tracking branch 'origin/master' into samua...
2014-01-06 MarioMerge branch 'master' into samual/weapons
2014-01-06 terencehillMerge branch 'master' into terencehill/hud_code_cleanup
2014-01-05 Samual LenksMerge remote-tracking branch 'origin/master' into samua...
2014-01-02 Samual LenksAdd TODO to crosshairs.cfg to fix crosshair rings later
2014-01-02 Samual LenksRemove per-weapon crosshairs from crosshairs.cfg
2014-01-01 Samual LenksMerge remote-tracking branch 'origin/master' into samua...
2013-12-29 Samual LenksMerge remote-tracking branch 'origin/terencehill/color_...
2013-12-23 MarioMerge branch 'master' into terencehill/music_player
2013-12-23 MarioRename nex to vortex
2013-12-05 Samual LenksMerge remote-tracking branch 'origin/master' into samua...
2013-11-26 Samual LenksMerge remote-tracking branch 'origin/zykure/playerstats...
2013-11-24 Samual LenksMerge remote-tracking branch 'origin/master' into samua...
2013-11-24 Samual LenksMerge remote-tracking branch 'origin/master' into samua...
2013-10-24 Samual LenksMerge branch 'samual/serverlist' into samual/combined_u...
2013-10-24 Samual LenksMerge remote-tracking branch 'origin/master' into samua...
2013-10-15 Samual LenksMerge remote-tracking branch 'origin/master' into samua...
2013-10-15 Samual LenksWorking on crosshair tab for game settings menu (plus...
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-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-21 MarioMerge branch 'master' into Mario/monsters
2013-08-20 Samual LenksMerge remote-tracking branch 'origin/master' into samua...
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...
next