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

Generic's Generic planet lobby BG #88

Open
wants to merge 8 commits into
base: master
Choose a base branch
from
+17 −1
Open

Generic's Generic planet lobby BG #88

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
940cd4f
Hope this is not broken
SomewhatSad14 Apr 11, 2023
3b5dd4b
YML Updated
SomewhatSad14 May 7, 2023
2fbda27
Apply suggestions from code review
SomewhatSad14 May 7, 2023
760e43f
Update Resources/Textures/LobbyScreens/attributions.yml
SomewhatSad14 May 13, 2023
5f76697
Merge branch 'master' into Planets.Lobby
SomewhatSad14 May 21, 2023
7c9f324
Update lobbyscreens.yml
SomewhatSad14 May 21, 2023
3a16cc2
Update Resources/Textures/LobbyScreens/attributions.yml
SomewhatSad14 Oct 15, 2023
8f3a211
Update Resources/Textures/LobbyScreens/attributions.yml
SomewhatSad14 Oct 15, 2023
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
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 @@ -9,3 +9,7 @@
- type: lobbyBackground
id: Room
background: /Textures/LobbyScreens/room.png

- type: lobbyBackground
id: Planets
background: /Textures/LobbyScreens/planets.png
Pspritechologist marked this conversation as resolved.
Show resolved Hide resolved
DEATHB4DEFEAT marked this conversation as resolved.
Show resolved Hide resolved
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 @@ -12,3 +12,8 @@
license: "CC-BY-NC-SA-3.0"
copyright: "Abyssal#4842 on discord / @aby_doodles on Twitter"
source: "https://twitter.com/aby_doodles"

- files: ["planets.png"]
license: "CC-BY-NC-SA-3.0"
copyright: "Generic#1557 on discord"
SomewhatSad14 marked this conversation as resolved.
Show resolved Hide resolved
source: "https://github.com/Park-Station/Parkstation"
SomewhatSad14 marked this conversation as resolved.
Show resolved Hide resolved
Binary file added Resources/Textures/LobbyScreens/planets.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.
2 changes: 2 additions & 0 deletions Resources/Textures/LobbyScreens/planets.png.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
sample:
filter: true