From: MirceaKitsune <sonichedgehog_hyperblast00@yahoo.com>
Date: Mon, 13 Sep 2010 23:30:32 +0000 (+0300)
Subject: The song Total Meltdown by Sc0rp. Also add new shader to shaderlist.txt
X-Git-Url: https://de.git.xonotic.org/?p=voretournament%2Fvoretournament.git;a=commitdiff_plain;h=f2703e544dc795b8bcb700adfddb90772c85c08e

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

diff --git a/data/defaultVoretournament.cfg b/data/defaultVoretournament.cfg
index 5f14380c..0b05436e 100644
--- 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
 
 // Audio track names (for old-style "cd loop NUMBER" usage)
-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"
+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"
 set g_cdtracks_dontusebydefault "" "list used by mapinfo system to automatically assign cdtracks - must be a subset of g_cdtracks_remaplist"
 cd remap $g_cdtracks_remaplist
 set sv_intermission_cdtrack ""
diff --git a/data/scripts/shaderlist.txt b/data/scripts/shaderlist.txt
index e7a8386e..30ff9b2f 100644
--- a/data/scripts/shaderlist.txt
+++ b/data/scripts/shaderlist.txt
@@ -62,4 +62,5 @@ tutorial
 tznex01
 water
 mirceakitsune
-artwork
\ No newline at end of file
+artwork
+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
index 00000000..f58bb88b
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 45906edb..ab3adcda 100644
--- a/data/voretournament-credits.txt
+++ b/data/voretournament-credits.txt
@@ -120,4 +120,9 @@ http://www.opengameart.org/user/63
 *Boss Theme
 http://www.opengameart.org/content/boss-theme
 remaxim
-http://www.opengameart.org/user/63
\ No newline at end of file
+http://www.opengameart.org/user/63
+
+*Total Meltdown
+http://soundcloud.com/sc0rp/total-meltdown-v-2
+sc0rp
+http://soundcloud.com/sc0rp/
\ No newline at end of file