Merge branch 'master' into martin-t/globals
[xonotic/xonotic-data.pk3dir.git] / qcsrc / common / campaign_setup.qc
2017-01-28 MarioMerge branch 'master' into Mario/overkill
2016-12-31 MarioMerge branch 'master' into Mirio/balance
2016-09-01 MarioMerge branch 'DefaultUser/gametype_votescreen' into...
2016-08-22 terencehillMerge branch 'master' into terencehill/hud_updates 353/head
2016-08-22 MarioMerge branch 'master' into terencehill/spectatee_status... 354/head
2016-08-21 MarioMerge branch 'master' into Mario/entcs
2016-08-21 TimePathMerge branch 'TimePath/modules'
2016-08-21 TimePathEnsure headers are always #included
2016-06-14 MarioMerge branch 'master' into Mario/balance
2016-06-12 MarioMerge branch 'master' into Mario/showspecs
2015-10-21 terencehillMerge branch 'master' into terencehill/menu_gametype_to... 243/head
2015-10-15 TimePathMerge branch 'terencehill/slider_drag_fix' into 'master'
2015-10-14 terencehillMerge branch 'master' into terencehill/hud_cleanups
2015-10-13 terencehillMerge branch 'master' into terencehill/tooltips_cleanup 230/head
2015-10-11 TimePathMerge branch 'master' into TimePath/deathtypes 234/head
2015-10-11 TimePathMerge branch 'TimePath/cleanup'
2015-10-09 TimePath#includes: cleanup
2015-05-10 MarioMerge branch 'master' into terencehill/itemstime
2015-04-14 MarioMerge branch 'master' into Mario/vaporizer_damage
2015-04-14 MarioMerge branch 'master' into Mario/showspecs
2015-04-14 MarioMerge branch 'master' into Mario/turrets
2015-03-06 Matthias Kr├╝gerMerge branch 'master' into matthiaskrgr/hudsetup
2015-02-24 MarioMerge branch 'master' into Mario/vehicles
2015-02-17 MarioMerge branch 'TimePath/experiments/csqc_prediction...
2015-02-09 Rudolf PolzerMerge remote-tracking branch 'origin/divVerent/crypto...
2015-02-05 MarioMerge branch 'master' into Mario/physics
2015-02-03 terencehillMerge branch 'master' into terencehill/quickmenu
2015-02-03 MarioMerge branch 'Mirio/credits' into 'master'
2015-02-03 MarioMerge branch 'master' into Mario/ons_updates
2015-02-03 terencehillMerge branch 'master' into terencehill/string_prefixes_...
2015-02-02 terencehillMerge branch 'master' into terencehill/weapon_panel_fix
2015-02-02 MarioMerge branch 'master' into Mario/ctf_updates
2015-02-02 TimePathMerge remote-tracking branch 'origin/TimePath/experimen...
2015-02-02 TimePathMerge branch 'master' into TimePath/experiments/csqc_pr...
2015-02-02 MarioMerge branch 'Mario/qc_updates' into 'master'
2015-02-02 TimePathMerge branch 'master' into Mario/qc_updates
2015-01-30 TimePathMerge branch 'Mario/qc_updates' into TimePath/csqc_pred...
2015-01-29 TimePathDeclare more ints as ints
2015-01-29 TimePathRename defs to qh
2015-01-29 TimePath#include this
2013-06-10 Samual LenksMerge remote-tracking branch 'origin/master' into samua...
2013-05-22 Samual LenksMerge remote-tracking branch 'origin/master' into samua...
2012-05-04 terencehillMerge branch 'master' into terencehill/quickmenu
2012-02-29 SamualMerge remote branch 'origin/terencehill/minstagib_outof...
2012-02-27 terencehillMerge branch 'master' into terencehill/color_picker_carets
2012-02-26 SamualMerge remote branch 'origin/terencehill/physics_panel_u...
2012-02-18 Rudolf PolzerMerge remote-tracking branch 'origin/divVerent/new...
2012-02-08 SamualMerge remote branch 'origin/master' into samual/mutator_ctf
2012-02-04 terencehillMerge branch 'master' into terencehill/screenshot_viewer
2012-01-29 terencehillMerge branch 'master' into terencehill/cursormode
2012-01-25 terencehillMerge branch 'master' into terencehill/clear_button
2012-01-09 Rudolf PolzerMerge remote-tracking branch 'origin/divVerent/allow...
2012-01-09 Rudolf PolzerMerge remote-tracking branch 'origin/divVerent/waypoint...
2012-01-07 nyovMerge branch 'master' into nyov/dedicated-startupscreen
2012-01-05 Rudolf PolzerMerge remote-tracking branch 'origin/terencehill/hud_sk...
2012-01-05 Rudolf PolzerMerge remote-tracking branch 'origin/nifrek/duckanims'
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-31 terencehillMerge branch 'master' into terencehill/itemstime
2011-12-28 Jakob MGMerge remote-tracking branch 'origin/master' into tzork...
2011-12-23 Rudolf PolzerMerge branch 'master' of git://de.git.xonotic.org/xonot...
2011-12-23 SamualMerge remote branch 'origin/master' into samual/updatec...
2011-12-23 Rudolf Polzerfix maxplayers etc. in +serverconfig
2010-03-18 xonoticinitial checkin from nexuiz svn r8756 initial