forked from DeltaV-Station/Delta-v-Legacy
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request DeltaV-Station#105 from DebugOk/Nyano-lobby-music
Pull the new roundend sounds and lobby music from Nyano
- Loading branch information
Showing
55 changed files
with
147 additions
and
205 deletions.
There are no files selected for viewing
Binary file not shown.
Binary file not shown.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,56 @@ | ||
| - files: ["anyone_around.ogg"] | ||
| source: "Wataru Arai as Kenzo Uji, Martian Gothic: Unification (2000)" | ||
|
|
||
| - files: ["bravery_firepower.ogg"] | ||
| source: "Jay Anthony Franke as J.C. Denton, Deus Ex (2000)" | ||
|
|
||
| - files: ["easy_route.ogg"] | ||
| source: "Ross Scott playing Rama (1996) on YouTube (2016); https://www.youtube.com/watch?v=Pu4n5YXPaMQ" | ||
|
|
||
| - files: ["data_mining_algorithms.ogg"] | ||
| source: "Tom Hall as Morpheus, Deus Ex (2000)" | ||
|
|
||
| - files: ["good_business.ogg"] | ||
| source: "John Rhys-Davies as Sir Richard Winston Tobias, Freelancer (2003)" | ||
|
|
||
| - files: ["hidden_discipline.ogg"] | ||
| source: "Frank Herbert, reading Heretics of Dune on vinyl (1984)" | ||
|
|
||
| - files: ["i_need_a_computer.ogg"] | ||
| source: "Keanu Reeves, Johnny Mnemonic (1994)" | ||
|
|
||
| - files: ["never_trust_a_traitor.ogg"] | ||
| source: "Ian McNeice as Baron Vladimir Harkonnen, Frank Herbert's Dune (2000)" | ||
|
|
||
| - files: ["order_to_chaos.ogg"] | ||
| source: "René Auberjonois as Constable Odo, Star Trek: Deep Space Nine, S5E08 'Things Past' (1996)" | ||
|
|
||
| - files: ["out_an_airlock.ogg"] | ||
| source: "Ian Ziering as Edison Trent, Freelancer (2003)" | ||
|
|
||
| - files: ["pacts_with_demons.ogg"] | ||
| source: "William Gibson, reading Neuromancer on cassette tape (1984)" | ||
|
|
||
| - files: ["pdpt.ogg"] | ||
| source: "Introduction to Serial Experiments Lain (1998)" | ||
|
|
||
| - files: ["quarterly_gains.ogg"] | ||
| source: "Armin Shimerman as Quark, Star Trek: Deep Space Nine, S4E06 'Starship Down' (1995)" | ||
|
|
||
| - files: ["secher_nbiw.ogg"] | ||
| source: "James McAvoy as Leto II Atreides, Frank Herbert's Children of Dune (2003)" | ||
|
|
||
| - files: ["see_you_in_space.ogg"] | ||
| source: "Unknown voice actor as Michael King, Freelancer (2003)" | ||
|
|
||
| - files: ["ship_wanted.ogg"] | ||
| source: "John Rhys-Davies as Sir Richard Winston Tobias, Freelancer (2003)" | ||
|
|
||
| - files: ["smart_universe.ogg"] | ||
| source: "Alan Watts, a Conversation with Myself (1971)" | ||
|
|
||
| - files: ["this_drink.ogg"] | ||
| source: "Ian Ziering as Edison Trent, Freelancer (2003)" | ||
|
|
||
| - files: ["truth_imagination.ogg"] | ||
| source: "Andrew J. Robinson as Elim Garak, Star Trek: Deep Space Nine, S3E20 'Improbable Cause' (1995)" |
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file removed
BIN
-109 KB
Resources/Audio/Announcements/RoundEnd/withoutfurtherinterruption.ogg
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,203 +1,79 @@ | ||
| - files: ["thunderdome.ogg"] | ||
| license: "CC-BY-NC-SA-3.0" | ||
| copyright: "-Sector11 by MashedByMachines. Converted from MP3 to OGG." | ||
| source: "https://www.newgrounds.com/audio/listen/312622" | ||
|
|
||
| - files: ["endless_space.ogg"] | ||
| - files: ["434387_Time_Lapse_of_Clouds.ogg"] | ||
| license: "CC-BY-3.0" | ||
| copyright: "Endless Space by SolusLunes. Converted from MP3 to OGG." | ||
| source: "https://www.newgrounds.com/audio/listen/67583" | ||
| copyright: "==(Time Lapse of Clouds)== by Buoy" | ||
| source: "https://www.newgrounds.com/audio/listen/434387" | ||
|
|
||
| - files: ["space_asshole.ogg"] | ||
| license: "Custom" | ||
| copyright: "Space Asshole by Chris Remo is used with special permission from the author, under the condition that the project remains non-commercial and open source. The author also requested that a link to his bandcamp be included: https://chrisremo.bandcamp.com/" | ||
| source: "https://idlethumbs.bandcamp.com/track/space-asshole" | ||
| # The source is a direct link the the track, but not the "main" bandcamp of the author. Hence the link is also included separately in the copyright. | ||
| - files: ["a_different_reality_lagoona_remix.xm.ogg"] | ||
| license: "CC-BY-4.0" | ||
| copyright: "A.D.R (Lagoona rmx) by Andreas Viklund" | ||
| source: "https://modarchive.org/index.php?request=view_by_moduleid&query=134786" | ||
|
|
||
| - files: ["absconditus.ogg"] | ||
| license: "CC-BY-NC-SA-3.0" | ||
| copyright: "Absconditus by ZhayTee. Converted from MP3 to OGG." | ||
| source: "https://bandcamp.zhaytee.net/track/absconditus" | ||
| - files: ["aggravated.it.ogg"] | ||
| license: "CC-BY-NC-SA-4.0" | ||
| copyright: "MEL -Aggravated Assault by melcom" | ||
| source: "https://modarchive.org/index.php?request=view_by_moduleid&query=176234" | ||
|
|
||
| - files: ["atomicamnesiammx.ogg"] | ||
| license: "CC-BY-NC-SA-3.0" | ||
| copyright: "Atomic Amnesia MMX by Phillip Dyer. Converted from MP3 to OGG." | ||
| source: "https://soundcloud.com/3kliksphilip/atomic-amnesia-mmx-1" | ||
| - files: ["autumnal_equinox.xm.ogg"] | ||
| license: "CC-BY-NC-4.0" | ||
| copyright: "Autumnal Equinox by lemonade" | ||
| source: "https://modarchive.org/index.php?request=view_by_moduleid&query=143993" | ||
|
|
||
| - files: ["singuloose.ogg"] | ||
| - files: ["comet_haley.ogg"] | ||
| license: "CC-BY-NC-SA-3.0" | ||
| copyright: "Singuloose by Janis Schiedková. Converted from MP3 to OGG." | ||
| source: "https://soundcloud.com/js_m/singuloose" | ||
| copyright: "Comet Haley by Stellardrone. Converted from MP3 to OGG." | ||
| source: "https://freemusicarchive.org/music/Stellardrone/Light_Years_1227/07_Comet_Halley" | ||
|
|
||
| - files: ["vibe_ace.ogg"] | ||
| license: "CC-BY-3.0" | ||
| copyright: "Vibe Ace by Kevin MacLeod. Converted from MP3 to OGG." | ||
| source: "https://freemusicarchive.org/music/Kevin_MacLeod/Jazz_Sampler/Vibe_Ace" | ||
| - files: ["drozerix_-_alone.xm.ogg"] | ||
| license: "Public Domain" | ||
| copyright: "Alone by Drozerix" | ||
| source: "https://modarchive.org/index.php?request=view_by_moduleid&query=199968" | ||
|
|
||
| - files: ["title3.ogg"] | ||
| license: "CC-BY-NC-SA-3.0" | ||
| copyright: "Title3 by Cuboos. It is a remix of the song 'Tintin on the Moon'. Converted from MP3 to OGG." | ||
| source: "https://www.youtube.com/watch?v=YKVmXn-Gv0M" | ||
| - files: ["drozerix_-_leisurely_voice.xm.ogg"] | ||
| license: "Public Domain" | ||
| copyright: "Leisurely Voice by Drozerix" | ||
| source: "https://modarchive.org/index.php?request=view_by_moduleid&query=183837" | ||
|
|
||
| - files: ["endless_space.ogg"] | ||
| license: "CC-BY-3.0" | ||
| copyright: "Endless Space by SolusLunes. Converted from MP3 to OGG." | ||
| source: "https://www.newgrounds.com/audio/listen/67583" | ||
|
|
||
| - files: ["marhaba.ogg"] | ||
| license: "CC-BY-NC-SA-3.0" | ||
| copyright: "Marhaba by Ian Alex Mac. Converted from MP3 to OGG." | ||
| source: "https://freemusicarchive.org/music/Ian_Alex_Mac/Cues/Marhaba" | ||
|
|
||
| - files: ["comet_haley.ogg"] | ||
| license: "CC-BY-NC-SA-3.0" | ||
| copyright: "Comet Haley by Stellardrone. Converted from MP3 to OGG." | ||
| source: "https://freemusicarchive.org/music/Stellardrone/Light_Years_1227/07_Comet_Halley" | ||
| - files: ["melcom-cyberpunk.it.ogg"] | ||
| license: "CC-BY-NC-SA-4.0" | ||
| copyright: "MEL -Cyberpunk by melcom" | ||
| source: "https://modarchive.org/index.php?request=view_by_moduleid&query=184215" | ||
|
|
||
| - files: ["midori_-_conundrum_final.it.ogg"] | ||
| license: "CC-BY-NC-SA-4.0" | ||
| copyright: "Conundrum by Midori Mizuno" | ||
| source: "https://modarchive.org/index.php?request=view_by_moduleid&query=181705" | ||
|
|
||
| - files: ["mod.flip-flap.ogg"] | ||
| license: "Custom" | ||
| copyright: "Flip Flap by X-ceed is licensed under a short but clear license (see flip-flap.txt in this directory) and is free for non-commercial use. It was converted from MOD to WAV using Schism Tracker, in 16 Bit, Non-Interpolated mode, no output equalizer settings, Ramp volume at start of sample enabled. From there it was converted to OGG Vorbis with `ffmpeg -i flip-flap.wav -q 2.9 flip-flap-renc.ogg` (quality scale chosen to match size of the OGG file being replaced). Non-interpolated mode was chosen as the module has a high enough sample rate to balance it out, but seems muffled in other interpolation modes. If 'Ramp volume at start of sample' is not enabled, a clicking phenomenon results." | ||
| source: "http://aminet.net/package/mods/xceed/Flipflap" | ||
|
|
||
| - files: ["Monument.ogg"] | ||
| license: "CC-BY-NC-SA-3.0" | ||
| copyright: "Monument by Six Umbrellas." | ||
| source: "https://sixumbrellas.bandcamp.com/album/the-psychedelic-and" | ||
|
|
||
| - files: ["Spac_Stac.ogg"] | ||
| license: "CC-BY-NC-SA-3.0" | ||
| copyright: "Spac Stac by Hayabusa. Converted from MP3 to OGG." | ||
| source: "https://www.youtube.com/watch?v=grUBe-SZgr0" | ||
|
|
||
| - files: ["pwmur.ogg"] | ||
| license: "CC-BY-NC-SA-3.0" | ||
| copyright: "phoron will make us rich by Alexander Divine." | ||
| source: "https://soundcloud.com/alexanderdivine/phoron-will-make-us-rich" | ||
| - files: ["psirius_-_nights_of_orion.xm.ogg"] | ||
| license: "CC-BY-NC-SA-4.0" | ||
| copyright: "Nights of Orion by Psirius" | ||
| source: "https://modarchive.org/index.php?request=view_by_moduleid&query=184962" | ||
|
|
||
| - files: ["lasers_rip_apart_the_bulkhead.ogg"] | ||
| license: "CC-BY-NC-SA-3.0" | ||
| copyright: "lasers rip apart the bulkhead by Alexander Divine." | ||
| source: "https://soundcloud.com/alexanderdivine/lasers-rip-apart-the-bulkhead" | ||
|
|
||
| - files: ["every_light_is_blinking_at_once.ogg"] | ||
| license: "CC-BY-NC-SA-3.0" | ||
| copyright: "every light is blinking at once by Alexander Divine." | ||
| source: "https://soundcloud.com/alexanderdivine/every-light-is-blinking-at-once" | ||
|
|
||
| - files: ["skubstep_extended.ogg"] | ||
| license: "CC-BY-NC-SA-3.0" | ||
| copyright: "skubstep_extended by Finket" | ||
| source: "https://soundcloud.com/finket/skubstep-extended" | ||
| - files: ["psirius_-_nymphs_of_the_forest.mptm.ogg"] | ||
| license: "CC-BY-NC-SA-4.0" | ||
| copyright: "Nymphs of the forest by Psirius" | ||
| source: "https://modarchive.org/index.php?request=view_by_moduleid&query=185545" | ||
|
|
||
| - files: ["hackers.ogg"] | ||
| license: "CC-BY-NC-SA-3.0" | ||
| copyright: "Hackers by Karl Casey @ White Bat Audio" | ||
| source: "https://www.youtube.com/watch?v=k8nHWwO1U2Q" | ||
|
|
||
|
|
||
|
|
||
|
|
||
|
|
||
|
|
||
|
|
||
|
|
||
|
|
||
|
|
||
|
|
||
|
|
||
|
|
||
|
|
||
|
|
||
|
|
||
|
|
||
|
|
||
|
|
||
|
|
||
|
|
||
|
|
||
|
|
||
|
|
||
|
|
||
|
|
||
|
|
||
|
|
||
|
|
||
|
|
||
|
|
||
|
|
||
|
|
||
|
|
||
|
|
||
|
|
||
|
|
||
|
|
||
|
|
||
|
|
||
|
|
||
|
|
||
|
|
||
|
|
||
|
|
||
|
|
||
|
|
||
|
|
||
|
|
||
|
|
||
|
|
||
|
|
||
|
|
||
|
|
||
|
|
||
|
|
||
|
|
||
|
|
||
|
|
||
|
|
||
|
|
||
|
|
||
|
|
||
|
|
||
|
|
||
|
|
||
|
|
||
|
|
||
|
|
||
|
|
||
|
|
||
|
|
||
|
|
||
|
|
||
|
|
||
|
|
||
|
|
||
|
|
||
|
|
||
|
|
||
|
|
||
|
|
||
|
|
||
|
|
||
|
|
||
|
|
||
|
|
||
|
|
||
|
|
||
|
|
||
|
|
||
|
|
||
|
|
||
|
|
||
|
|
||
|
|
||
|
|
||
|
|
||
|
|
||
|
|
||
|
|
||
|
|
||
|
|
||
|
|
||
|
|
||
|
|
||
|
|
||
|
|
||
|
|
||
|
|
||
|
|
||
|
|
||
| # Nyanotrasen | ||
| - files: ["superposition.ogg"] | ||
| license: "CC-BY-NC-3.0" | ||
| copyright: "Superposition by Amie Waters" | ||
| source: "https://amiewaters.bandcamp.com/track/superposition-2" |
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,12 +1,23 @@ | ||
| - type: soundCollection | ||
| id: RoundEnd | ||
| files: | ||
| - /Audio/Announcements/RoundEnd/apc_destroyed.ogg | ||
| - /Audio/Announcements/RoundEnd/bangin_donk.ogg | ||
| - /Audio/Announcements/RoundEnd/withoutfurtherinterruption.ogg | ||
| - /Audio/Announcements/RoundEnd/stoned.ogg | ||
| - /Audio/Announcements/RoundEnd/dotsy.ogg | ||
| - /Audio/Announcements/RoundEnd/wasthisstorybasedno.ogg | ||
| - /Audio/Announcements/RoundEnd/wasthisstorybasedyes.ogg | ||
| - /Audio/Announcements/RoundEnd/onlineplay.ogg | ||
| - /Audio/Announcements/RoundEnd/worCant.ogg | ||
| - /Audio/Announcements/RoundEnd/stoned.ogg | ||
| - /Audio/Announcements/RoundEnd/anyone_around.ogg | ||
| - /Audio/Announcements/RoundEnd/bravery_firepower.ogg | ||
| - /Audio/Announcements/RoundEnd/data_mining_algorithms.ogg | ||
| - /Audio/Announcements/RoundEnd/easy_route.ogg | ||
| - /Audio/Announcements/RoundEnd/good_business.ogg | ||
| - /Audio/Announcements/RoundEnd/hidden_discipline.ogg | ||
| - /Audio/Announcements/RoundEnd/i_need_a_computer.ogg | ||
| - /Audio/Announcements/RoundEnd/never_trust_a_traitor.ogg | ||
| - /Audio/Announcements/RoundEnd/order_to_chaos.ogg | ||
| - /Audio/Announcements/RoundEnd/out_an_airlock.ogg | ||
| - /Audio/Announcements/RoundEnd/pacts_with_demons.ogg | ||
| - /Audio/Announcements/RoundEnd/pdpt.ogg | ||
| - /Audio/Announcements/RoundEnd/quarterly_gains.ogg | ||
| - /Audio/Announcements/RoundEnd/secher_nbiw.ogg | ||
| - /Audio/Announcements/RoundEnd/see_you_in_space.ogg | ||
| - /Audio/Announcements/RoundEnd/ship_wanted.ogg | ||
| - /Audio/Announcements/RoundEnd/smart_universe.ogg | ||
| - /Audio/Announcements/RoundEnd/this_drink.ogg | ||
| - /Audio/Announcements/RoundEnd/truth_imagination.ogg |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,20 +1,19 @@ | ||
| - type: soundCollection | ||
| id: LobbyMusic | ||
| files: | ||
| - /Audio/Lobby/thunderdome.ogg | ||
| - /Audio/Lobby/space_asshole.ogg | ||
| - /Audio/Lobby/endless_space.ogg | ||
| - /Audio/Lobby/singuloose.ogg | ||
| - /Audio/Lobby/comet_haley.ogg | ||
| - /Audio/Lobby/marhaba.ogg | ||
| - /Audio/Lobby/title3.ogg | ||
| - /Audio/Lobby/mod.flip-flap.ogg | ||
| - /Audio/Lobby/shibamata.ogg | ||
| - /Audio/Lobby/myunmyun.ogg | ||
| - /Audio/Lobby/squids.ogg | ||
| - /Audio/Lobby/thesnow.ogg | ||
| - /Audio/Lobby/teenagelightning2.ogg | ||
| - /Audio/Lobby/track4.ogg | ||
| - /Audio/Lobby/skubstep.ogg | ||
| - /Audio/Lobby/lobooboscillator.ogg | ||
| - /Audio/Lobby/hackers.ogg | ||
| - type: soundCollection | ||
| id: LobbyMusic | ||
| files: | ||
| - /Audio/Lobby/434387_Time_Lapse_of_Clouds.ogg | ||
| - /Audio/Lobby/a_different_reality_lagoona_remix.xm.ogg | ||
| - /Audio/Lobby/aggravated.it.ogg | ||
| - /Audio/Lobby/autumnal_equinox.xm.ogg | ||
| - /Audio/Lobby/comet_haley.ogg | ||
| - /Audio/Lobby/drozerix_-_alone.xm.ogg | ||
| - /Audio/Lobby/drozerix_-_leisurely_voice.xm.ogg | ||
| - /Audio/Lobby/endless_space.ogg | ||
| - /Audio/Lobby/marhaba.ogg | ||
| - /Audio/Lobby/melcom-cyberpunk.it.ogg | ||
| - /Audio/Lobby/midori_-_conundrum_final.it.ogg | ||
| - /Audio/Lobby/mod.flip-flap.ogg | ||
| - /Audio/Lobby/psirius_-_nights_of_orion.xm.ogg | ||
| - /Audio/Lobby/psirius_-_nymphs_of_the_forest.mptm.ogg | ||
| - /Audio/Lobby/superposition.ogg | ||
| - /Audio/Lobby/hackers.ogg |