Merge lp:~widelands-dev/widelands/barbarians2-starting-objective into lp:widelands

Proposed by GunChleoc
Status: Merged
Merged at revision: 7989
Proposed branch: lp:~widelands-dev/widelands/barbarians2-starting-objective
Merge into: lp:widelands
Diff against target: 67 lines (+30/-2)
2 files modified
data/campaigns/bar02.wmf/scripting/mission_thread.lua (+14/-2)
data/campaigns/bar02.wmf/scripting/texts.lua (+16/-0)
To merge this branch: bzr merge lp:~widelands-dev/widelands/barbarians2-starting-objective
Reviewer Review Type Date Requested Status
Miroslav Remák code, testing Approve
Review via email: mp+293546@code.launchpad.net

Commit message

Barbarian Campaign 2: Added an objective to the first message.

Description of the change

Some players find it confusing that the second Barbarian scenario has no instructions in the first message. So, I have added some. This also requires the player to expand to the east a bit, which will get them closer to the tracks.

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

Continuous integration builds have changed state:

Travis build 1083. State: errored. Details: https://travis-ci.org/widelands/widelands/builds/127258989.
Appveyor build 914. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_barbarians2_starting_objective-914.

Revision history for this message
bunnybot (widelandsofficial) wrote :

Bunnybot encountered an error while working on this merge proposal:

The read operation timed out

Revision history for this message
bunnybot (widelandsofficial) wrote :

Continuous integration builds have changed state:

Travis build 1083. State: errored. Details: https://travis-ci.org/widelands/widelands/builds/127258989.
Appveyor build 914. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_barbarians2_starting_objective-914.

Revision history for this message
bunnybot (widelandsofficial) wrote :

Bunnybot encountered an error while working on this merge proposal:

The read operation timed out

Revision history for this message
bunnybot (widelandsofficial) wrote :

Continuous integration builds have changed state:

Travis build 1083. State: errored. Details: https://travis-ci.org/widelands/widelands/builds/127258989.
Appveyor build 914. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_barbarians2_starting_objective-914.

Revision history for this message
Miroslav Remák (miroslavr256) wrote :

LGTM.

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

Thanks!

@bunnybot merge

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches

to status/vote changes: