Merge branch 'master' of /var/cache/git/xonotic/xonotic

diff --git a/Docs/mapping.txt b/Docs/mapping.txt
index 6a120886718db2b2f6fc949017313c2cb48e627e..6b20652f7ce1b3b9978d98c4eebf10c28df73004 100644 (file)
--- a/Docs/mapping.txt
+++ b/Docs/mapping.txt
@@ -112,7 +112,7 @@ Gametype        | Syntax
 Deathmatch      | gametype dm [timelimit=...] [pointlimit=...] [leadlimit=...]                                             |\r
 Team Deathmatch | gametype tdm [timelimit=...] [pointlimit=...] [teams=...] [leadlimit=...]                                | 2, 3, or 4 teams\r
 Domination      | gametype dom [timelimit=...] [pointlimit=...] [teams=...] [leadlimit=...]                                | 2, 3, or 4 teams, only if map has no dom_team ents\r
-CTF             | gametype ctf [timelimit=...] [pointlimit=...] [caplimit=...] [leadlimit=...]                             | pointlimit if g_ctf_win_mode is 2, otherwise caplimit\r
+CTF             | gametype ctf [timelimit=...] [caplimit=...] [leadlimit=...]                                              |\r
 Runematch       | gametype rune [timelimit=...] [pointlimit=...] [leadlimit=...]                                           |\r
 LMS             | gametype lms [timelimit=...] [lives=...] [leadlimit=...]                                                 |\r
 Arena           | gametype arena [timelimit=...] [pointlinit=...] [leadlimit=...]                                          |\r
@@ -122,7 +122,9 @@ Onslaught       | gametype ons [timelimit=...]
 Race            | gametype rc [timelimit=...] [qualifying_timelimit=...] [laplimit=...] [teamlaplimit=...] [leadlimit=...] | g_race_teams: teamlaplimit is used instead of laplimit\r
 CTS             | gametype cts [timelimit=...] [skill=...]                                                                 | never uses points\r
 CA              | gametype ca [timelimit=...] [pointlimit=...] [leadlimit=...]                                             |\r
-Nexball         | gametype dm [timelimit=...] [pointlimit=...] [leadlimit=...]                                             |\r
+Nexball         | gametype nb [timelimit=...] [pointlimit=...] [leadlimit=...]                                             |\r
+Freeze Tag      | gametype ft [timelimit=...] [pointlimit=...] [teams=...] [leadlimit=...]                                 |\r
+Keepaway        | gametype ka [timelimit=...] [pointlimit=...]                                                             |\r
 \r
 \r
 ===============\r
@@ -202,6 +204,7 @@ Here is an example entry in a .ent file that includes colored text and 3 teams:
 "model" "models/domination/dom_red.md3"\r
 }\r
 {\r
+"classname" "dom_team"\r
 "netname" "^3Yellow Team"\r
 "cnt" "12"\r
 "noise" ""\r
@@ -209,6 +212,7 @@ Here is an example entry in a .ent file that includes colored text and 3 teams:
 "model" "models/domination/dom_yellow.md3"\r
 }\r
 {\r
+"classname" "dom_team"\r
 "netname" "^6Pink Team"\r
 "cnt" "9"\r
 "noise" ""\r