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 Music Manager menu / in-game options, ATD soundtrack #1280

Merged
merged 7 commits into from Nov 10, 2020
Merged

Add Music Manager menu / in-game options, ATD soundtrack #1280

merged 7 commits into from Nov 10, 2020

Conversation

past-due
Copy link
Member

@past-due past-due commented Nov 9, 2020 •
edited

Notes for Developers:
Be sure to re-init Git submodules (and re-run CMake configure), as this uses a different checkout of https://github.com/Warzone2100/data-music

Screenshots

musicmanager_menu_sm

musicmanager_ingame_sm

Details

Music album refactoring

  • Music (besides the menu music) is now stored in subfolders of data/music/albums/
  • Album folders contain .ogg files, an album.json file, and an album cover .png
  • Music playlist can be configured per game-mode
  • Albums can default enable / disable tracks for each game-mode
  • Add the ability to register CDAudioEventSinks
  • Update the music submodule to include higher-quality original soundtrack files (in the new album arrangement), and the new ATD Soundtrack
    • The ATD Soundtrack is only enabled, by default, for non-campaign game modes. (By default, only the original tracks are enabled when playing the campaign.)

Add Music Manager menu / in-game options

  • Music track playlist can now be configured per game-mode
  • Can immediately switch to any track
  • Displays details of the currently-playing music track

@past-due
Add sound_GetOggVorbisTotalTime()
cf8aaf2 
(Only works for seekable streams.)
@past-due
Replace assert in wzSetWindowIsResizable()
d049718
@past-due
sound_PlayStreamWithBuf now takes std::function onFinished callback
da46214
@past-due
Add sound_GetStreamTotalTime()
dc2861f
@past-due
ScrollBarWidget::updateSlider() - fix slider pos
25c5328
@past-due
Music album refactoring
a530784 
- Music (besides the menu music) is now stored in subfolders of data/music/albums/
- Album folders contain .ogg files, an "album.json" file, and an album cover .png
- Music playlist can be configured per game-mode
- Albums can default enable / disable tracks for each game-mode
- Add the ability to register CDAudioEventSinks
- Update the music submodule to include higher-quality original soundtrack files (in the new album arrangement), and the new ATD Soundtrack
@past-due
Add Music Manager menu / in-game options
f84ccce 
- Music track playlist can now be configured per game-mode
- Can immediately switch to any track
- Displays details of the currently-playing music track
@past-due past-due added this to the 3.5.0 milestone Nov 9, 2020
Lupus-Mechanicus
Lupus-Mechanicus reviewed Nov 10, 2020
View reviewed changes
Copy link
Member

@Lupus-Mechanicus Lupus-Mechanicus left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Now this is a big PR, both in size and in what's in it.

@Iniquitatis
Copy link

@AlexTheDacian Oh, wow. Thanks a lot for the wonderful soundtrack!

@past-due past-due merged commit 2a9a628 into Warzone2100:master Nov 10, 2020
@past-due past-due deleted the 2020_music_manager_1 branch November 10, 2020 14:26
@Lupus-Mechanicus
Copy link
Member

AAAAAAhhhh!!! It's a thing now!

@past-due past-due mentioned this pull request Nov 10, 2020
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Lupus-Mechanicus Lupus-Mechanicus Lupus-Mechanicus left review comments

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
4.0.0 beta1
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@past-due @Iniquitatis @Lupus-Mechanicus