New songs from opengameart.org, used by some existing maps. Also a new menu song

diff --git a/data/defaultVT.cfg b/data/defaultVT.cfg
index 8fd8e185cb9db7e3977a47a7ca7fc4f218fd1624..daa64acd3edb5d1e7224b7ba4237cfcfdadfe5ba 100644 (file)
--- a/data/defaultVT.cfg
+++ b/data/defaultVT.cfg
@@ -1263,13 +1263,13 @@ alias sethostname "set menu_use_default_hostname 0; hostname $*"
 set sv_foginterval 0\r
 \r
 // Audio track names (for old-style "cd loop NUMBER" usage)\r
-set g_cdtracks_remaplist "feeding_frenzy digital-pursuit brokenlight ninesix sixtyfour_revisited infiltrator stone_fortress high_tech_lab space_walk meltdown inner-peace out-there neon variable quiet boss_theme ghost-town" "list used by mapinfo system to automatically assign cdtracks - must match the cd remap command"\r
+set g_cdtracks_remaplist "dark_intro feeding_frenzy digital-pursuit brokenlight ninesix sixtyfour_revisited infiltrator contemplation covert_operations determination stone_fortress high_tech_lab attack space_walk meltdown inner-peace out-there echelon techno_geek neon variable quiet boss_theme ghost-town" "list used by mapinfo system to automatically assign cdtracks - must match the cd remap command"\r
 set g_cdtracks_dontusebydefault "" "list used by mapinfo system to automatically assign cdtracks - must be a subset of g_cdtracks_remaplist"\r
 cd remap $g_cdtracks_remaplist\r
 seta cl_intermission 1 "play intermission music"\r
 seta cl_intermission_cdtrack_win "win_music"\r
 seta cl_intermission_cdtrack_lose "lose_music"\r
-seta menu_cdtrack feeding_frenzy\r
+seta menu_cdtrack dark_intro\r
 \r
 // maxidle (in seconds): kick players idle for more than that amount of time\r
 set sv_maxidle 0\r

diff --git a/data/maps/greatwall_overloaded.mapinfo b/data/maps/greatwall_overloaded.mapinfo
index 72de4c03cd3d4f63e6179066c81d5b73fc2758ad..3842ed2e2036105c45862ca2b590aeb6a065ba83 100644 (file)
--- a/data/maps/greatwall_overloaded.mapinfo
+++ b/data/maps/greatwall_overloaded.mapinfo
@@ -5,4 +5,4 @@ has weapons
 type ctf 300 20
 type ons 20
 type rpg 0
-cdtrack inner-peace
+cdtrack determination

diff --git a/data/maps/greatwall_revisited.mapinfo b/data/maps/greatwall_revisited.mapinfo
index b5c335b1179806a9fdcb9c1c298f7dcf6b1420f2..08ed930d06de12701cf619fbc0eb032e2853bf79 100644 (file)
--- a/data/maps/greatwall_revisited.mapinfo
+++ b/data/maps/greatwall_revisited.mapinfo
@@ -4,4 +4,4 @@ author FruitieX
 has weapons
 type ctf 300 20 10
 type rpg 0
-cdtrack meltdown
+cdtrack inner_peace

diff --git a/data/maps/reslimed.mapinfo b/data/maps/reslimed.mapinfo
index f46ee6a43563a2ffc632dc19b260eeb90ad71866..45a8acf74b2a944f6946309dfdbf3369fb8610e7 100644 (file)
--- a/data/maps/reslimed.mapinfo
+++ b/data/maps/reslimed.mapinfo
@@ -9,4 +9,4 @@ type lms 9 20
 type kh 1000 20 3\r
 type ca 10 20\r
 type rpg 0\r
-cdtrack sixtyfour_revisited\r
+cdtrack echelon\r

diff --git a/data/maps/soylent.mapinfo b/data/maps/soylent.mapinfo
index a579ea19a9afe8d8c3fe35054ba32904844d114e..93299f4574152d8afb62f257c0fd3ee203e6c6c9 100644 (file)
--- a/data/maps/soylent.mapinfo
+++ b/data/maps/soylent.mapinfo
@@ -10,4 +10,4 @@ type kh 1000 20 3
 type arena 10 20\r
 type ca 10 20\r
 type rpg 0\r
