The song Total Meltdown by Sc0rp. Also add new shader to shaderlist.txt

diff --git a/data/defaultVoretournament.cfg b/data/defaultVoretournament.cfg
index 5f14380c7793c345c0d8f27ed5269771d862664d..0b05436e067b01fabc64d84a524722ec5927e4dd 100644 (file)
--- a/data/defaultVoretournament.cfg
+++ b/data/defaultVoretournament.cfg
@@ -1211,7 +1211,7 @@ 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 boss_theme" "list used by mapinfo system to automatically assign cdtracks - must match the cd remap command"\r
+set g_cdtracks_remaplist "feeding_frenzy digital-pursuit brokenlight ninesix sixtyfour_revisited infiltrator stone_fortress high_tech_lab space_walk meltdown boss_theme" "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
 set sv_intermission_cdtrack ""\r

diff --git a/data/scripts/shaderlist.txt b/data/scripts/shaderlist.txt
index e7a8386eba57fc1f578ebac9fbf35cd2149a5929..30ff9b2f2ee252ab679ee398c586bbb50f7a38ef 100644 (file)
--- a/data/scripts/shaderlist.txt
+++ b/data/scripts/shaderlist.txt
@@ -62,4 +62,5 @@ tutorial
 tznex01\r
 water\r
 mirceakitsune\r
-artwork
\ No newline at end of file
+artwork\r
+gasolinepowered
\ No newline at end of file

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

diff --git a/data/voretournament-credits.txt b/data/voretournament-credits.txt
index 45906edb5495fd642b29a1b3d20f4bdd2d887abf..ab3adcda5ba69b795580d00fe76ba33e91f551fd 100644 (file)
--- a/data/voretournament-credits.txt
+++ b/data/voretournament-credits.txt
@@ -120,4 +120,9 @@ http://www.opengameart.org/user/63
 *Boss Theme\r
 http://www.opengameart.org/content/boss-theme\r
 remaxim\r
-http://www.opengameart.org/user/63
\ No newline at end of file
+http://www.opengameart.org/user/63\r
+\r
+*Total Meltdown\r
+http://soundcloud.com/sc0rp/total-meltdown-v-2\r
+sc0rp\r
+http://soundcloud.com/sc0rp/
\ No newline at end of file