Merge remote branch 'origin/fruitiex/freezetag_vs_keepaway'
authorRudolf Polzer <divverent@alientrap.org>
Tue, 30 Nov 2010 15:18:20 +0000 (16:18 +0100)
committerRudolf Polzer <divverent@alientrap.org>
Tue, 30 Nov 2010 15:18:20 +0000 (16:18 +0100)
maps/g-23.mapinfo
maps/glowplant.mapinfo
maps/red-planet.mapinfo
maps/stormkeep.mapinfo

index 594d03656f62f735364108a1242ebe4af7abb107..b89a1f0775b929136496be37a83bf65e1f87c1c2 100644 (file)
@@ -6,4 +6,6 @@ gametype dm
 gametype lms
 gametype arena
 gametype rune
+gametype freezetag
+gametype keepaway
 cdtrack 2
index 73100a20aeafdd69a361fe8e30c16a0d69753ec9..a64570135401e043fea642bebd9f02272b8f347a 100644 (file)
@@ -11,6 +11,8 @@ gametype lms
 gametype arena
 gametype ca
 gametype kh
+gametype freezetag
+gametype keepaway
 // optional: fog density red green blue alpha mindist maxdist
 // optional: settemp_for_type (all|gametypename) cvarname value
 // optional: clientsettemp_for_type (all|gametypename) cvarname value
index 6fd9740f37d700ed83732ac66a6eeee24f523dbc..b947d4d7e9e332c867a898201078f213a840845a 100644 (file)
@@ -11,3 +11,5 @@ gametype arena
 gametype ca
 gametype dom
 gametype kh
+gametype freezetag
+gametype keepaway
index 70a18670dd9f5522e03438ab9d166db94d29585f..8800827c7cdcd2231bcbcdb70c1e9f73831ad0aa 100644 (file)
@@ -11,6 +11,8 @@ gametype arena
 gametype rc
 gametype kh
 gametype ca
+gametype freezetag
+gametype keepaway
 cdtrack 5
 // optional: fog density red green blue alpha mindist maxdist
 // optional: settemp_for_type (all|gametypename) cvarname value