Merge branch 'master' into fruitiex/mapinfo_improvements

diff --git a/maps/dance.mapinfo b/maps/dance.mapinfo
index 32b6298332a0ca77cb9784de7baf27ed69082d4c..753f75c7d4099df48eeeddef84e8c7057a9644f6 100644 (file)
--- a/maps/dance.mapinfo
+++ b/maps/dance.mapinfo
@@ -1,6 +1,6 @@
-title FIXME
-description FIXME
-author FIXME
+title Dance
+description Very open, small sized CTF map floating above an ocean.
+author ..., FruitieX
 cdtrack 3
 has weapons
 gametype ctf

diff --git a/maps/dance.tga b/maps/dance.tga
new file mode 100644 (file)
index 0000000..e372358
Binary files /dev/null and b/maps/dance.tga differ

diff --git a/maps/g-23.mapinfo b/maps/g-23.mapinfo
index 8538a65dc7e83becb2870852ac97289a064cd50d..9e43f359cd2ab3370b490605c37e80fc857650f3 100644 (file)
--- a/maps/g-23.mapinfo
+++ b/maps/g-23.mapinfo
@@ -6,5 +6,4 @@ gametype dm
 gametype lms
 gametype arena
 gametype rune
-gametype kh
 cdtrack 6

diff --git a/maps/nexballarena.mapinfo b/maps/nexballarena.mapinfo
new file mode 100644 (file)
index 0000000..40667a5
--- /dev/null
+++ b/maps/nexballarena.mapinfo
@@ -0,0 +1,5 @@
+title Nexball Arena
+description Small, simple, enclosed arena for finding out who's the true nexball champion! No obstacles in the way...
+author Revenant, Cortez, tZork, CuBe0wL, FruitieX
+cdtrack 4
+gametype nexball

diff --git a/maps/nexballarena.tga b/maps/nexballarena.tga
new file mode 100644 (file)
index 0000000..f6bd23c
Binary files /dev/null and b/maps/nexballarena.tga differ

diff --git a/maps/space-elevator.mapinfo b/maps/space-elevator.mapinfo
index 0498f818ae06478f5ba9b473c682c0864b7b34f3..f31852ae5dbd518b551b11ca28bdf6f2a19b2ef5 100644 (file)
--- a/maps/space-elevator.mapinfo
+++ b/maps/space-elevator.mapinfo
@@ -1,11 +1,6 @@
 title Space Elevator
-description <DESCRIPTION>
-author FruitieX & Cuinnton
+description Medium sized CTF space floater
+author FruitieX, Cuinnton
 has weapons
-type ctf 300 20 10 0
+type ctf
 cdtrack jumpinginspace
-// 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
-// optional: size mins_x mins_y mins_z maxs_x maxs_y maxs_z
-// optional: hidden

diff --git a/maps/space-elevator.tga b/maps/space-elevator.tga
new file mode 100644 (file)
index 0000000..09999db
Binary files /dev/null and b/maps/space-elevator.tga differ

diff --git a/maps/stormkeep.mapinfo b/maps/stormkeep.mapinfo
index f26dd789f28fc7b7e35d0999545b8e8b6fbce4b4..70a18670dd9f5522e03438ab9d166db94d29585f 100644 (file)
--- a/maps/stormkeep.mapinfo
+++ b/maps/stormkeep.mapinfo
@@ -1,5 +1,5 @@
 title Stormkeep
-description <DESCRIPTION>
+description Medium sized indoors map, well suited for team games.
 author ..., FruitieX
 has weapons
 gametype dm