diff --git a/Resources/Audio/Jukebox/Spac_Stac_MONO.ogg b/Resources/Audio/Jukebox/Spac_Stac_MONO.ogg new file mode 100644 index 00000000000..9b18b4d50ac Binary files /dev/null and b/Resources/Audio/Jukebox/Spac_Stac_MONO.ogg differ diff --git a/Resources/Audio/Jukebox/a_different_reality_lagoona_remix.xm_MONO.ogg b/Resources/Audio/Jukebox/a_different_reality_lagoona_remix.xm_MONO.ogg new file mode 100644 index 00000000000..82d5bc2544a Binary files /dev/null and b/Resources/Audio/Jukebox/a_different_reality_lagoona_remix.xm_MONO.ogg differ diff --git a/Resources/Audio/Jukebox/atomicamnesiammx_MONO.ogg b/Resources/Audio/Jukebox/atomicamnesiammx_MONO.ogg new file mode 100644 index 00000000000..b68def80d03 Binary files /dev/null and b/Resources/Audio/Jukebox/atomicamnesiammx_MONO.ogg differ diff --git a/Resources/Audio/Jukebox/attributions.yml b/Resources/Audio/Jukebox/attributions.yml index 48e1458c4c0..f2799f9d4dc 100644 --- a/Resources/Audio/Jukebox/attributions.yml +++ b/Resources/Audio/Jukebox/attributions.yml @@ -1,27 +1,80 @@ -- files: ["sector11.ogg"] +- files: ["a_different_reality_lagoona_remix.xm_MONO.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: ["atomicamnesiammx_MONO.ogg"] license: "CC-BY-NC-SA-3.0" - copyright: "-Sector11 by MashedByMachines. Converted to mono OGG." - source: "https://www.newgrounds.com/audio/listen/312622" + copyright: "Atomic Amnesia MMX by Philip Dyer. Converted from MP3 to OGG." + source: "https://youtu.be/h0KJBGJdHuo?si=d0JjD0jgun0pp7QO" + +- files: ["autumnal_equinox.xm_MONO.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: ["comet_haley_MONO.ogg"] + license: "CC-BY-NC-SA-3.0" + copyright: "Comet Haley by Stellardrone. Converted from MP3 to OGG." + source: "https://stellardrone.bandcamp.com/track/comet-halley" + +- files: ["drozerix_-_leisurely_voice.xm_MONO.ogg"] + license: "Custom" + copyright: "Leisurely Voice by Drozerix" + source: "https://modarchive.org/index.php?request=view_by_moduleid&query=183837" + +- files: ["endless_space_MONO.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: ["every_light_is_blinking_at_once_MONO.ogg"] + license: "CC-BY-NC-SA-3.0" + copyright: "every light is blinking at once by Sunbeamstress/Lauren Loveless." + source: "https://soundcloud.com/sunbeamstress/every-light-is-blinking-at-once" + +- files: ["lasers_rip_apart_the_bulkhead_MONO.ogg"] + license: "CC-BY-NC-SA-3.0" + copyright: "lasers rip apart the bulkhead by Sunbeamstress/Lauren Loveless." + source: "https://soundcloud.com/sunbeamstress/lasers-rip-apart-the-bulkhead" - 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 Audio/Lobby) and is free for non-commercial use. Converted to mono OGG." + 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: ["title3.ogg"] +- files: ["pwmur_MONO.ogg"] license: "CC-BY-NC-SA-3.0" - copyright: "Title3 by Cuboos. It is a remix of the song 'Tintin on the Moon'. Converted to mono OGG." - source: "https://www.youtube.com/watch?v=YKVmXn-Gv0M" + copyright: "phoron will make us rich by Sunbeamstress/Lauren Loveless." + source: "https://soundcloud.com/sunbeamstress/phoron-will-make-us-rich" -- files: - - "constellations.ogg" - - "drifting.ogg" - - "starlight.ogg" - license: "CC-BY-3.0" - copyright: "Constellations by Qwertyquerty. Converted to mono OGG." - source: "https://www.youtube.com/channel/UCPYbhBUGhH7n_G4HLK2YipQ" +- files: ["singuloose_MONO.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" + +- files: ["Spac_Stac_MONO.ogg"] + license: "CC-BY-NC-SA-3.0" + copyright: "Spac Stac by Hayabusa. Converted from MP3 to OGG." + source: "https://www.newgrounds.com/audio/listen/1132476" + +- 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 to the track, but not the "main" bandcamp of the author. Hence the link is also included separately in the copyright. + +- files: ["thunderdome_MONO.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: ["title2_MONO.ogg"] + license: "Custom" + copyright: "Originally composed by Jonathan Dunn for Robocop 2 Gameboy published by Ocean Software. Remixed by Eric Shumaker for his video Dilbert 3. As of October 9th, 2008 nobody owns the rights to this song and copyright action has never been taken against anyone using this song in their projects." + source: "https://www.youtube.com/watch?v=4o6_8Unj2mQ" -- files: ["sunset.ogg"] - license: "CC-BY-SA-3.0" - copyright: "Sunset by PigeonBeans. Exported in Mono OGG." - source: "https://soundcloud.com/pigeonbeans/sunset" \ No newline at end of file +- files: ["title3.ogg"] + license: "CC-BY-NC-SA-3.0" + copyright: "Tintin on the Moon MkII 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" diff --git a/Resources/Audio/Jukebox/autumnal_equinox.xm_MONO.ogg b/Resources/Audio/Jukebox/autumnal_equinox.xm_MONO.ogg new file mode 100644 index 00000000000..c1f1834c741 Binary files /dev/null and b/Resources/Audio/Jukebox/autumnal_equinox.xm_MONO.ogg differ diff --git a/Resources/Audio/Jukebox/comet_haley_MONO.ogg b/Resources/Audio/Jukebox/comet_haley_MONO.ogg new file mode 100644 index 00000000000..be7c8074ad7 Binary files /dev/null and b/Resources/Audio/Jukebox/comet_haley_MONO.ogg differ diff --git a/Resources/Audio/Jukebox/constellations.ogg b/Resources/Audio/Jukebox/constellations.ogg deleted file mode 100644 index f1774894652..00000000000 Binary files a/Resources/Audio/Jukebox/constellations.ogg and /dev/null differ diff --git a/Resources/Audio/Jukebox/drifting.ogg b/Resources/Audio/Jukebox/drifting.ogg deleted file mode 100644 index 321c098bbdd..00000000000 Binary files a/Resources/Audio/Jukebox/drifting.ogg and /dev/null differ diff --git a/Resources/Audio/Jukebox/drozerix_-_leisurely_voice.xm_MONO.ogg b/Resources/Audio/Jukebox/drozerix_-_leisurely_voice.xm_MONO.ogg new file mode 100644 index 00000000000..5f1e91ce559 Binary files /dev/null and b/Resources/Audio/Jukebox/drozerix_-_leisurely_voice.xm_MONO.ogg differ diff --git a/Resources/Audio/Jukebox/endless_space_MONO.ogg b/Resources/Audio/Jukebox/endless_space_MONO.ogg new file mode 100644 index 00000000000..f4fac57a1a6 Binary files /dev/null and b/Resources/Audio/Jukebox/endless_space_MONO.ogg differ diff --git a/Resources/Audio/Jukebox/every_light_is_blinking_at_once_MONO.ogg b/Resources/Audio/Jukebox/every_light_is_blinking_at_once_MONO.ogg new file mode 100644 index 00000000000..38cfd357bbb Binary files /dev/null and b/Resources/Audio/Jukebox/every_light_is_blinking_at_once_MONO.ogg differ diff --git a/Resources/Audio/Jukebox/flip-flap.ogg b/Resources/Audio/Jukebox/flip-flap.ogg deleted file mode 100644 index 07c47c00be9..00000000000 Binary files a/Resources/Audio/Jukebox/flip-flap.ogg and /dev/null differ diff --git a/Resources/Audio/Jukebox/lasers_rip_apart_the_bulkhead_MONO.ogg b/Resources/Audio/Jukebox/lasers_rip_apart_the_bulkhead_MONO.ogg new file mode 100644 index 00000000000..f7d8e85a882 Binary files /dev/null and b/Resources/Audio/Jukebox/lasers_rip_apart_the_bulkhead_MONO.ogg differ diff --git a/Resources/Audio/Jukebox/mod.flip-flap_MONO.ogg b/Resources/Audio/Jukebox/mod.flip-flap_MONO.ogg new file mode 100644 index 00000000000..f2f7fa940a0 Binary files /dev/null and b/Resources/Audio/Jukebox/mod.flip-flap_MONO.ogg differ diff --git a/Resources/Audio/Jukebox/pwmur_MONO.ogg b/Resources/Audio/Jukebox/pwmur_MONO.ogg new file mode 100644 index 00000000000..57eea1f5673 Binary files /dev/null and b/Resources/Audio/Jukebox/pwmur_MONO.ogg differ diff --git a/Resources/Audio/Jukebox/sector11.ogg b/Resources/Audio/Jukebox/sector11.ogg deleted file mode 100644 index f0ce993b7ea..00000000000 Binary files a/Resources/Audio/Jukebox/sector11.ogg and /dev/null differ diff --git a/Resources/Audio/Jukebox/singuloose_MONO.ogg b/Resources/Audio/Jukebox/singuloose_MONO.ogg new file mode 100644 index 00000000000..ff471041f0d Binary files /dev/null and b/Resources/Audio/Jukebox/singuloose_MONO.ogg differ diff --git a/Resources/Audio/Jukebox/space_asshole_MONO.ogg b/Resources/Audio/Jukebox/space_asshole_MONO.ogg new file mode 100644 index 00000000000..e77a5a3420d Binary files /dev/null and b/Resources/Audio/Jukebox/space_asshole_MONO.ogg differ diff --git a/Resources/Audio/Jukebox/starlight.ogg b/Resources/Audio/Jukebox/starlight.ogg deleted file mode 100644 index 31e23416f96..00000000000 Binary files a/Resources/Audio/Jukebox/starlight.ogg and /dev/null differ diff --git a/Resources/Audio/Jukebox/sunset.ogg b/Resources/Audio/Jukebox/sunset.ogg deleted file mode 100644 index 3f6d909eaa1..00000000000 Binary files a/Resources/Audio/Jukebox/sunset.ogg and /dev/null differ diff --git a/Resources/Audio/Jukebox/thunderdome_MONO.ogg b/Resources/Audio/Jukebox/thunderdome_MONO.ogg new file mode 100644 index 00000000000..d124474fac9 Binary files /dev/null and b/Resources/Audio/Jukebox/thunderdome_MONO.ogg differ diff --git a/Resources/Audio/Jukebox/title2_MONO.ogg b/Resources/Audio/Jukebox/title2_MONO.ogg new file mode 100644 index 00000000000..08ffce8be30 Binary files /dev/null and b/Resources/Audio/Jukebox/title2_MONO.ogg differ diff --git a/Resources/Audio/Jukebox/title3.ogg b/Resources/Audio/Jukebox/title3.ogg deleted file mode 100644 index 5cfe80b535b..00000000000 Binary files a/Resources/Audio/Jukebox/title3.ogg and /dev/null differ diff --git a/Resources/Audio/Jukebox/title3_MONO.ogg b/Resources/Audio/Jukebox/title3_MONO.ogg new file mode 100644 index 00000000000..56e4fe24dc6 Binary files /dev/null and b/Resources/Audio/Jukebox/title3_MONO.ogg differ diff --git a/Resources/Audio/Lobby/Spac_Stac.ogg b/Resources/Audio/Lobby/Spac_Stac.ogg index b84707f5473..506cfa29b4a 100644 Binary files a/Resources/Audio/Lobby/Spac_Stac.ogg and b/Resources/Audio/Lobby/Spac_Stac.ogg differ diff --git a/Resources/Audio/Lobby/a_different_reality_lagoona_remix.xm.ogg b/Resources/Audio/Lobby/a_different_reality_lagoona_remix.xm.ogg index b5197117686..79422f5b83a 100644 Binary files a/Resources/Audio/Lobby/a_different_reality_lagoona_remix.xm.ogg and b/Resources/Audio/Lobby/a_different_reality_lagoona_remix.xm.ogg differ diff --git a/Resources/Audio/Lobby/absconditus.ogg b/Resources/Audio/Lobby/absconditus.ogg index d41f501fd6b..17fa734e847 100644 Binary files a/Resources/Audio/Lobby/absconditus.ogg and b/Resources/Audio/Lobby/absconditus.ogg differ diff --git a/Resources/Audio/Lobby/atomicamnesiammx.ogg b/Resources/Audio/Lobby/atomicamnesiammx.ogg index 261559f35aa..43138d8b867 100644 Binary files a/Resources/Audio/Lobby/atomicamnesiammx.ogg and b/Resources/Audio/Lobby/atomicamnesiammx.ogg differ diff --git a/Resources/Audio/Lobby/attributions.yml b/Resources/Audio/Lobby/attributions.yml index 5c6a2bb9f90..9ea69ddfa98 100644 --- a/Resources/Audio/Lobby/attributions.yml +++ b/Resources/Audio/Lobby/attributions.yml @@ -11,7 +11,7 @@ - files: ["atomicamnesiammx.ogg"] license: "CC-BY-NC-SA-3.0" copyright: "Atomic Amnesia MMX by Philip Dyer. Converted from MP3 to OGG." - source: "https://soundcloud.com/3kliksphilip/atomic-amnesia-mmx-1" + source: "https://youtu.be/h0KJBGJdHuo?si=d0JjD0jgun0pp7QO" - files: ["autumnal_equinox.xm.ogg"] license: "CC-BY-NC-4.0" @@ -23,11 +23,6 @@ copyright: "Comet Haley by Stellardrone. Converted from MP3 to OGG." source: "https://stellardrone.bandcamp.com/track/comet-halley" -- files: ["drozerix_-_alone.xm.ogg"] - license: "Custom" - copyright: "Alone by Drozerix" - source: "https://modarchive.org/index.php?request=view_by_moduleid&query=199968" - - files: ["drozerix_-_leisurely_voice.xm.ogg"] license: "Custom" copyright: "Leisurely Voice by Drozerix" @@ -43,16 +38,11 @@ copyright: "every light is blinking at once by Sunbeamstress/Lauren Loveless." source: "https://soundcloud.com/sunbeamstress/every-light-is-blinking-at-once" -- files: ["laser_rip_apart_the_bulkhead.ogg"] +- files: ["lasers_rip_apart_the_bulkhead.ogg"] license: "CC-BY-NC-SA-3.0" copyright: "lasers rip apart the bulkhead by Sunbeamstress/Lauren Loveless." source: "https://soundcloud.com/sunbeamstress/lasers-rip-apart-the-bulkhead" -- 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: ["pwmur.ogg"] license: "CC-BY-NC-SA-3.0" copyright: "phoron will make us rich by Sunbeamstress/Lauren Loveless." @@ -66,17 +56,11 @@ - 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: ["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 to the track, but not the "main" bandcamp of the author. Hence the link is also included separately in the copyright. + source: "https://www.newgrounds.com/audio/listen/1132476" - files: ["thunderdome.ogg"] license: "CC-BY-NC-SA-3.0" - copyright: "-Sector11 by MashedByMachines. Converted from MP3 to OGG." + copyright: "Sector11 by MashedByMachines. Converted from MP3 to OGG." source: "https://www.newgrounds.com/audio/listen/312622" - files: ["title2.ogg"] @@ -84,8 +68,3 @@ copyright: "Originally composed by Jonathan Dunn for Robocop 2 Gameboy published by Ocean Software. Remixed by Eric Shumaker for his video Dilbert 3. As of October 9th, 2008 nobody owns the rights to this song and copyright action has never been taken against anyone using this song in their projects." source: "https://www.youtube.com/watch?v=4o6_8Unj2mQ" -- files: ["title3.ogg"] - license: "CC-BY-NC-SA-3.0" - cop{"code":"deadline_exceeded","msg":"operation timed out"}