[Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1733064-program-redesign into lp:widelands
The proposal to merge lp:~widelands-dev/widelands/bug-1733064-program-redesign into lp:widelands has been updated. Status: Needs review => Merged For more details, see: https://code.launchpad.net/~widelands-dev/widelands/bug-1733064-program-redesign/+merge/349100 -- Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/bug-1733064-program-redesign. ___ 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
Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1733064-program-redesign into lp:widelands
It is very stable, but hardware constraint: - 2 cores, 4GB RAM, 2 hours runtime for each job For x64-debug builds i had to disable parallel build/linking because widelands takes ~8GB RAM on linking the x64 debug builds. Now the build scratches at the 2 hour mark and fails if it hits this limit for x64 debug. I am pretty sure, that there are still some dependencies quirks in widelands cmake files and module partitions which could help to lower memory usage and runtime on build/link, but that is a complex task. -- https://code.launchpad.net/~widelands-dev/widelands/bug-1733064-program-redesign/+merge/349100 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/bug-1733064-program-redesign. ___ 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
Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1733064-program-redesign into lp:widelands
Hm Appveyor seems to be a bit unstable especially in building the x64 debug builds. Any idea on this? -- https://code.launchpad.net/~widelands-dev/widelands/bug-1733064-program-redesign/+merge/349100 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/bug-1733064-program-redesign. ___ 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
Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1733064-program-redesign into lp:widelands
Thanks for the review :) @bunnybot merge -- https://code.launchpad.net/~widelands-dev/widelands/bug-1733064-program-redesign/+merge/349100 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/bug-1733064-program-redesign. ___ 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] [Merge] lp:~widelands-dev/widelands/bug-1733064-program-redesign into lp:widelands
Continuous integration builds have changed state: Travis build 3660. State: passed. Details: https://travis-ci.org/widelands/widelands/builds/402776370. Appveyor build 3459. State: failed. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_bug_1733064_program_redesign-3459. -- https://code.launchpad.net/~widelands-dev/widelands/bug-1733064-program-redesign/+merge/349100 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/bug-1733064-program-redesign. ___ 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
Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1733064-program-redesign into lp:widelands
Review: Approve playtest and review ok tested single player with frisians as there were the last changes. testes a 4 player AI only game with all tribes no anomalies were spotted. Code LGTM. -- https://code.launchpad.net/~widelands-dev/widelands/bug-1733064-program-redesign/+merge/349100 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/bug-1733064-program-redesign. ___ 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
Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1733064-program-redesign into lp:widelands
will playtest this branch tonight
for the beginning see 2 inline comments
Diff comments:
>
> === modified file
> 'data/tribes/buildings/productionsites/frisians/woodcutters_house/init.lua'
> --- data/tribes/buildings/productionsites/frisians/woodcutters_house/init.lua
> 2018-05-24 10:19:21 +
> +++ data/tribes/buildings/productionsites/frisians/woodcutters_house/init.lua
> 2018-07-09 17:40:45 +
> @@ -49,7 +49,7 @@
> descname = _"felling trees",
> actions = {
> "sleep=3",
> -"worker=chop"
> +"callworker=chop"
> }
has been changed to
callworker=harvest
for the other tribes
>},
> },
>
> === modified file 'src/logic/map_objects/tribes/worker_program.cc'
> --- src/logic/map_objects/tribes/worker_program.cc2018-04-27 06:11:05
> +
> +++ src/logic/map_objects/tribes/worker_program.cc2018-07-09 17:40:45
> +
> @@ -184,13 +191,13 @@
> Example::
>
>fish = {
> - "findspace size:any radius:7 resource:fish",
> - "walk coords",
> - "play_sound sound/fisher fisher_throw_net 192",
> - "mine fish 1", -- Remove a fish in an area of 1
> - "animation fishing 3000",
> - "play_sound sound/fisher fisher_pull_net 192",
> - "createware fish",
> + "findspace=size:any radius:7 resource:fish",
> + "walk=coords",
> + "playsound=sound/fisher fisher_throw_net 192",
> + "mine fish=1", -- Remove a fish in an area of 1
should be "mine=fish 1"
but doesn't do any harm as it is an example comment only
> + "animate=fishing 3000",
> + "playsound=sound/fisher fisher_pull_net 192",
> + "createware=fish",
> "return"
>},
> */
--
https://code.launchpad.net/~widelands-dev/widelands/bug-1733064-program-redesign/+merge/349100
Your team Widelands Developers is requested to review the proposed merge of
lp:~widelands-dev/widelands/bug-1733064-program-redesign 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] [Merge] lp:~widelands-dev/widelands/bug-1733064-program-redesign into lp:widelands
Continuous integration builds have changed state: Travis build 3652. State: passed. Details: https://travis-ci.org/widelands/widelands/builds/401883448. Appveyor build 3451. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_bug_1733064_program_redesign-3451. -- https://code.launchpad.net/~widelands-dev/widelands/bug-1733064-program-redesign/+merge/349100 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/bug-1733064-program-redesign 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] [Merge] lp:~widelands-dev/widelands/bug-1733064-program-redesign into lp:widelands
Continuous integration builds have changed state: Travis build 3648. State: failed. Details: https://travis-ci.org/widelands/widelands/builds/401502283. Appveyor build 3447. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_bug_1733064_program_redesign-3447. -- https://code.launchpad.net/~widelands-dev/widelands/bug-1733064-program-redesign/+merge/349100 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/bug-1733064-program-redesign 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
