From: FruitieX Date: Fri, 26 Nov 2010 12:04:07 +0000 (+0200) Subject: Merge remote branch 'origin/master' into fruitiex/freezetag_mapinfo X-Git-Tag: xonotic-v0.1.0preview~22^2^2~1 X-Git-Url: https://de.git.xonotic.org/?p=xonotic%2Fxonotic-maps.pk3dir.git;a=commitdiff_plain;h=a34e4566df6923ac2c27abe0cec5f021ec2e6dd1;hp=1844e22d4d312eb1e2897a6f2ad7841db9bf14e9 Merge remote branch 'origin/master' into fruitiex/freezetag_mapinfo Conflicts: maps/g-23.mapinfo --- diff --git a/maps/g-23.mapinfo b/maps/g-23.mapinfo index 594d0365..72ba59af 100644 --- a/maps/g-23.mapinfo +++ b/maps/g-23.mapinfo @@ -6,4 +6,5 @@ gametype dm gametype lms gametype arena gametype rune +gametype freezetag cdtrack 2 diff --git a/maps/glowplant.mapinfo b/maps/glowplant.mapinfo index 73100a20..18a46614 100644 --- a/maps/glowplant.mapinfo +++ b/maps/glowplant.mapinfo @@ -11,6 +11,7 @@ gametype lms gametype arena gametype ca gametype kh +gametype freezetag // 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..74b9ede6 100644 --- a/maps/red-planet.mapinfo +++ b/maps/red-planet.mapinfo @@ -11,3 +11,4 @@ gametype arena gametype ca gametype dom gametype kh +gametype freezetag diff --git a/maps/stormkeep.mapinfo b/maps/stormkeep.mapinfo index 70a18670..f684629f 100644 --- a/maps/stormkeep.mapinfo +++ b/maps/stormkeep.mapinfo @@ -11,6 +11,7 @@ gametype arena gametype rc gametype kh gametype ca +gametype freezetag cdtrack 5 // optional: fog density red green blue alpha mindist maxdist // optional: settemp_for_type (all|gametypename) cvarname value