From: MirceaKitsune Date: Tue, 5 Jul 2011 22:15:39 +0000 (+0300) Subject: New songs from opengameart.org, used by some existing maps. Also a new menu song X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=86f6a35b135fb4edf17eb80b6d5ed6fe9ec72938;p=voretournament%2Fvoretournament.git 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 8fd8e185..daa64acd 100644 --- 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 // 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 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" +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" 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 seta cl_intermission 1 "play intermission music" seta cl_intermission_cdtrack_win "win_music" seta cl_intermission_cdtrack_lose "lose_music" -seta menu_cdtrack feeding_frenzy +seta menu_cdtrack dark_intro // maxidle (in seconds): kick players idle for more than that amount of time set sv_maxidle 0 diff --git a/data/maps/greatwall_overloaded.mapinfo b/data/maps/greatwall_overloaded.mapinfo index 72de4c03..3842ed2e 100644 --- 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 b5c335b1..08ed930d 100644 --- 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 f46ee6a4..45a8acf7 100644 --- a/data/maps/reslimed.mapinfo +++ b/data/maps/reslimed.mapinfo @@ -9,4 +9,4 @@ type lms 9 20 type kh 1000 20 3 type ca 10 20 type rpg 0 -cdtrack sixtyfour_revisited +cdtrack echelon diff --git a/data/maps/soylent.mapinfo b/data/maps/soylent.mapinfo index a579ea19..93299f45 100644 --- a/data/maps/soylent.mapinfo +++ b/data/maps/soylent.mapinfo @@ -10,4 +10,4 @@ type kh 1000 20 3 type arena 10 20 type ca 10 20 type rpg 0 -cdtrack space_walk +cdtrack attack diff --git a/data/sound/cdtracks/attack.ogg b/data/sound/cdtracks/attack.ogg new file mode 100644 index 00000000..00f98ab3 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 index 00000000..d8532e0f 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 index 00000000..ba89acae 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 index 00000000..68ec7832 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 index 00000000..cc3dbb18 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 index 00000000..d9f37358 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 index 00000000..0ee2d7f0 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 289ab92a..ee4974bf 100644 --- a/data/voretournament-credits.txt +++ b/data/voretournament-credits.txt @@ -242,4 +242,49 @@ http://opengameart.org/user/63 *Lose music http://opengameart.org/content/lose-music-2 remaxim -http://opengameart.org/user/63 \ No newline at end of file +http://opengameart.org/user/63 + +*Contemplation +http://opengameart.org/content/contemplation +bart +http://opengameart.org/user/1 + +*Covert Operations +http://opengameart.org/content/covert-operations +artisticdude +http://opengameart.org/user/251 + +*Determination +http://opengameart.org/content/determination +artisticdude +http://opengameart.org/user/251 + +*Attack +http://opengameart.org/content/attack-music-futuristic-pop +p0ss +http://opengameart.org/user/877 + +*Echelon +http://opengameart.org/content/echelon-music-futuristic +p0ss +http://opengameart.org/user/877 + +*I wouldn't +http://opengameart.org/content/i-wouldnt-music-futuristic-daft-punky +p0ss +http://opengameart.org/user/877 + +*tEcHNo gEeK +http://opengameart.org/content/techno-geek +mrpoly +http://opengameart.org/user/413 + +*Xeon Theme Remastered +http://opengameart.org/content/xeon-theme-remastered +bart +http://www.opengameart.org/user/1 + +*Dark Intro +http://opengameart.org/content/a-dark-and-desperate-intro +anonymous fix +http://opengameart.org/user/787 diff --git a/misc/source/media/music/contemplation.flp b/misc/source/media/music/contemplation.flp new file mode 100644 index 00000000..805a4f66 Binary files /dev/null and b/misc/source/media/music/contemplation.flp differ