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

[Benedikt Straub]

Includes Klaus Halfmann's Frisian-style music

[bunnybot (widelandsofficial)]

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.

[Klaus Halfmann (klaus-halfmann)]

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

[GunChleoc (gunchleoc)]

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.

[bunnybot (widelandsofficial)]

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.

[bunnybot (widelandsofficial)]

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.

[Benedikt Straub (nordfriese)]

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

[GunChleoc (gunchleoc)]

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.

[bunnybot (widelandsofficial)]

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.

[Benedikt Straub (nordfriese)]

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? ;)

[bunnybot (widelandsofficial)]

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.

[GunChleoc (gunchleoc)]

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

[Toni Förster (stonerl)]

I like it.

review: Approve

[GunChleoc (gunchleoc)]

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

[Klaus Halfmann (klaus-halfmann)]

Will add some metasata and thanks

[Klaus Halfmann (klaus-halfmann)]

@bunnybot merge

review: Approve

[bunnybot (widelandsofficial)]

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.

[Toni Förster (stonerl)]

@bunnybot merge force

[GunChleoc (gunchleoc)]

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 ;)

=== added file 'data/music/ingame_28.ogg'
Binary 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