The proposal to merge lp:~widelands-dev/widelands/bug-1302593-result-screen
into lp:widelands has been updated.
Status: Needs review => Merged
For more details, see:
https://code.launchpad.net/~widelands-dev/widelands/bug-1302593-result-screen/+merge/293521
--
Your team Widelands
Continuous integration builds have changed state:
Travis build 1104. State: passed. Details:
https://travis-ci.org/widelands/widelands/builds/129436968.
Appveyor build 941. State: success. Details:
Nits are good, they make the code better :)
Let's wait for Travis before merging, we have a codecheck error.
--
https://code.launchpad.net/~widelands-dev/widelands/bug-1535065-random-map-id/+merge/294379
Your team Widelands Developers is subscribed to branch
Thanks again!
@bunnybot merge
--
https://code.launchpad.net/~widelands-dev/widelands/bug-1302593-result-screen/+merge/293521
Your team Widelands Developers is subscribed to branch
lp:~widelands-dev/widelands/bug-1302593-result-screen.
___
Mailing
Review: Approve code, testing
LGTM. Just one little nitpick (sorry, couldn't help it!): map_info.landRatio
etc. are not percentages. Displaying these numbers alongside a percent sign
denotes an entirely different ratio.
--
I have also done some limited testing using the 'report_result' Lua function
and I can confirm that the end statues are saved and loaded correctly. Win
conditions should also work properly since they make use of this function.
--
Review: Approve code
LGTM.
--
https://code.launchpad.net/~widelands-dev/widelands/bug-1302593-result-screen/+merge/293521
Your team Widelands Developers is subscribed to branch
lp:~widelands-dev/widelands/bug-1302593-result-screen.
___
Mailing list:
GunChleoc has proposed merging
lp:~widelands-dev/widelands/bug-1535065-random-map-id into lp:widelands.
Commit message:
Fixed Island Mode on/off for random map generation. Added log output.
Requested reviews:
Widelands Developers (widelands-dev)
Related bugs:
Bug #1535065 in widelands:
Duh! Thanks for having my back.
--
https://code.launchpad.net/~widelands-dev/widelands/bug-1302593-result-screen/+merge/293521
Your team Widelands Developers is subscribed to branch
lp:~widelands-dev/widelands/bug-1302593-result-screen.
___
Mailing
Review: Needs Fixing code
Review.
Diff comments:
> === modified file 'src/game_io/game_player_info_packet.cc'
> --- src/game_io/game_player_info_packet.cc2016-02-16 10:27:23 +
> +++ src/game_io/game_player_info_packet.cc2016-05-11 06:51:52 +
> @@ -72,6 +73,21 @@
>
Continuous integration builds have changed state:
Travis build 1088. State: errored. Details:
https://travis-ci.org/widelands/widelands/builds/127723256.
Appveyor build 919. State: failed. Details:
Continuous integration builds have changed state:
Travis build 1023. State: passed. Details:
https://travis-ci.org/widelands/widelands/builds/123856414.
Appveyor build 855. State: success. Details:
Continuous integration builds have changed state:
Travis build 1056. State: passed. Details:
https://travis-ci.org/widelands/widelands/builds/125357667.
Appveyor build 887. State: success. Details:
Continuous integration builds have changed state:
Travis build 1081. State: passed. Details:
https://travis-ci.org/widelands/widelands/builds/127194426.
Appveyor build 912. State: failed. Details:
Continuous integration builds have changed state:
Travis build 1098. State: passed. Details:
https://travis-ci.org/widelands/widelands/builds/128553513.
Appveyor build 935. State: success. Details:
Bunnybot encountered an error while working on this merge proposal:
HTTP Error 500: Internal Server Error
--
https://code.launchpad.net/~widelands-dev/widelands/fh1_multiline_textarea/+merge/292033
Your team Widelands Developers is requested to review the proposed merge of
Bunnybot encountered an error while working on this merge proposal:
HTTP Error 500: Internal Server Error
--
https://code.launchpad.net/~widelands-dev/widelands/trident-sp/+merge/292121
Your team Widelands Developers is requested to review the proposed merge of
Bunnybot encountered an error while working on this merge proposal:
HTTP Error 500: Internal Server Error
--
https://code.launchpad.net/~widelands-dev/widelands/bug-1302593-result-screen/+merge/293521
Your team Widelands Developers is subscribed to branch
Bunnybot encountered an error while working on this merge proposal:
HTTP Error 500: Internal Server Error
--
https://code.launchpad.net/~widelands-dev/widelands/bug-1536377-texture-atlas-size/+merge/293067
Your team Widelands Developers is requested to review the proposed merge of
Bunnybot encountered an error while working on this merge proposal:
HTTP Error 500: Internal Server Error
--
https://code.launchpad.net/~widelands-dev/widelands/fh1_multiline_textarea/+merge/292033
Your team Widelands Developers is requested to review the proposed merge of
Bunnybot encountered an error while working on this merge proposal:
HTTP Error 500: Internal Server Error
--
https://code.launchpad.net/~widelands-dev/widelands/trident-sp/+merge/292121
Your team Widelands Developers is requested to review the proposed merge of
Bunnybot encountered an error while working on this merge proposal:
HTTP Error 500: Internal Server Error
--
https://code.launchpad.net/~widelands-dev/widelands/bug-1536377-texture-atlas-size/+merge/293067
Your team Widelands Developers is requested to review the proposed merge of
Bunnybot encountered an error while working on this merge proposal:
HTTP Error 500: Internal Server Error
--
https://code.launchpad.net/~widelands-dev/widelands/bug-1302593-result-screen/+merge/293521
Your team Widelands Developers is subscribed to branch
Bunnybot encountered an error while working on this merge proposal:
HTTP Error 500: Internal Server Error
--
https://code.launchpad.net/~widelands-dev/widelands/bug-1548932-editor-save-zip-2/+merge/294067
Your team Widelands Developers is subscribed to branch
Review: Resubmit
Now I get it - I forgot to use a reference instead of a copy. Should be all
fixed now :)
--
https://code.launchpad.net/~widelands-dev/widelands/bug-1302593-result-screen/+merge/293521
Your team Widelands Developers is subscribed to branch
Bunnybot encountered an error while working on this merge proposal:
HTTP Error 503: Service Unavailable
--
https://code.launchpad.net/~widelands-dev/widelands/fh1_multiline_textarea/+merge/292033
Your team Widelands Developers is requested to review the proposed merge of
Bunnybot encountered an error while working on this merge proposal:
HTTP Error 503: Service Unavailable
--
https://code.launchpad.net/~widelands-dev/widelands/trident-sp/+merge/292121
Your team Widelands Developers is requested to review the proposed merge of
Bunnybot encountered an error while working on this merge proposal:
HTTP Error 503: Service Unavailable
--
https://code.launchpad.net/~widelands-dev/widelands/bug-1536377-texture-atlas-size/+merge/293067
Your team Widelands Developers is requested to review the proposed merge of
Bunnybot encountered an error while working on this merge proposal:
HTTP Error 500: Internal Server Error
--
https://code.launchpad.net/~widelands-dev/widelands/bug-1548932-editor-save-zip-2/+merge/294067
Your team Widelands Developers is subscribed to branch
Bunnybot encountered an error while working on this merge proposal:
HTTP Error 503: Service Unavailable
--
https://code.launchpad.net/~widelands-dev/widelands/fh1_multiline_textarea/+merge/292033
Your team Widelands Developers is requested to review the proposed merge of
Bunnybot encountered an error while working on this merge proposal:
HTTP Error 503: Service Unavailable
--
https://code.launchpad.net/~widelands-dev/widelands/trident-sp/+merge/292121
Your team Widelands Developers is requested to review the proposed merge of
Bunnybot encountered an error while working on this merge proposal:
HTTP Error 503: Service Unavailable
--
https://code.launchpad.net/~widelands-dev/widelands/bug-1536377-texture-atlas-size/+merge/293067
Your team Widelands Developers is requested to review the proposed merge of
Bunnybot encountered an error while working on this merge proposal:
HTTP Error 503: Service Unavailable
--
https://code.launchpad.net/~widelands-dev/widelands/bug-1302593-result-screen/+merge/293521
Your team Widelands Developers is subscribed to branch
Bunnybot encountered an error while working on this merge proposal:
HTTP Error 503: Service Unavailable
--
https://code.launchpad.net/~widelands-dev/widelands/bug-1548932-editor-save-zip-2/+merge/294067
Your team Widelands Developers is subscribed to branch
In case this helps, we also have a saving bug on Mac that is related:
https://bugs.launchpad.net/widelands/+bug/1568540
--
https://code.launchpad.net/~widelands-dev/widelands/bug-1548932-editor-save-zip-2/+merge/294067
Your team Widelands Developers is subscribed to branch
35 matches
Mail list logo