Commit the rest of the new maps

diff --git a/data/defaultVT.cfg b/data/defaultVT.cfg
index 84dd0fd90743d9d6a2b7977da658edaa42cac6a1..2709f352db4d915a883c31250fd8861240462c43 100644 (file)
--- a/data/defaultVT.cfg
+++ b/data/defaultVT.cfg
@@ -441,7 +441,7 @@ set g_casings 1 "enable casings"
 set g_norecoil 0 "if set to 1 shooting weapons won't make you crosshair to move upwards (recoil)"\r
 set g_maplist_mostrecent "" "contains the name of the maps that were most recently played"\r
 seta g_maplist_mostrecent_count 3      "number of most recent maps that are blocked from being played again"\r
-seta g_maplist "voretemple gasolinepowered reslimed skycastle greatwall_overloaded basementctf brokenworld arahia stormkeep basement farewell greatwall_revisited soylent warfare ruiner desertfactory evilspace strength toxic racetrack cyberparcour"\r
+seta g_maplist "voretemple gasolinepowered reslimed skycastle greatwall_overloaded basementctf brokenworld arahia stormkeep basement farewell greatwall_revisited soylent warfare ruiner desertfactory evilspace strength toxic bleach dieselpower racetrack cyberparcour"\r
 seta g_maplist_index 0 "this is used internally for saving position in maplist cycle"\r
 seta g_maplist_selectrandom 0  "if 1, a random map will be chosen as next map - DEPRECATED in favor of g_maplist_shuffle"\r
 seta g_maplist_shuffle 1       "new randomization method: like selectrandom, but avoid playing the same maps in short succession. This works by taking out the first element and inserting it into g_maplist with a bias to the end of the list"\r

diff --git a/data/gfx/radar/bleach_radar.tga b/data/gfx/radar/bleach_radar.tga
new file mode 100644 (file)
index 0000000..4a532d2
Binary files /dev/null and b/data/gfx/radar/bleach_radar.tga differ

diff --git a/data/gfx/radar/dieselpower_radar.tga b/data/gfx/radar/dieselpower_radar.tga
new file mode 100644 (file)
index 0000000..23ffcec
Binary files /dev/null and b/data/gfx/radar/dieselpower_radar.tga differ

diff --git a/docs/Release notes.txt b/docs/Release notes.txt
index aad2434b49fa55b6ff3032456a0053dea8650195..b5a2794e4a191e821e3dbd235f9b6e3f92716af2 100644 (file)
--- a/docs/Release notes.txt
+++ b/docs/Release notes.txt
@@ -296,7 +296,7 @@ Features:
 \r
 - Improvements to the vixen mesh. Models have been switched from zym to iqm (better and newer format), polygon count has been doubled, stomach bulges are more detailed, and the vixens are a bit more chubby and fluffy.\r
 \r
-- 3 new Nexuiz maps, including race.\r
+- 5 new Nexuiz maps, including race.\r
 \r
 - Post-processing: Add a permenent cartoon effect to the menu, previously visible when having the Strength or Shield powerups. Instead, the effect is always visible now, but the cartoon lines are white instead of black while you own a powerup.\r
 \r

diff --git a/docs/TODO.txt b/docs/TODO.txt
index d41f26542a9709251456dc76c044459eec61c3fd..ea2f77c913bd479c434db6051afdbf91e9ad67a9 100644 (file)
--- a/docs/TODO.txt
+++ b/docs/TODO.txt
@@ -122,4 +122,6 @@
 \r
 - 0.7 | 0.8: Do the Desertfactory textures have metal footsteps where they need to?\r
 \r
-- 0.7 | 0.8: Port a few other maps I had in mind from Nexuiz.
\ No newline at end of file
+- 0.7 | 0.8: Port a few other maps I had in mind from Nexuiz.\r
+\r
+- 0.7: New waypoints.cache for all maps!
\ No newline at end of file

diff --git a/server/server.cfg b/server/server.cfg
index 14004d0d0e30d25b52db78618ac2c12d66e2c008..6d2843852349442b825ffe3676831312f1ee478a 100644 (file)
--- a/server/server.cfg
+++ b/server/server.cfg
@@ -18,7 +18,7 @@
 //log_file "server.log"        // server console output will also be copied to this file. This: "${serverconfig}.log" uses variable substitution to make the logfile have the same name as your config file with .log appended which is useful if you run several servers\r
 \r
 // List of maps to play on the server.  Set to "" to autodetect (which would enumerate ALL maps.  Maps that don't support the current game mode will be skipped, so you don't need to remove them here.\r
-//g_maplist "voretemple gasolinepowered reslimed skycastle greatwall_overloaded basementctf brokenworld arahia stormkeep basement farewell greatwall_revisited soylent warfare ruiner desertfactory evilspace strength toxic racetrack cyberparcour"\r
+//g_maplist "voretemple gasolinepowered reslimed skycastle greatwall_overloaded basementctf brokenworld arahia stormkeep basement farewell greatwall_revisited soylent warfare ruiner desertfactory evilspace strength toxic bleach dieselpower racetrack cyberparcour"\r
 //g_maplist_shuffle 1  // 0 always selects the next map out of g_maplist (but then better set g_maplist_votable 0 below to prevent repetitive votes), 1 will select random maps each time\r
 //g_maplist_mostrecent_count 3 // number of maps that have to be played before a map can be repeated\r
 \r