Merge branch 'master' into Mario/ons_updates
authorMario <zacjardine@y7mail.com>
Sun, 2 Aug 2015 04:20:22 +0000 (14:20 +1000)
committerMario <zacjardine@y7mail.com>
Sun, 2 Aug 2015 04:20:22 +0000 (14:20 +1000)
commitfc2be4c1e7547ae97301f7966333e4dc858baf92
treed08119c7c4dc66ff21ae1154f763fbc648abf39b
parent9281dfd2d6431363c20f147e53a86480a99ca2df
parent09616f413d96c0436c5129cbcf78d95163fc1640
Merge branch 'master' into Mario/ons_updates

# Conflicts:
# qcsrc/client/hud.qc
# qcsrc/client/hud.qh
# qcsrc/client/main.qc
# qcsrc/common/constants.qh
# qcsrc/common/stats.qh
# qcsrc/server/autocvars.qh
# qcsrc/server/bot/havocbot/havocbot.qc
# qcsrc/server/mutators/gamemode_onslaught.qc
36 files changed:
defaultXonotic.cfg
gamemodes.cfg
qcsrc/client/autocvars.qh
qcsrc/client/command/cl_cmd.qc
qcsrc/client/hud.qc
qcsrc/client/hud.qh
qcsrc/client/hud_config.qc
qcsrc/client/hud_config.qh
qcsrc/client/main.qc
qcsrc/client/main.qh
qcsrc/client/mapvoting.qc
qcsrc/client/mapvoting.qh
qcsrc/client/progs.src
qcsrc/client/scoreboard.qc
qcsrc/client/teamradar.qc
qcsrc/client/teamradar.qh
qcsrc/client/view.qc
qcsrc/client/waypointsprites.qc
qcsrc/client/waypointsprites.qh
qcsrc/common/constants.qh
qcsrc/common/mapinfo.qh
qcsrc/common/notifications.qh
qcsrc/common/stats.qh
qcsrc/common/triggers/triggers.qh
qcsrc/server/autocvars.qh
qcsrc/server/bot/havocbot/role_onslaught.qc
qcsrc/server/bot/havocbot/roles.qc
qcsrc/server/g_damage.qc
qcsrc/server/g_world.qc
qcsrc/server/miscfunctions.qc
qcsrc/server/miscfunctions.qh
qcsrc/server/mutators/gamemode_onslaught.qc
qcsrc/server/mutators/gamemode_onslaught.qh
qcsrc/server/progs.src
qcsrc/server/teamplay.qc
qcsrc/server/waypointsprites.qc