]> git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
projects / xonotic / xonotic-data.pk3dir.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 51cf85e 2cabbcd)
Merge branch 'Lyberta/TeamplayOverhaul2' into 'master'
authorMario <zacjardine@y7mail.com>
Fri, 7 Sep 2018 19:12:55 +0000 (19:12 +0000)
committerMario <zacjardine@y7mail.com>
Fri, 7 Sep 2018 19:12:55 +0000 (19:12 +0000)
Teamplay overhaul - step 2

Closes #1982 and #2071

See merge request xonotic/xonotic-data.pk3dir!581

1  2 
qcsrc/server/client.qc patch | diff1 | diff2 | blob | history
qcsrc/server/command/cmd.qc patch | diff1 | diff2 | blob | history

diff --cc qcsrc/server/client.qc
Simple merge
diff --cc qcsrc/server/command/cmd.qc
Simple merge