widelands

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

  1. local_functions
  2. Merge into trunk
Proposed by SirVer
Status: Merged
Merged at revision: 8089
Proposed branch: lp:~widelands-dev/widelands/local_functions
Merge into: lp:widelands
To merge this branch: bzr merge lp:~widelands-dev/widelands/local_functions
Reviewer Review Type Date Requested Status
Klaus Halfmann compile test Approve
GunChleoc code Approve
Review via email: mp+305415@code.launchpad.net

Commit message

  - Make territorial_* win conditions use local Lua functions. This should fix
    loading issues.
  - Fix some coroutines checking for killed players in win conditions.

Description of the change

This might fix bug 1617576.

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

Code LGTM, needs testing.

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

Continuous integration builds have changed state:

Travis build 1314. State: passed. Details: https://travis-ci.org/widelands/widelands/builds/159126920.
Appveyor build 1156. State: failed. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_local_functions-1156.

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

OK, about to fetch this, but its a bit late for today ...

Revision history for this message
GunChleoc (gunchleoc) wrote :

No worries, there's a lot of bugs to double-check for this one.

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

That fixed #1617576 for me, Launchpad does not show me the sources yet,
so Ill try to check the code later.

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

I already did the code review, so this can go in :)

@bunnybot merge

Revision history for this message
GunChleoc (gunchleoc) wrote :

@bunnybot merge

Revision history for this message
bunnybot (widelandsofficial) wrote :

Bunnybot encountered an error while working on this merge proposal:

Running 'bzr commit -m Merged lp:~widelands-dev/widelands/local_functions:
  - Make territorial_* win conditions use local Lua functions. This should fix
    loading issues.
  - Fix some coroutines checking for killed players in win conditions.' failed. Output:

Committing to: /home/bunnybot/bunnybot/data/bzr_repo/_widelands_dev_widelands_trunk/
bzr: ERROR: No changes to commit. Please 'bzr add' the files you want to commit, or use --unchanged to force an empty commit.

Subscribers

People subscribed via source and target branches

to status/vote changes: