From: Rudolf Polzer Date: Tue, 30 Nov 2010 15:18:20 +0000 (+0100) Subject: Merge remote branch 'origin/fruitiex/freezetag_vs_keepaway' X-Git-Tag: xonotic-v0.1.0preview~22^2 X-Git-Url: http://git.xonotic.org/?a=commitdiff_plain;h=5b0b940c36dcaae99cb84e062230c5a1c6615a37;hp=36a9f8f6f7435ad0a417a3b5af50c976ff91d402;p=xonotic%2Fxonotic-maps.pk3dir.git Merge remote branch 'origin/fruitiex/freezetag_vs_keepaway' --- diff --git a/maps/g-23.mapinfo b/maps/g-23.mapinfo index 594d0365..b89a1f07 100644 --- a/maps/g-23.mapinfo +++ b/maps/g-23.mapinfo @@ -6,4 +6,6 @@ gametype dm gametype lms gametype arena gametype rune +gametype freezetag +gametype keepaway cdtrack 2 diff --git a/maps/glowplant.mapinfo b/maps/glowplant.mapinfo index 73100a20..a6457013 100644 --- a/maps/glowplant.mapinfo +++ b/maps/glowplant.mapinfo @@ -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 diff --git a/maps/red-planet.mapinfo b/maps/red-planet.mapinfo index 6fd9740f..b947d4d7 100644 --- a/maps/red-planet.mapinfo +++ b/maps/red-planet.mapinfo @@ -11,3 +11,5 @@ gametype arena gametype ca gametype dom gametype kh +gametype freezetag +gametype keepaway diff --git a/maps/stormkeep.mapinfo b/maps/stormkeep.mapinfo index 70a18670..8800827c 100644 --- a/maps/stormkeep.mapinfo +++ b/maps/stormkeep.mapinfo @@ -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