Remaining parts of the new maps

diff --git a/data/defaultVT.cfg b/data/defaultVT.cfg
index 5c90a8f6bd68c9896cbca1e88b49c210c225feba..ee55db0c99c748b77036650c9108d58098099772 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 bleach dieselpower 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 aneurysm bloodprison bloodprisonctf 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/aneurysm_radar.tga b/data/gfx/radar/aneurysm_radar.tga
new file mode 100644 (file)
index 0000000..3e7274d
Binary files /dev/null and b/data/gfx/radar/aneurysm_radar.tga differ

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

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

diff --git a/docs/Release notes.txt b/docs/Release notes.txt
index 6f666cdfc87232df4d779f0b8a477307c2f4a981..c5315827caa21f642bcb2002a31a2a0b1e6f4d21 100644 (file)
--- a/docs/Release notes.txt
+++ b/docs/Release notes.txt
@@ -300,7 +300,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
-- 5 new Nexuiz maps, including race.\r
+- 8 new Nexuiz maps, including Race and CTF.\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 72c537fcd2dcf96fce72e3ed9fb956fbfd9b7e56..f0cf62e918ca2a56bf527fbea06f8a2da343cbaa 100644 (file)
--- a/docs/TODO.txt
+++ b/docs/TODO.txt
@@ -40,7 +40,7 @@
 \r
 - 0.8: Make a balancing settings menu\r
 \r
-- 0.7 | 0.8: Skill based damage for bots?\r
+- 0.7: Skill based damage for bots.\r
 \r
 - 0.8: Sort the credits better\r
 \r
@@ -136,4 +136,6 @@
 \r
 - 0.7: Make sure all effects work for spectators too (such as the macro earthquake effect)\r
 \r
-- 0.7 | 0.8: The stomach gurgle sound duration does not match the pitch properly
\ No newline at end of file
+- 0.7 | 0.8: The stomach gurgle sound duration does not match the pitch properly\r
+\r
+- 0.7: Some maps use cdtrack while others use track names. Fix this.
\ No newline at end of file

diff --git a/server/server.cfg b/server/server.cfg
index 6d2843852349442b825ffe3676831312f1ee478a..b7f5f8069b5dc58ee1e3d1926bb6725716a7c28b 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 bleach dieselpower 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 aneurysm bloodprison bloodprisonctf 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