widelands

Merge lp://qastaging/~stephan-lutz/widelands/bug_1831499_empire3_fixes into lp://qastaging/widelands

  1. bug_1831499_empire3_fixes
  2. Merge into trunk
Proposed by hessenfarmer
Status: Merged
Merged at revision: 9182
Proposed branch: lp://qastaging/~stephan-lutz/widelands/bug_1831499_empire3_fixes
Merge into: lp://qastaging/widelands
Diff against target: 59 lines (+4/-12)
2 files modified
data/campaigns/emp03.wmf/scripting/helper_functions.lua (+2/-3)
data/campaigns/emp03.wmf/scripting/mission_thread.lua (+2/-9)
To merge this branch: bzr merge lp://qastaging/~stephan-lutz/widelands/bug_1831499_empire3_fixes
Reviewer Review Type Date Requested Status
GunChleoc Approve
Review via email: mp+370405@code.qastaging.launchpad.net

Commit message

fixes in the 3rd empire scenario

Description of the change

artifacts task now triggered earlier.
cleaned the code from unused / unnecessary variables

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

Continuous integration builds have changed state:

Travis build 5277. State: errored. Details: https://travis-ci.org/widelands/widelands/builds/562425741.
Appveyor build 5052. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_stephan_lutz_widelands_bug_1831499_empire3_fixes-5052.

Revision history for this message
GunChleoc (gunchleoc) wrote :

Code LGTM, not tested.

review: Approve
Revision history for this message
hessenfarmer (stephan-lutz) wrote :

I had tested my changes before uploading. Shall we have it then or wait for a tester?

Revision history for this message
GunChleoc (gunchleoc) wrote :

Let's have if so that it won't grow stale.

@bunnybot merge

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 5277. State: errored. Details: https://travis-ci.org/widelands/widelands/builds/562425741.

Revision history for this message
bunnybot (widelandsofficial) wrote :

Continuous integration builds have changed state:

Travis build 5327. State: passed. Details: https://travis-ci.org/widelands/widelands/builds/571528963.
Appveyor build 5099. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_stephan_lutz_widelands_bug_1831499_empire3_fixes-5099.

Revision history for this message
hessenfarmer (stephan-lutz) wrote :

@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: