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 Widela
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:
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
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:
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 1081. State: passed. Details:
https://travis-ci.org/widelands/widelands/builds/127194426.
Appveyor build 912. State: failed. Details:
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-1302593-result-screen/+merge/293521
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/bug-1302593-result-screen/+merge/293521
Your team Widelands Developers is subscribed to branch
Well, it does nothing useful in the original code, so it is redundant. It
modifies a copy of the element (not the actual element!) that is destroyed
immediately after. That said, when I wrote the comment, it did not occur to me
you were trying to modify the vector's element - I thought it was
Ah, so the line is not redundant then. I'll implement the other changes that
you suggested :)
--
https://code.launchpad.net/~widelands-dev/widelands/bug-1302593-result-screen/+merge/293521
Your team Widelands Developers is subscribed to branch
Extended reply.
Diff comments:
>
> === modified file 'src/logic/playersmanager.cc'
> --- src/logic/playersmanager.cc 2016-02-16 10:27:23 +
> +++ src/logic/playersmanager.cc 2016-05-02 11:22:37 +
> @@ -120,5 +120,21 @@
> }
> }
>
> +void
Replied to the question in the diff comments.
Diff comments:
>
> === modified file 'src/logic/playersmanager.cc'
> --- src/logic/playersmanager.cc 2016-02-16 10:27:23 +
> +++ src/logic/playersmanager.cc 2016-05-02 11:22:37 +
> @@ -120,5 +120,21 @@
> }
> }
>
> +void
I have added a question in the diff comments.
Diff comments:
>
> === modified file 'src/logic/playersmanager.cc'
> --- src/logic/playersmanager.cc 2016-02-16 10:27:23 +
> +++ src/logic/playersmanager.cc 2016-05-02 11:22:37 +
> @@ -120,5 +120,21 @@
> }
> }
>
> +void
Review: Approve compile, test, code review
Testprotocol -- Testing this was not that easy ...
* bzr7981[bug-1302593-result-screen]
* Playing "Impact" with "Autocrat" as Barbarian versus (no AI)
* Imperial and Atlanters
* Saved as "Test1" before defeating Imperial
* Saved as "Test2" before
Review: Needs Fixing code, testing
See diff comments.
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-02 11:22:37 +
> @@ -72,6 +73,19
/_widelands_dev_widelands_bug_1302593_result_screen-912.
--
https://code.launchpad.net/~widelands-dev/widelands/bug-1302593-result-screen/+merge/293521
Your team Widelands Developers is requested to review the proposed merge of
lp:~widelands-dev/widelands/bug-1302593-result-screen into lp:widelands
/bug-1302593-result-screen into lp:widelands.
___
Mailing list: https://launchpad.net/~widelands-dev
Post to : widelands-dev@lists.launchpad.net
Unsubscribe : https://launchpad.net/~widelands-dev
More help : https://help.launchpad.net/ListHelp
/_widelands_dev_widelands_bug_1302593_result_screen-912.
--
https://code.launchpad.net/~widelands-dev/widelands/bug-1302593-result-screen/+merge/293521
Your team Widelands Developers is requested to review the proposed merge of
lp:~widelands-dev/widelands/bug-1302593-result-screen into lp:widelands
22 matches
Mail list logo
