Merge lp:~widelands-dev/widelands/frisian_music into lp:widelands

Proposed by Benedikt Straub
Status: Merged
Merged at revision: 9006
Proposed branch: lp:~widelands-dev/widelands/frisian_music
Merge into: lp:widelands
Diff against target: 2 lines (+0/-0)
0 files modified
To merge this branch: bzr merge lp:~widelands-dev/widelands/frisian_music
Reviewer Review Type Date Requested Status
Klaus Halfmann Approve
Toni Förster Approve
Review via email: mp+350429@code.launchpad.net

Commit message

Includes Klaus Halfmann's Frisian-style music

To post a comment you must log in.
Revision history for this message
bunnybot (widelandsofficial) wrote :

Continuous integration builds have changed state:

Travis build 3705. State: passed. Details: https://travis-ci.org/widelands/widelands/builds/406816829.
Appveyor build 3504. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_frisian_music-3504.

Revision history for this message
Klaus Halfmann (klaus-halfmann) wrote :

Yep I composed that song,
you can find it here as sheet music:
https://musescore.com/user/18659851/scores/515845

Revision history for this message
GunChleoc (gunchleoc) wrote :

I would like to play around with the sheet music a bit because I think some of the harmonies can be improved, and trying to explain it with words doesn't work. This will have to wait until August though.

8760. By Benedikt Straub

Merged trunk

8761. By Benedikt Straub

Merged trunk

Revision history for this message
bunnybot (widelandsofficial) wrote :

Continuous integration builds have changed state:

Travis build 4016. State: failed. Details: https://travis-ci.org/widelands/widelands/builds/431852937.
Appveyor build 3813. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_frisian_music-3813.

8762. By Benedikt Straub

Merged trunk

Revision history for this message
bunnybot (widelandsofficial) wrote :

Continuous integration builds have changed state:

Travis build 4028. State: passed. Details: https://travis-ci.org/widelands/widelands/builds/432372475.
Appveyor build 3824. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_frisian_music-3824.

Revision history for this message
Benedikt Straub (nordfriese) wrote :

@Gun What´s the status here? Will this get into b20?

Revision history for this message
GunChleoc (gunchleoc) wrote :

It will once I'm happy with the harmonies. I was meaning to fix them in MuseScore because I'm failing at explaining what I mean, but I haven't gotten around to it yet.

8763. By Nordfriese

Merged trunk (new file is now named ingame_28.ogg)

Revision history for this message
bunnybot (widelandsofficial) wrote :

Continuous integration builds have changed state:

Travis build 4538. State: errored. Details: https://travis-ci.org/widelands/widelands/builds/499473308.
Appveyor build 4325. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_frisian_music-4325.

8764. By Nordfriese

Merged trunk

8765. By Nordfriese

Included latest music version

Revision history for this message
Benedikt Straub (nordfriese) wrote :

This merge request has been around for over seven months :P
I updated the branch with the latest version.
@GunChleoc is this now ready for merging? Or do we have to wait for a code review? ;)

Revision history for this message
bunnybot (widelandsofficial) wrote :

Continuous integration builds have changed state:

Travis build 4546. State: failed. Details: https://travis-ci.org/widelands/widelands/builds/499966184.
Appveyor build 4333. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_frisian_music-4333.

Revision history for this message
GunChleoc (gunchleoc) wrote :

I have not had time to listen to the newest version yet.

Revision history for this message
Toni Förster (stonerl) wrote :

I like it.

review: Approve
Revision history for this message
GunChleoc (gunchleoc) wrote :

The ogg file has no author or song title. Once that's done, this can go in.

Revision history for this message
Klaus Halfmann (klaus-halfmann) wrote :

Will add some metasata and thanks

8766. By Klaus Halfman \<<email address hidden>\>

Added tags for ingame_28.ogg

Revision history for this message
Klaus Halfmann (klaus-halfmann) wrote :

@bunnybot merge

review: Approve
Revision history for this message
bunnybot (widelandsofficial) wrote :

Refusing to merge, since Travis is not green. Use @bunnybot merge force for merging anyways.

Travis build 4563. State: failed. Details: https://travis-ci.org/widelands/widelands/builds/501553067.

Revision history for this message
Toni Förster (stonerl) wrote :

@bunnybot merge force

Revision history for this message
GunChleoc (gunchleoc) wrote :

It would have been nice to have the track's title in the commit message - now I'll have to dig into it when creating the changelog ;)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== added file 'data/music/ingame_28.ogg'
2Binary files data/music/ingame_28.ogg 1970-01-01 00:00:00 +0000 and data/music/ingame_28.ogg 2019-03-04 15:00:22 +0000 differ

Subscribers

People subscribed via source and target branches

to status/vote changes: