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

Adds some things to the lobby #1143

Merged
merged 5 commits into from Apr 28, 2024
Merged

Adds some things to the lobby #1143

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
5312735
The first part of this PR, "Lobby Music"
Apr 20, 2024
7cb1848
Part 2 of this PR, act 1: "Operator Plush"
Apr 21, 2024
cfe79c4
WebP conversion+ Fixing some YML
Apr 27, 2024
d7927b8
Merge branch 'master' into Lobby-Music-And-Art
Apr 27, 2024
4d50151
Merge branch 'master' into Lobby-Music-And-Art
Apr 28, 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
Binary file added Resources/Audio/Lobby/Patricia_Taxxon_-_Chipshop.ogg
View file
Open in desktop
Binary file not shown.
Binary file added Resources/Audio/Lobby/Patricia_Taxxon_-_Minute.ogg
View file
Open in desktop
Binary file not shown.
10 changes: 10 additions & 0 deletions Resources/Audio/Lobby/attributions.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,16 @@
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: ["Patricia_Taxxon_-_Chipshop.ogg"]
license: "CC-BY-SA-3.0"
copyright: "Chipshop by Patricia Taxxon off the album "Bicycle""
source: "https://patriciataxxon.bandcamp.com/track/chipshop"

- files: ["Patricia_Taxxon_-_Minute.ogg"]
license: "CC-BY-SA-3.0"
copyright: "Minute by Patricia Taxxon off the album "Aeroplane""
source: "https://patriciataxxon.bandcamp.com/track/minute"

- files: ["psirius_-_nights_of_orion.xm.ogg"]
license: "CC-BY-NC-SA-4.0"
copyright: "Nights of Orion by Psirius"
Expand Down
4 changes: 3 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 @@ -13,8 +13,10 @@
- /Audio/Lobby/melcom-cyberpunk.it.ogg
- /Audio/Lobby/midori_-_conundrum_final.it.ogg
- /Audio/Lobby/mod.flip-flap.ogg
- /Audio/Lobby/Patricia_Taxxon_-_Minute.ogg
- /Audio/Lobby/Patricia_Taxxon_-_Chipshop.ogg
- /Audio/Lobby/psirius_-_nights_of_orion.xm.ogg
#- /Audio/Lobby/psirius_-_nymphs_of_the_forest.mptm.ogg
- /Audio/Lobby/psirius_-_nymphs_of_the_forest.mptm.ogg
- /Audio/Lobby/superposition.ogg
- /Audio/Lobby/hackers.ogg
- /Audio/Lobby/every_light_is_blinking_at_once.ogg
Expand Down
4 changes: 4 additions & 0 deletions Resources/Prototypes/lobbyscreens.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,3 +37,7 @@
- type: lobbyBackground
id: TechnologicalProgress
background: /Textures/LobbyScreens/DeltaV__Technological_Progress_by_threlo.png

- type: lobbyBackground
id: OperatorPlush
background: /Textures/LobbyScreens/OperatorPlush.png
Binary file added Resources/Textures/LobbyScreens/OperatorPlush.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
5 changes: 5 additions & 0 deletions Resources/Textures/LobbyScreens/attributions.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,3 +47,8 @@
license: "Custom"
copyright: "CC-BY-NC-ND-4.0 / threlo on discord / @threlo on itaku"
source: "https://linktr.ee/threlo"

- files: ["OperatorPlush.png"]
license: "CC-BY-4.0"
copyright: "Commission adapted to fit the format by Leonardo_DaBepis on discord / @leonardo-dabepis on Tumblr. Template was filled in by Adeinitas @ DeltaV"
source: "https://leonardo-dabepis.tumblr.com/"
Loading