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

New Year Music #2829

Merged
merged 7 commits into from
Dec 16, 2024
Merged

New Year Music #2829

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
7b38b28
New Year Music
AwareFoxy Dec 4, 2024
bc9b0cd
fix path
AwareFoxy Dec 4, 2024
d13b193
prosto pizdec
AwareFoxy Dec 4, 2024
6b0e12d
-a-
AwareFoxy Dec 4, 2024
5d23b7d
Apply suggestions from code review
AwareFoxy Dec 5, 2024
3017141
Apply suggestions from code review
AwareFoxy Dec 12, 2024
c3698fb
Apply suggestions from code review
AwareFoxy Dec 12, 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
24 changes: 24 additions & 0 deletions Resources/Audio/Corvax/Lobby/NewYear/attributions.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
- files: ["carol-of-the-bells.ogg"]
license: "CC-BY-4.0"
copyright: "Carol Of The Bells by Audionautix. Converted from MP3 to OGG."
source: "https://youtu.be/QGJEGeAtH_8?si=_IhSce8rEzoPEkaC"

- files: ["dance-of-sugar-plum-fairy.ogg"]
license: "CC-BY-4.0"
copyright: "Dance of the Sugar Plum Fairy by Kevin MacLeod. Converted from MP3 to OGG."
source: "http://incompetech.com/music/royalty-free/index.html?isrc=USUAN1100270"

- files: ["deck-in-the-halls.ogg"]
license: "CC-BY-4.0"
copyright: "Deck the Halls B by Kevin MacLeod. Converted from MP3 to OGG."
source: "http://incompetech.com/music/royalty-free/index.html?isrc=USUAN1100368"

- files: ["jingle-bells.ogg"]
license: "CC-BY-4.0"
copyright: "Jingle Bells by Kevin MacLeod. Converted from MP3 to OGG."
source: "http://incompetech.com/music/royalty-free/index.html?isrc=USUAN1100187"

- files: ["wish-you-a-merry-christmas.ogg"]
license: "CC-BY-4.0"
copyright: "Wish You a Merry Christmas by Twin Musicom. Converted from MP3 to OGG."
source: "https://youtu.be/OEMFw6gB_ag"
Binary file added Resources/Audio/Corvax/Lobby/NewYear/carol-of-the-bells.ogg
View file
Open in desktop
Binary file not shown.
Binary file added Resources/Audio/Corvax/Lobby/NewYear/dance-of-sugar-plum-fairy.ogg
View file
Open in desktop
Binary file not shown.
Binary file added Resources/Audio/Corvax/Lobby/NewYear/deck-in-the-halls.ogg
View file
Open in desktop
Binary file not shown.
Binary file added Resources/Audio/Corvax/Lobby/NewYear/jingle-bells.ogg
View file
Open in desktop
Binary file not shown.
Binary file added Resources/Audio/Corvax/Lobby/NewYear/wish-you-a-merry-christmas.ogg
View file
Open in desktop
Binary file not shown.
37 changes: 21 additions & 16 deletions Resources/Prototypes/SoundCollections/lobby.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,19 +1,24 @@
- type: soundCollection
id: LobbyMusic
files:
- /Audio/Lobby/thunderdome.ogg
- /Audio/Lobby/absconditus.ogg
- /Audio/Lobby/space_asshole.ogg
- /Audio/Lobby/endless_space.ogg
- /Audio/Lobby/singuloose.ogg
- /Audio/Lobby/comet_haley.ogg
- /Audio/Lobby/title2.ogg
- /Audio/Lobby/title3.ogg
- /Audio/Lobby/mod.flip-flap.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/Corvax/Lobby/title2.ogg # Corvax-LobbyMusic
- /Audio/Lobby/atomicamnesiammx.ogg
- /Audio/Corvax/Lobby/service.ogg # Corvax-LobbyMusic
# - /Audio/Lobby/thunderdome.ogg # Corvax-NewYearMusic
# - /Audio/Lobby/absconditus.ogg # Corvax-NewYearMusic
# - /Audio/Lobby/space_asshole.ogg # Corvax-NewYearMusic
# - /Audio/Lobby/endless_space.ogg # Corvax-NewYearMusic
# - /Audio/Lobby/singuloose.ogg # Corvax-NewYearMusic
# - /Audio/Lobby/comet_haley.ogg # Corvax-NewYearMusic
# - /Audio/Lobby/title2.ogg # Corvax-NewYearMusic
# - /Audio/Lobby/title3.ogg # Corvax-NewYearMusic
# - /Audio/Lobby/mod.flip-flap.ogg # Corvax-NewYearMusic
# - /Audio/Lobby/Spac_Stac.ogg # Corvax-NewYearMusic
# - /Audio/Lobby/pwmur.ogg # Corvax-NewYearMusic
# - /Audio/Lobby/lasers_rip_apart_the_bulkhead.ogg # Corvax-NewYearMusic
# - /Audio/Lobby/every_light_is_blinking_at_once.ogg # Corvax-NewYearMusic
# - /Audio/Corvax/Lobby/title2.ogg # Corvax-LobbyMusic # Corvax-NewYearMusic
# - /Audio/Lobby/atomicamnesiammx.ogg # Corvax-NewYearMusic
# - /Audio/Corvax/Lobby/service.ogg # Corvax-LobbyMusic # Corvax-NewYearMusic
AwareFoxy marked this conversation as resolved.
Show resolved Hide resolved
- /Audio/Corvax/Lobby/NewYear/carol-of-the-bells.ogg # Corvax-NewYearMusic
- /Audio/Corvax/Lobby/NewYear/dance-of-sugar-plum-fairy.ogg # Corvax-NewYearMusic
- /Audio/Corvax/Lobby/NewYear/deck-in-the-halls.ogg # Corvax-NewYearMusic
- /Audio/Corvax/Lobby/NewYear/jingle-bells.ogg # Corvax-NewYearMusic
- /Audio/Corvax/Lobby/NewYear/wish-you-a-merry-christmas.ogg # Corvax-NewYearMusic
Loading