widelands

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

  1. hasimusic
  2. Merge into trunk
Proposed by Klaus Halfmann
Status: Rejected
Rejected by: SirVer
Proposed branch: lp:~widelands-dev/widelands/hasimusic
Merge into: lp:widelands
Diff against target: 7 lines (+0/-0)
0 files modified
To merge this branch: bzr merge lp:~widelands-dev/widelands/hasimusic
Reviewer Review Type Date Requested Status
Klaus Halfmann Disapprove
toptopple Pending
Review via email: mp+317892@code.launchpad.net

Description of the change

After my Music was lingering around for some time now,
I now added it to the Game. As no real player plays with
music on this will not make widelands worse.

It will however change the first impression, as I used my
Widelands-Song as intro.

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

Continuous integration builds have changed state:

Travis build 1971. State: passed. Details: https://travis-ci.org/widelands/widelands/builds/203921992.
Appveyor build 1806. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_hasimusic-1806.

Revision history for this message
GunChleoc (gunchleoc) wrote :

I have sent you a PM on the forum - it's easier for me to explain in German.

I really like Silkweaver Song, the other 2 songs still need some work.

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

Will be done piece by piece, lets abandon this branch

review: Disapprove
Revision history for this message
SirVer (sirver) wrote :

Setting to rejected then.

Unmerged revisions

8298. By Klaus Halfmann \<<email address hidden>\>

Added my Music to the Game#2

8297. By Klaus Halfmann \<<email address hidden>\>

Added my Music to the Game

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== renamed file 'data/music/intro_00.ogg' => 'data/music/ingame_23.ogg'
2=== added file 'data/music/ingame_24.ogg'
3Binary files data/music/ingame_24.ogg 1970-01-01 00:00:00 +0000 and data/music/ingame_24.ogg 2017-02-21 18:15:17 +0000 differ
4=== added file 'data/music/ingame_25.ogg'
5Binary files data/music/ingame_25.ogg 1970-01-01 00:00:00 +0000 and data/music/ingame_25.ogg 2017-02-21 18:15:17 +0000 differ
6=== added file 'data/music/intro_00.ogg'
7Binary files data/music/intro_00.ogg 1970-01-01 00:00:00 +0000 and data/music/intro_00.ogg 2017-02-21 18:15:17 +0000 differ

Subscribers

People subscribed via source and target branches

to status/vote changes: