Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/shipyard_statistics into lp:widelands
Review: Approve LGTM :) Let's wait for the other branch to go in, then merge this. -- https://code.launchpad.net/~widelands-dev/widelands/shipyard_statistics/+merge/354208 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/bug-1786613-10s-return-skipped. ___ 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-1786613-10s-return-skipped into lp:widelands
LGTM :) @bunnybot merge -- https://code.launchpad.net/~widelands-dev/widelands/bug-1786613-10s-return-skipped/+merge/354381 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/bug-1786613-10s-return-skipped. ___ 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-1786613-10s-return-skipped into lp:widelands
The proposal to merge lp:~widelands-dev/widelands/bug-1786613-10s-return-skipped into lp:widelands has been updated. Commit message changed to: Introduced the return value no_stats for work programs. For more details, see: https://code.launchpad.net/~widelands-dev/widelands/bug-1786613-10s-return-skipped/+merge/354381 -- Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/bug-1786613-10s-return-skipped. ___ 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/big_inn_missing_animation into lp:widelands
Toni Förster has proposed merging lp:~widelands-dev/widelands/big_inn_missing_animation into lp:widelands. Commit message: added missing working animation for barbarians big_inn Requested reviews: Widelands Developers (widelands-dev) For more details, see: https://code.launchpad.net/~widelands-dev/widelands/big_inn_missing_animation/+merge/354466 -- Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/big_inn_missing_animation into lp:widelands. === modified file 'data/tribes/buildings/productionsites/barbarians/big_inn/init.lua' --- data/tribes/buildings/productionsites/barbarians/big_inn/init.lua 2017-11-18 17:57:00 + +++ data/tribes/buildings/productionsites/barbarians/big_inn/init.lua 2018-09-07 10:44:23 + @@ -74,7 +74,7 @@ "sleep=23000", "consume=barbarians_bread,fish,meat", "playsound=sound/barbarians/taverns tavern 100", -"sleep=1", +"animate=working 1", "produce=ration" } }, @@ -87,7 +87,7 @@ "sleep=5000", "consume=barbarians_bread fish,meat beer", "playsound=sound/barbarians/taverns biginn 100", -"sleep=32000", +"animate=working 32000", "produce=snack" } }, @@ -100,7 +100,7 @@ "sleep=5000", "consume=barbarians_bread fish,meat beer_strong", "playsound=sound/barbarians/taverns biginn 100", -"sleep=35000", +"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:~widelands-dev/widelands/animation_woodhardener into lp:widelands
Toni Förster has proposed merging
lp:~widelands-dev/widelands/animation_woodhardener into lp:widelands.
Commit message:
Use working animations for the barbarians wood hardener.
They were in place but idle animation were used instead.
Requested reviews:
Widelands Developers (widelands-dev)
For more details, see:
https://code.launchpad.net/~widelands-dev/widelands/animation_woodhardener/+merge/354465
--
Your team Widelands Developers is requested to review the proposed merge of
lp:~widelands-dev/widelands/animation_woodhardener into lp:widelands.
=== modified file 'data/tribes/buildings/productionsites/barbarians/wood_hardener/init.lua'
--- data/tribes/buildings/productionsites/barbarians/wood_hardener/init.lua 2017-11-18 17:57:00 +
+++ data/tribes/buildings/productionsites/barbarians/wood_hardener/init.lua 2018-09-07 10:38:07 +
@@ -28,7 +28,7 @@
hotspot = { 52, 64 },
},
working = {
- pictures = path.list_files(dirname .. "idle_??.png"), -- TODO(GunChleoc): No animation yet.
+ pictures = path.list_files(dirname .. "working_??.png"),
hotspot = { 52, 64 },
},
unoccupied = {
___
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/animation_woodhardener into lp:widelands
Review: Approve LGTM Good spot -- https://code.launchpad.net/~widelands-dev/widelands/animation_woodhardener/+merge/354465 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/animation_woodhardener. ___ 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/big_inn_missing_animation into lp:widelands
Review: Approve Very good catch -- https://code.launchpad.net/~widelands-dev/widelands/big_inn_missing_animation/+merge/354466 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/big_inn_missing_animation. ___ 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/empire04_bug_fix_enhance into lp:widelands
Review: Approve Currently it's not possible to have the farms dismanteable after the plans are found as the objective to click on the farm window works fine I Think we should have this. @bunnybot merge -- https://code.launchpad.net/~widelands-dev/widelands/empire04_bug_fix_enhance/+merge/353742 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/empire04_bug_fix_enhance. ___ 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/macos_build_app_ICU into lp:widelands
Toni Förster has proposed merging lp:~widelands-dev/widelands/macos_build_app_ICU into lp:widelands. Commit message: check for minor version of CMake only export ICU_ROOT if CMake version is lower than 3.12 Requested reviews: Widelands Developers (widelands-dev) For more details, see: https://code.launchpad.net/~widelands-dev/widelands/macos_build_app_ICU/+merge/354490 This eliminates the errors when using CMake 3.12 or newer and doesn't brake SirVer's nightlies. -- Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/macos_build_app_ICU into lp:widelands. === modified file 'utils/macos/build_app.sh' --- utils/macos/build_app.sh 2018-08-20 21:11:01 + +++ utils/macos/build_app.sh 2018-09-07 15:15:13 + @@ -58,6 +58,9 @@ exit 1 fi +# We asume CMake 3.x is used and check for the minor version +CMAKE_VERSION=$(cmake --version | grep -Eo '3.*' | cut -d . -f 2) + # Check if the SDK for the minimum build target is available. # If not, use the one for the installed macOS Version OSX_MIN_VERSION="10.7" @@ -183,7 +186,9 @@ # However Mac OS X nighlies cannot upgrade to a newer cmake version than # 3.9.4 since nothing newer compiles on Mac OS X 10.7 which is used to build # the nightlies. - export ICU_ROOT="$(brew --prefix icu4c)" + if [ "$CMAKE_VERSION" -lt "12" ]; then + export ICU_ROOT="$(brew --prefix icu4c)" + fi cmake $SOURCE_DIR -G Ninja \ -DCMAKE_C_COMPILER:FILEPATH="$C_COMPILER" \ ___ 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/rework-resource-indicators into lp:widelands
Uploaded new graphics for empire and atlantean resis. How about these? -- https://code.launchpad.net/~widelands-dev/widelands/rework-resource-indicators/+merge/353996 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/rework-resource-indicators. ___ 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/macos_build_app_ICU into lp:widelands
Review: Approve code review Code looks ok and will not afect normal builds in any way. Go for it. I cannot use this anyway as I use Macports. -- https://code.launchpad.net/~widelands-dev/widelands/macos_build_app_ICU/+merge/354490 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/macos_build_app_ICU. ___ 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
