Re: [Widelands-dev] [Merge] lp:~stonerl/widelands/big_inn_missing_animation_fixed into lp:~widelands-dev/widelands/mines-worldsavior
> exactly. Thanks a lot. Just a quick question: > > Ican't do any changes until Monday as I am not at home, could you do the same > for empire and frisians buildings as well? > If yes we should wait with the merge. If no this can go in. Done. -- https://code.launchpad.net/~stonerl/widelands/big_inn_missing_animation_fixed/+merge/352887 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/mines-worldsavior. ___ 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:~stonerl/widelands/big_inn_missing_animation_fixed into lp:~widelands-dev/widelands/mines-worldsavior
Yes, no problem. But I found a severe problem regarding production times: https://wl.widelands.org/forum/post/25597/ This also affects the inns. > On 10. Aug 2018, at 22:36, hessenfarmer wrote: > > Review: Approve > > exactly. Thanks a lot. Just a quick question: > > Ican't do any changes until Monday as I am not at home, could you do the same > for empire and frisians buildings as well? > If yes we should wait with the merge. If no this can go in. > > > -- > https://code.launchpad.net/~stonerl/widelands/big_inn_missing_animation_fixed/+merge/352887 > You are the owner of lp:~stonerl/widelands/big_inn_missing_animation_fixed. -- https://code.launchpad.net/~stonerl/widelands/big_inn_missing_animation_fixed/+merge/352887 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/mines-worldsavior. ___ 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:~stonerl/widelands/big_inn_missing_animation_fixed into lp:~widelands-dev/widelands/mines-worldsavior
Review: Approve exactly. Thanks a lot. Just a quick question: Ican't do any changes until Monday as I am not at home, could you do the same for empire and frisians buildings as well? If yes we should wait with the merge. If no this can go in. -- https://code.launchpad.net/~stonerl/widelands/big_inn_missing_animation_fixed/+merge/352887 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/mines-worldsavior. ___ 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-1619402-port-work-area-on-expedition into lp:widelands
Refusing to merge, since Travis is not green. Use @bunnybot merge force for merging anyways. Travis build 3767. State: errored. Details: https://travis-ci.org/widelands/widelands/builds/414413078. -- https://code.launchpad.net/~widelands-dev/widelands/bug-1619402-port-work-area-on-expedition/+merge/349594 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/bug-1619402-port-work-area-on-expedition. ___ 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-1619402-port-work-area-on-expedition into lp:widelands
Continuous integration builds have changed state: Travis build 3767. State: errored. Details: https://travis-ci.org/widelands/widelands/builds/414413078. Appveyor build 3566. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_bug_1619402_port_work_area_on_expedition-3566. -- https://code.launchpad.net/~widelands-dev/widelands/bug-1619402-port-work-area-on-expedition/+merge/349594 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/bug-1619402-port-work-area-on-expedition. ___ 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/lenient_allowed_buildings into lp:widelands
Continuous integration builds have changed state: Travis build 3766. State: errored. Details: https://travis-ci.org/widelands/widelands/builds/414411279. Appveyor build 3565. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_lenient_allowed_buildings-3565. -- https://code.launchpad.net/~widelands-dev/widelands/lenient_allowed_buildings/+merge/351749 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/lenient_allowed_buildings 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
Re: [Widelands-dev] [Merge] lp:~stonerl/widelands/big_inn_missing_animation_fixed into lp:~widelands-dev/widelands/mines-worldsavior
Hope this is what you imagined. -- https://code.launchpad.net/~stonerl/widelands/big_inn_missing_animation_fixed/+merge/352887 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/mines-worldsavior. ___ 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-1784490-show-version-in-mac-finder into lp:widelands
Refusing to merge, since Travis is not green. Use @bunnybot merge force for merging anyways. Travis build 3765. State: errored. Details: https://travis-ci.org/widelands/widelands/builds/414409747. -- https://code.launchpad.net/~widelands-dev/widelands/bug-1784490-show-version-in-mac-finder/+merge/352874 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/bug-1784490-show-version-in-mac-finder 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-1784490-show-version-in-mac-finder into lp:widelands
Continuous integration builds have changed state: Travis build 3765. State: errored. Details: https://travis-ci.org/widelands/widelands/builds/414409747. Appveyor build 3564. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_bug_1784490_show_version_in_mac_finder-3564. -- https://code.launchpad.net/~widelands-dev/widelands/bug-1784490-show-version-in-mac-finder/+merge/352874 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/bug-1784490-show-version-in-mac-finder 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
Re: [Widelands-dev] [Merge] lp:~stonerl/widelands/big_inn_missing_animation_fixed into lp:~widelands-dev/widelands/mines-worldsavior
leading sleep times (penalty for not being supplied with all wares) have been reduced intentionally. However they are still different between the food preparing buildings of the tribes ( taverns, inns, big inns, drinking halls, etc.) Therefore I would propose to have an equal leading sleep time for only the first product (ration) of max 5000 (5s) and no leading sleep time for the other products while keeping the total time. The order should be 1. playsound 2. animate=working (this should ensure the sound is played while the animation runs 3. if necessary a short sleep time (around 5 to 10 seconds) at the end before the ware gets delivered to the flag. this would look nicely in the game to have a short pause between working and delivering (could simulate the time to serve the dish). Could you please check all of the meal producing buildings and adjust their cycles accordingly? -- https://code.launchpad.net/~stonerl/widelands/big_inn_missing_animation_fixed/+merge/352887 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/mines-worldsavior. ___ 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-1783878_editor_random_map_tribe into lp:widelands
My suggestion has been based solely on general programming principles, not on reading the code. I'm not familiar with the relevant files. I had a look and they are a mess (as most of the codebase is). If someone points me to specific places in the code, maybe I could do it. -- https://code.launchpad.net/~widelands-dev/widelands/bug-1783878_editor_random_map_tribe/+merge/352038 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/bug-1783878_editor_random_map_tribe. ___ 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:~stonerl/widelands/big_inn_missing_animation_fixed into lp:~widelands-dev/widelands/mines-worldsavior
Toni Förster has proposed merging
lp:~stonerl/widelands/big_inn_missing_animation_fixed into
lp:~widelands-dev/widelands/mines-worldsavior.
Requested reviews:
hessenfarmer (stephan-lutz)
For more details, see:
https://code.launchpad.net/~stonerl/widelands/big_inn_missing_animation_fixed/+merge/352887
--
Your team Widelands Developers is subscribed to branch
lp:~widelands-dev/widelands/mines-worldsavior.
=== modified file 'data/tribes/buildings/productionsites/barbarians/big_inn/init.lua'
--- data/tribes/buildings/productionsites/barbarians/big_inn/init.lua 2018-07-24 09:10:45 +
+++ data/tribes/buildings/productionsites/barbarians/big_inn/init.lua 2018-08-10 10:40:08 +
@@ -71,10 +71,10 @@
actions = {
-- time total: 33
"return=skipped unless economy needs ration",
-"sleep=23000",
+"sleep=16000",
"consume=barbarians_bread,fish,meat",
"playsound=sound/barbarians/taverns tavern 100",
-"sleep=1",
+"animate=working 17000",
"produce=ration"
}
},
@@ -84,9 +84,10 @@
actions = {
-- time total: 37
"return=skipped unless economy needs snack",
+"sleep=5000",
"consume=barbarians_bread fish,meat beer",
"playsound=sound/barbarians/taverns biginn 100",
-"sleep=37000",
+"animate=working 32000",
"produce=snack"
}
},
@@ -96,9 +97,10 @@
actions = {
-- time total: 40
"return=skipped unless economy needs meal",
+"sleep=5000",
"consume=barbarians_bread fish,meat beer_strong",
"playsound=sound/barbarians/taverns biginn 100",
-"sleep=4",
+"animate=working 35000",
"produce=meal"
}
},
___
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:~stonerl/widelands/big_inn_missing_animation into lp:~widelands-dev/widelands/mines-worldsavior
The proposal to merge lp:~stonerl/widelands/big_inn_missing_animation into lp:~widelands-dev/widelands/mines-worldsavior has been updated. Status: Needs review => Superseded For more details, see: https://code.launchpad.net/~stonerl/widelands/big_inn_missing_animation/+merge/352844 -- Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/mines-worldsavior. ___ 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:~stonerl/widelands/big_inn_missing_animation into lp:~widelands-dev/widelands/mines-worldsavior
Review: Disapprove The underlying bug should be fixed. Thanks for spotting it. However as the merge request is not tegeted to trunk but to the Mines-worldsavior branch it should have been branched from this branch. instead it is branche from trunk which leads to difficulties. So I would propose to fix the small big inn issues manually either in mines-worldsavior or in trunk after mines-worldsavior has been merged. -- https://code.launchpad.net/~stonerl/widelands/big_inn_missing_animation/+merge/352844 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/mines-worldsavior. ___ 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-1784113-desktop-file-utils into lp:widelands
The proposal to merge lp:~widelands-dev/widelands/bug-1784113-desktop-file-utils into lp:widelands has been updated. Status: Needs review => Merged For more details, see: https://code.launchpad.net/~widelands-dev/widelands/bug-1784113-desktop-file-utils/+merge/351614 -- Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/bug-1784113-desktop-file-utils 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-1784490-show-version-in-mac-finder into lp:widelands
GunChleoc has proposed merging lp:~widelands-dev/widelands/bug-1784490-show-version-in-mac-finder into lp:widelands. Commit message: Add CFBundleShortVersionString to Mac builds. Requested reviews: Widelands Developers (widelands-dev) Related bugs: Bug #1784490 in widelands: "macOS: Version neither in Finder nor Spotlight shown" https://bugs.launchpad.net/widelands/+bug/1784490 For more details, see: https://code.launchpad.net/~widelands-dev/widelands/bug-1784490-show-version-in-mac-finder/+merge/352874 -- Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/bug-1784490-show-version-in-mac-finder into lp:widelands. === modified file 'utils/macos/build_app.sh' --- utils/macos/build_app.sh 2017-05-14 21:06:23 + +++ utils/macos/build_app.sh 2018-08-10 07:56:58 + @@ -62,6 +62,7 @@ CFBundleDisplayName = Widelands; CFBundleIdentifier = "org.widelands.wl"; CFBundleVersion = "$WLVERSION"; + CFBundleShortVersionString = "$WLVERSION"; CFBundleInfoDictionaryVersion = "6.0"; CFBundlePackageType = APPL; CFBundleSignature = wdld; ___ 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-1784490-show-version-in-mac-finder into lp:widelands
@bunnybot merge -- https://code.launchpad.net/~widelands-dev/widelands/bug-1784490-show-version-in-mac-finder/+merge/352874 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/bug-1784490-show-version-in-mac-finder 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
Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1784113-desktop-file-utils into lp:widelands
@bunnybot merge -- https://code.launchpad.net/~widelands-dev/widelands/bug-1784113-desktop-file-utils/+merge/351614 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/bug-1784113-desktop-file-utils 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/ship_scheduling_2 into lp:widelands
The proposal to merge lp:~widelands-dev/widelands/ship_scheduling_2 into lp:widelands has been updated. Description changed to: See description of the branch: https://code.launchpad.net/~widelands-dev/widelands/ship_scheduling_2 Get windows builds and ask for testing - do not review yet For more details, see: https://code.launchpad.net/~widelands-dev/widelands/ship_scheduling_2/+merge/352335 -- Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/ship_scheduling_2 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/ship_scheduling_2 into lp:widelands
The proposal to merge lp:~widelands-dev/widelands/ship_scheduling_2 into lp:widelands has been updated. Commit message changed to: For more details, see: https://code.launchpad.net/~widelands-dev/widelands/ship_scheduling_2/+merge/352335 -- Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/ship_scheduling_2 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
Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1619402-port-work-area-on-expedition into lp:widelands
I have fixed the disappearing work area when a construction site finishes, so this can go in now. Thanks for the review and for tracking down the bug :) @bunnybot merge -- https://code.launchpad.net/~widelands-dev/widelands/bug-1619402-port-work-area-on-expedition/+merge/349594 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/bug-1619402-port-work-area-on-expedition. ___ 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:~stonerl/widelands/big_inn_missing_animation into lp:~widelands-dev/widelands/mines-worldsavior
Thanks for the fix! I thin the sleep should be before the play_sound too, so that the sound will go with the animation? You also accidentally committed some changes to the translation files. -- https://code.launchpad.net/~stonerl/widelands/big_inn_missing_animation/+merge/352844 Your team Widelands Developers is requested to review the proposed merge of lp:~stonerl/widelands/big_inn_missing_animation into lp:~widelands-dev/widelands/mines-worldsavior. ___ 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