-cdtrack space_walk\r
+cdtrack attack\r

diff --git a/data/sound/cdtracks/attack.ogg b/data/sound/cdtracks/attack.ogg
new file mode 100644 (file)
index 0000000..00f98ab
Binary files /dev/null and b/data/sound/cdtracks/attack.ogg differ

diff --git a/data/sound/cdtracks/contemplation.ogg b/data/sound/cdtracks/contemplation.ogg
new file mode 100644 (file)
index 0000000..d8532e0
Binary files /dev/null and b/data/sound/cdtracks/contemplation.ogg differ

diff --git a/data/sound/cdtracks/covert_operations.ogg b/data/sound/cdtracks/covert_operations.ogg
new file mode 100644 (file)
index 0000000..ba89aca
Binary files /dev/null and b/data/sound/cdtracks/covert_operations.ogg differ

diff --git a/data/sound/cdtracks/dark_intro.ogg b/data/sound/cdtracks/dark_intro.ogg
new file mode 100644 (file)
index 0000000..68ec783
Binary files /dev/null and b/data/sound/cdtracks/dark_intro.ogg differ

diff --git a/data/sound/cdtracks/determination.ogg b/data/sound/cdtracks/determination.ogg
new file mode 100644 (file)
index 0000000..cc3dbb1
Binary files /dev/null and b/data/sound/cdtracks/determination.ogg differ

diff --git a/data/sound/cdtracks/echelon.ogg b/data/sound/cdtracks/echelon.ogg
new file mode 100644 (file)
index 0000000..d9f3735
Binary files /dev/null and b/data/sound/cdtracks/echelon.ogg differ

diff --git a/data/sound/cdtracks/techno_geek.ogg b/data/sound/cdtracks/techno_geek.ogg
new file mode 100644 (file)
index 0000000..0ee2d7f
Binary files /dev/null and b/data/sound/cdtracks/techno_geek.ogg differ

diff --git a/data/voretournament-credits.txt b/data/voretournament-credits.txt
index 289ab92a019ec147b5bba1887f19f019bb7607b8..ee4974bf9095c25fb1117e024288000b30628b1b 100644 (file)
--- a/data/voretournament-credits.txt
+++ b/data/voretournament-credits.txt
@@ -242,4 +242,49 @@ http://opengameart.org/user/63
 *Lose music\r
 http://opengameart.org/content/lose-music-2\r
 remaxim\r
-http://opengameart.org/user/63
\ No newline at end of file
+http://opengameart.org/user/63\r
+\r
+*Contemplation\r
+http://opengameart.org/content/contemplation\r
+bart\r
+http://opengameart.org/user/1\r
+\r
+*Covert Operations\r
+http://opengameart.org/content/covert-operations\r
+artisticdude\r
+http://opengameart.org/user/251\r
+\r
+*Determination\r
+http://opengameart.org/content/determination\r
+artisticdude\r
+http://opengameart.org/user/251\r
+\r
+*Attack\r
+http://opengameart.org/content/attack-music-futuristic-pop\r
+p0ss\r
+http://opengameart.org/user/877\r
+\r
+*Echelon\r
+http://opengameart.org/content/echelon-music-futuristic\r
+p0ss\r
+http://opengameart.org/user/877\r
+\r
+*I wouldn't\r
+http://opengameart.org/content/i-wouldnt-music-futuristic-daft-punky\r
+p0ss\r
+http://opengameart.org/user/877\r
+\r
+*tEcHNo gEeK\r
+http://opengameart.org/content/techno-geek\r
+mrpoly\r
+http://opengameart.org/user/413\r
+\r
+*Xeon Theme Remastered\r
+http://opengameart.org/content/xeon-theme-remastered\r
+bart\r
+http://www.opengameart.org/user/1\r
+\r
+*Dark Intro\r
+http://opengameart.org/content/a-dark-and-desperate-intro\r
+anonymous fix\r
+http://opengameart.org/user/787\r

diff --git a/misc/source/media/music/contemplation.flp b/misc/source/media/music/contemplation.flp
new file mode 100644 (file)
index 0000000..805a4f6
Binary files /dev/null and b/misc/source/media/music/contemplation.flp differ