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

Удалена музыка по требованию правообладателя #206

Merged
merged 4 commits into from
Jul 16, 2024
Merged

Удалена музыка по требованию правообладателя #206

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
595f886
у ОСЩ майндщилд
pxc1984 Jul 16, 2024
e98330b
Revert "у ОСЩ майндщилд"
pxc1984 Jul 16, 2024
902caa1
Merge remote-tracking branch 'origin/master'
pxc1984 Jul 16, 2024
908b7eb
удалил музыку qdzava
pxc1984 Jul 16, 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 removed Resources/Audio/_Sunrise/Music/3D_is_just_a_measurement.ogg
View file
Open in desktop
Binary file not shown.
Binary file removed Resources/Audio/_Sunrise/Music/Spectral_Synth.ogg
View file
Open in desktop
Binary file not shown.
Binary file removed Resources/Audio/_Sunrise/Music/TO.ogg
View file
Open in desktop
Binary file not shown.
Binary file removed Resources/Audio/_Sunrise/Music/The_first_day_on_orbit.ogg
View file
Open in desktop
Binary file not shown.
48 changes: 24 additions & 24 deletions Resources/Audio/_Sunrise/Music/attributions.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,24 +1,24 @@
- files: ["peace_in_the_lags.ogg"]
license: "CC-BY-3.0"
copyright: "Made by qdzava prod. Oxygen. Converted from MP3 to OGG."
source: "https://www.youtube.com/channel/UCKL0ZRkj9nOP684aRGh09ZQ"

- files: ["Spectral_Synth.ogg"]
license: "CC-BY-3.0"
copyright: "Made by qdzava prod. Oxygen. Converted from MP3 to OGG."
source: "https://www.youtube.com/channel/UCKL0ZRkj9nOP684aRGh09ZQ"

- files: ["The_first_day_on_orbit.ogg"]
license: "CC-BY-3.0"
copyright: "Made by qdzava prod. Oxygen. Converted from MP3 to OGG."
source: "https://www.youtube.com/channel/UCKL0ZRkj9nOP684aRGh09ZQ"

- files: ["TO.ogg"]
license: "CC-BY-3.0"
copyright: "Made by qdzava prod. Oxygen. Converted from MP3 to OGG."
source: "https://www.youtube.com/channel/UCKL0ZRkj9nOP684aRGh09ZQ"

- files: ["3D_is_just_a_measurement.ogg"]
license: "CC-BY-3.0"
copyright: "Made by qdzava prod. Oxygen. Converted from MP3 to OGG."
source: "https://www.youtube.com/channel/UCKL0ZRkj9nOP684aRGh09ZQ"
#- files: ["peace_in_the_lags.ogg"]

Check failure on line 1 in Resources/Audio/_Sunrise/Music/attributions.yml

View workflow job for this annotation

GitHub Actions / YAML RGA schema validator 

[/Resources/Audio/_Sunrise/Music/attributions.yml] : '{}' is not a list.
# license: "CC-BY-3.0"
# copyright: "Made by qdzava prod. Oxygen. Converted from MP3 to OGG."
# source: "https://www.youtube.com/channel/UCKL0ZRkj9nOP684aRGh09ZQ"
#
#- files: ["Spectral_Synth.ogg"]
# license: "CC-BY-3.0"
# copyright: "Made by qdzava prod. Oxygen. Converted from MP3 to OGG."
# source: "https://www.youtube.com/channel/UCKL0ZRkj9nOP684aRGh09ZQ"
#
#- files: ["The_first_day_on_orbit.ogg"]
# license: "CC-BY-3.0"
# copyright: "Made by qdzava prod. Oxygen. Converted from MP3 to OGG."
# source: "https://www.youtube.com/channel/UCKL0ZRkj9nOP684aRGh09ZQ"
#
#- files: ["TO.ogg"]
# license: "CC-BY-3.0"
# copyright: "Made by qdzava prod. Oxygen. Converted from MP3 to OGG."
# source: "https://www.youtube.com/channel/UCKL0ZRkj9nOP684aRGh09ZQ"
#
#- files: ["3D_is_just_a_measurement.ogg"]
# license: "CC-BY-3.0"
# copyright: "Made by qdzava prod. Oxygen. Converted from MP3 to OGG."
# source: "https://www.youtube.com/channel/UCKL0ZRkj9nOP684aRGh09ZQ"
Binary file removed Resources/Audio/_Sunrise/Music/peace_in_the_lags.ogg
View file
Open in desktop
Binary file not shown.
4 changes: 0 additions & 4 deletions Resources/Prototypes/SoundCollections/lobby.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,3 @@
- /Audio/Lobby/absconditus.ogg
- /Audio/Lobby/space_asshole.ogg
- /Audio/Lobby/endless_space.ogg
- /Audio/_Sunrise/Music/peace_in_the_lags.ogg # Sunrise-Music
- /Audio/_Sunrise/Music/The_first_day_on_orbit.ogg # Sunrise-Music
- /Audio/_Sunrise/Music/TO.ogg # Sunrise-Music
- /Audio/_Sunrise/Music/3D_is_just_a_measurement.ogg # Sunrise-Music
Loading