Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add Lobby Song: Shibamata #904

Merged
merged 3 commits into from
Jan 24, 2024
Merged

Add Lobby Song: Shibamata #904

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ac23973
Add Shibamata
McBosserson Jan 23, 2024
f92c3fc
Fixing metadata and file location
dvir001 Jan 24, 2024
0edd17b
Attributions Move
dvir001 Jan 24, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 1 addition & 6 deletions Resources/Audio/Lobby/attributions.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,9 +77,4 @@
- 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: ["victory.ogg"]
license: "CC-BY-NC-SA-3.0"
copyright: "Victory by Koruu Chan. Rights reserved by Checkraze. Converted from WAV to OGG."
source: "https://github.com/Cheackraze"
source: "https://soundcloud.com/alexanderdivine/every-light-is-blinking-at-once"
Binary file removed Resources/Audio/Lobby/victory.ogg
View file
Open in desktop
Binary file not shown.
9 changes: 9 additions & 0 deletions Resources/Audio/_NF/Lobby/attributions.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
- files: ["victory.ogg"]
license: "CC-BY-NC-SA-3.0"
copyright: "Victory by Koruu Chan. Rights reserved by Checkraze. Converted from WAV to OGG."
source: "https://github.com/Cheackraze"

- files: ["shibamata.ogg"]
license: "CC-BY-3.0"
copyright: "Shibamata midi remake. Likely original: https://www.nicovideo.jp/watch/sm32841166"
source: "https://github.com/Elijahrane/arcadia-station/blob/c2ea3f44d4de4c0a337aeddb12f167a89c5ed3ef/Resources/Audio/Lobby/shibamata.ogg"
Binary file added Resources/Audio/_NF/Lobby/shibamata.ogg
View file
Open in desktop
Binary file not shown.
Binary file added Resources/Audio/_NF/Lobby/victory.ogg
View file
Open in desktop
Binary file not shown.
6 changes: 5 additions & 1 deletion Resources/Prototypes/SoundCollections/lobby.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,16 +2,20 @@
id: LobbyMusic
files:
- /Audio/Lobby/thunderdome.ogg
# - /Audio/Lobby/absconditus.ogg
- /Audio/Lobby/space_asshole.ogg
# - /Audio/Lobby/endless_space.ogg
- /Audio/Lobby/atomicamnesiammx.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/Monument.ogg
- /Audio/Lobby/Spac_Stac.ogg
- /Audio/Lobby/pwmur.ogg
- /Audio/Lobby/lasers_rip_apart_the_bulkhead.ogg
- /Audio/Lobby/every_light_is_blinking_at_once.ogg
- /Audio/Lobby/victory.ogg
- /Audio/Lobby/vibe_ace.ogg
- /Audio/_NF/Lobby/victory.ogg # Frontier
- /Audio/_NF/Lobby/shibamata.ogg # Frontier
Loading