Merge branch 'master' into terencehill/centerprint_stuff

Conflicts:
	qcsrc/client/hud.qc

diff --cc qcsrc/client/View.qc
Simple merge

diff --cc qcsrc/client/autocvars.qh
Simple merge

diff --cc qcsrc/client/hud.qc
index d5ad7c8a09c1c255b367acd1b69a1503ac7c7246,a737c82d25cdfaab7b7992eda002ffd3f15523ed..af73ae20c75b3ff9e15e46a9be00dc0de43ccef5
--- 1/qcsrc/client/hud.qc
--- 2/qcsrc/client/hud.qc
+++ b/qcsrc/client/hud.qc
@@@ -1855,9 -2034,9 +1855,9 @@@ void HUD_Centerprint(string s1, string 
        } else if(msg == MSG_KILL) {
                if (type == KILL_TEAM_RED || type == KILL_TEAM_BLUE) {
                        if(gentle) {
-                               centerprint(strcat(sprintf(_("^1Moron! You went against %s, a team mate!"), s1)));
 -                              centerprint(strcat(DAMAGE_CENTERPRINT_SPACER, sprintf(_("^1Moron! You went against ^7%s^1, a team mate!"), s1)));
++                              centerprint(strcat(sprintf(_("^1Moron! You went against ^7%s^1, a team mate!"), s1)));
                        } else {
-                               centerprint(strcat(sprintf(_("^1Moron! You fragged %s, a team mate!"), s1)));
 -                              centerprint(strcat(DAMAGE_CENTERPRINT_SPACER, sprintf(_("^1Moron! You fragged ^7%s^1, a team mate!"), s1)));
++                              centerprint(strcat(sprintf(_("^1Moron! You fragged ^7%s^1, a team mate!"), s1)));
                        }
                } else if (type == KILL_FIRST_BLOOD) {
                        if(gentle) {

diff --cc qcsrc/server/arena.qc
Simple merge

diff --cc qcsrc/server/cl_client.qc
Simple merge