Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/cleanup_playercommand_enums into lp:widelands
Review: Approve -- https://code.launchpad.net/~widelands-dev/widelands/cleanup_playercommand_enums/+merge/369267 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/cleanup_playercommand_enums. ___ 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/unify-program-parsers into lp:widelands
Is it okay to force merge this branch? test/maps/expedition.wmf/scripting/test_check_transportation_works_one_ship.lua ... Running Widelands ... Seems to time out in some builds. -- https://code.launchpad.net/~widelands-dev/widelands/unify-program-parsers/+merge/367936 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/list-directories-in-cpp. ___ 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-website/pybb_attachments into lp:widelands-website
Stupid me. :-) I installed clamdscan. -- https://code.launchpad.net/~widelands-dev/widelands-website/pybb_attachments/+merge/370342 Your team Widelands Developers is subscribed to branch lp:widelands-website. ___ 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-website/pybb_attachments into lp:widelands-website
How do you intend to access clamav? The current mode is via socket: LocalSocket /var/run/clamav/clamd.ctl If you'd like, I can add a local TCP daemon on port 3310. -- https://code.launchpad.net/~widelands-dev/widelands-website/pybb_attachments/+merge/370342 Your team Widelands Developers is subscribed to branch lp:widelands-website. ___ 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-website/pybb_attachments into lp:widelands-website
Already installed. ;) -- https://code.launchpad.net/~widelands-dev/widelands-website/pybb_attachments/+merge/370342 Your team Widelands Developers is subscribed to branch lp:widelands-website. ___ 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-website/update_ops_script into lp:widelands-website
Review: Approve LGTM :-) -- https://code.launchpad.net/~widelands-dev/widelands-website/update_ops_script/+merge/369163 Your team Widelands Developers is subscribed to branch lp:widelands-website. ___ 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-website/update_ops_script into lp:widelands-website
Diff comments:
> === modified file '_ops/apt_update.sh'
> --- _ops/apt_update.sh2016-08-26 10:55:57 +
> +++ _ops/apt_update.sh2019-06-21 11:41:04 +
> @@ -1,28 +1,25 @@
> #!/bin/sh
> # Updates all packages on the server, but stops the widelands website before
> # doing so, in case mysql gets updated - it always results in really ugly
> -# errors for users otherwise. Ideally, this script would switch the website
> to
> -# a "In Maintenance" banner.
> +# errors for users otherwise.
> #
> -# This script requires root access.
> +# This script requires sudo.
>
> set -ex
>
> -if [ -z "$STY" ] && [ -z "$TMUX" ]; then
> +if [ -z "${TMUX}" ]; then
> echo "Run inside screen or tmux in case SSH gets updated."
> exit 1
> fi
>
> -apt-get update
> -stop wlwebsite || true
> -
> -# TODO(sirver): Upgrading widelands-data takes a long time (~30 minutes or
> -# longer). Use apt-mark hold to not update widelands and widelands-data to
> -# bring the website up quicker again. Then only upgrade those packages later,
> -# after the website is up again.
> -# See
> http://askubuntu.com/questions/99774/exclude-packages-from-apt-get-upgrade
> -apt-get dist-upgrade
> -
> -start wlwebsite
> -
> -apt-get autoremove -y
> +sudo apt update
> +
> +sudo systemctl stop wl-website
This can stay in.
> +sudo systemctl start wl-bauarbeiten
This can be removed.
> +
> +sudo apt dist-upgrade
> +
> +sudo systemctl stop wl-bauarbeiten
This can be removed.
> +sudo systemctl start wl-website
> +
> +sudo apt autoremove -y
--
https://code.launchpad.net/~widelands-dev/widelands-website/update_ops_script/+merge/369163
Your team Widelands Developers is subscribed to branch lp:widelands-website.
___
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-website/update_ops_script into lp:widelands-website
Fixed it. You just need: sudo systemctl stop wl-website at the beginning and sudo systemctl start wl-website ath the and. I left the wl-bauarbeiten.service in place but it is not necessary to call it anymore. When stopping the wl-website service it will automatically enable the bauarbeiten configuration for nginx. -- https://code.launchpad.net/~widelands-dev/widelands-website/update_ops_script/+merge/369163 Your team Widelands Developers is subscribed to branch lp:widelands-website. ___ 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-website/update_ops_script into lp:widelands-website
Review: Needs Fixing
Diff comments:
> === modified file '_ops/apt_update.sh'
> --- _ops/apt_update.sh2016-08-26 10:55:57 +
> +++ _ops/apt_update.sh2019-06-21 11:41:04 +
> @@ -1,28 +1,25 @@
> #!/bin/sh
> # Updates all packages on the server, but stops the widelands website before
> # doing so, in case mysql gets updated - it always results in really ugly
> -# errors for users otherwise. Ideally, this script would switch the website
> to
> -# a "In Maintenance" banner.
> +# errors for users otherwise.
> #
> -# This script requires root access.
> +# This script requires sudo.
>
> set -ex
>
> -if [ -z "$STY" ] && [ -z "$TMUX" ]; then
> +if [ -z "${TMUX}" ]; then
> echo "Run inside screen or tmux in case SSH gets updated."
> exit 1
> fi
>
> -apt-get update
> -stop wlwebsite || true
> -
> -# TODO(sirver): Upgrading widelands-data takes a long time (~30 minutes or
> -# longer). Use apt-mark hold to not update widelands and widelands-data to
> -# bring the website up quicker again. Then only upgrade those packages later,
> -# after the website is up again.
> -# See
> http://askubuntu.com/questions/99774/exclude-packages-from-apt-get-upgrade
> -apt-get dist-upgrade
> -
> -start wlwebsite
> -
> -apt-get autoremove -y
> +sudo apt update
> +
> +sudo systemctl stop wl-website
Not neccessary. The two services are interdependend. Starting one stops the
other.
> +sudo systemctl start wl-bauarbeiten
> +
> +sudo apt dist-upgrade
> +
> +sudo systemctl stop wl-bauarbeiten
Not necessessary. See above
> +sudo systemctl start wl-website
> +
> +sudo apt autoremove -y
--
https://code.launchpad.net/~widelands-dev/widelands-website/update_ops_script/+merge/369163
Your team Widelands Developers is subscribed to branch lp:widelands-website.
___
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-1833352-empty-game-names into lp:widelands
@bunnybot merge force -- https://code.launchpad.net/~widelands-dev/widelands/bug-1833352-empty-game-names/+merge/369094 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/bug-1833352-empty-game-names. ___ 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-1833352-empty-game-names into lp:widelands
Toni Förster has proposed merging
lp:~widelands-dev/widelands/bug-1833352-empty-game-names into lp:widelands.
Commit message:
Fix for corner case: don't set empty game name if no game is present
Requested reviews:
Widelands Developers (widelands-dev)
Related bugs:
Bug #1833352 in widelands: "Disallow empty game names in internet lobby"
https://bugs.launchpad.net/widelands/+bug/1833352
For more details, see:
https://code.launchpad.net/~widelands-dev/widelands/bug-1833352-empty-game-names/+merge/369094
--
Your team Widelands Developers is requested to review the proposed merge of
lp:~widelands-dev/widelands/bug-1833352-empty-game-names into lp:widelands.
=== modified file 'src/ui_fsmenu/internet_lobby.cc'
--- src/ui_fsmenu/internet_lobby.cc 2019-05-29 13:23:54 +
+++ src/ui_fsmenu/internet_lobby.cc 2019-06-20 13:45:16 +
@@ -445,6 +445,9 @@
return;
}
}
+ if (games->empty() && servername_ui.empty()) {
+ servername_ui = _("unnamed");
+ }
}
g_options.pull_section("global").set_string("servername", servername_ui);
___
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-1826744-lobby-commands into lp:widelands
Review: Approve I'm happy :) @bunnybot merge -- https://code.launchpad.net/~widelands-dev/widelands/bug-1826744-lobby-commands/+merge/368285 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/bug-1826744-lobby-commands. ___ 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-1826744-lobby-commands into lp:widelands
But I guess this should be solved on the server side... -- https://code.launchpad.net/~widelands-dev/widelands/bug-1826744-lobby-commands/+merge/368285 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/bug-1826744-lobby-commands. ___ 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-1826744-lobby-commands into lp:widelands
Review: Approve LGTM :) But we need the server to be in place to test this better. -- https://code.launchpad.net/~widelands-dev/widelands/bug-1826744-lobby-commands/+merge/368285 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/bug-1826744-lobby-commands. ___ 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/atlantean_fishbreeder into lp:widelands
I meant to add Hessenfarmer... -- https://code.launchpad.net/~widelands-dev/widelands/atlantean_fishbreeder/+merge/368442 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/atlantean_fishbreeder 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/atlantean_fishbreeder into lp:widelands
Toni Förster has proposed merging
lp:~widelands-dev/widelands/atlantean_fishbreeder into lp:widelands.
Commit message:
atlantean fishbreeder split time 50/50 building/worker
Requested reviews:
kaputtnik (franku)
For more details, see:
https://code.launchpad.net/~widelands-dev/widelands/atlantean_fishbreeder/+merge/368442
Forgot the fishbreeder :-).
--
Your team Widelands Developers is subscribed to branch
lp:~widelands-dev/widelands/atlantean_fishbreeder.
=== modified file 'data/tribes/buildings/productionsites/atlanteans/fishbreeders_house/init.lua'
--- data/tribes/buildings/productionsites/atlanteans/fishbreeders_house/init.lua 2019-05-29 18:29:28 +
+++ data/tribes/buildings/productionsites/atlanteans/fishbreeders_house/init.lua 2019-06-06 10:03:16 +
@@ -42,7 +42,7 @@
descname = _"breeding fish",
actions = {
"callworker=breed",
-"sleep=24000"
+"sleep=13500"
}
},
},
=== modified file 'data/tribes/workers/atlanteans/fishbreeder/init.lua'
--- data/tribes/workers/atlanteans/fishbreeder/init.lua 2019-04-21 14:57:55 +
+++ data/tribes/workers/atlanteans/fishbreeder/init.lua 2019-06-06 10:03:16 +
@@ -31,7 +31,7 @@
breed = {
"findspace=size:any radius:7 breed resource:fish",
"walk=coords",
- "animate=freeing 3000", -- Play a freeing animation
+ "animate=freeing 13500", -- Play a freeing animation
"breed=fish 1",
"return"
}
___
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-1826744-lobby-commands into lp:widelands
Sorry, I was under the impression that users could use the help command as well. The it is just /announcement command that needs to be changed :) -- https://code.launchpad.net/~widelands-dev/widelands/bug-1826744-lobby-commands/+merge/368285 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/bug-1826744-lobby-commands 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-1826744-lobby-commands into lp:widelands
Could you change "/announcement" to "/announce"? That's the command for the multiplayer lobby. Also, could you implement /help for the lobby (for users and superusers)? -- https://code.launchpad.net/~widelands-dev/widelands/bug-1826744-lobby-commands/+merge/368285 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/bug-1826744-lobby-commands 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/unify_sleep_time into lp:widelands
I added the 2 seconds to the animation. -- https://code.launchpad.net/~widelands-dev/widelands/unify_sleep_time/+merge/368086 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/failed_skipped_10s. ___ 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/travis_xenial into lp:widelands
Toni Förster has proposed merging lp:~widelands-dev/widelands/travis_xenial into lp:widelands. Commit message: use xenial on travis Requested reviews: Widelands Developers (widelands-dev) For more details, see: https://code.launchpad.net/~widelands-dev/widelands/travis_xenial/+merge/368237 this is just a test -- Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/travis_xenial into lp:widelands. === modified file '.travis.yml' --- .travis.yml 2019-04-04 16:51:26 + +++ .travis.yml 2019-06-02 20:37:45 + @@ -1,7 +1,7 @@ language: cpp script: bash -e .travis.sh sudo: required -dist: trusty +dist: xenial before_script: - export DISPLAY=:99.0 ___ 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/unify_sleep_time into lp:widelands
Changed the timings for woodcutters/forester/quarry they are 50/50 (except foresters ~60/~40) -- https://code.launchpad.net/~widelands-dev/widelands/unify_sleep_time/+merge/368086 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/failed_skipped_10s. ___ 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/resize_caret into lp:widelands
@bunnybot merge force -- https://code.launchpad.net/~widelands-dev/widelands/resize_caret/+merge/368227 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/resize_caret. ___ 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/immovables_icon_wrong_path_menu into lp:widelands
Changed the icon for the frisian's ship. Regarding the bushes, which one in particular do you want to see changed? -- https://code.launchpad.net/~widelands-dev/widelands/immovables_icon_wrong_path_menu/+merge/368011 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/immovables_icon_wrong_path_menu 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/resize_caret into lp:widelands
Toni Förster has proposed merging lp:~widelands-dev/widelands/resize_caret into lp:widelands. Commit message: increased caret to 14px Requested reviews: Widelands Developers (widelands-dev) For more details, see: https://code.launchpad.net/~widelands-dev/widelands/resize_caret/+merge/368227 -- Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/resize_caret into lp:widelands. === modified file 'data/images/ui_basic/caret.png' Binary files data/images/ui_basic/caret.png 2014-12-03 10:43:04 + and data/images/ui_basic/caret.png 2019-06-01 15:33:05 + differ ___ 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/unify_sleep_time into lp:widelands
I'd like to change the woddcutters, (foresters) and quarries as well. They spend way too much time in their buildings, instead of working. I'd like to move about 10-15 seconds from the woodcutters & quarries to the worker. And about 5 for the foresters. -- https://code.launchpad.net/~widelands-dev/widelands/unify_sleep_time/+merge/368086 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/failed_skipped_10s. ___ 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/unify_sleep_time into lp:widelands
Did some changes for fishers and farms. The overall timing is the same as before. Just the time spend for each step is a little different now. Frisians are unchanged, that's something I'd like Benedikt to have a look at. -- https://code.launchpad.net/~widelands-dev/widelands/unify_sleep_time/+merge/368086 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/failed_skipped_10s. ___ 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/unify_sleep_time into lp:widelands
Fixed it. No need to be sorry for RL :-) -- https://code.launchpad.net/~widelands-dev/widelands/unify_sleep_time/+merge/368086 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/failed_skipped_10s. ___ 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/unify_sleep_time into lp:widelands
@hessenfarmer would you be so kind and have a look at the changes I did in the trainingsites? -- https://code.launchpad.net/~widelands-dev/widelands/unify_sleep_time/+merge/368086 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/failed_skipped_10s. ___ 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/failed_skipped_10s into lp:widelands
the inputqueues again @bunnybot merge force -- https://code.launchpad.net/~widelands-dev/widelands/failed_skipped_10s/+merge/368014 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/failed_skipped_10s. ___ 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/failed_skipped_10s into lp:widelands
The 10s increase in the test fixed it. But we only need this as long as the unify_sleep_time isn't merged into branch. We can revert these changes there because sleeps aren't executed before a possible fail anymore. @bunnybot merge -- https://code.launchpad.net/~widelands-dev/widelands/failed_skipped_10s/+merge/368014 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/failed_skipped_10s. ___ 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/unify_sleep_time into lp:widelands
I just noticed that I forgot the training sites. I started by replacing the dummy checks with return=no_stats. I think we should add a return=fail if not enough food/wares are present (like we have for the aqua farm). To avoid the 30s sleep. Or can we move the sleep behind that consume part? -- https://code.launchpad.net/~widelands-dev/widelands/unify_sleep_time/+merge/368086 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/failed_skipped_10s. ___ 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/failed_skipped_10s into lp:widelands
This branch fails: test/maps/plain.wmf/scripting/test_casern.lua How do I run the test locally? -- https://code.launchpad.net/~widelands-dev/widelands/failed_skipped_10s/+merge/368014 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/failed_skipped_10s. ___ 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/unify_sleep_time into lp:widelands
Okay, fixed now :) -- https://code.launchpad.net/~widelands-dev/widelands/unify_sleep_time/+merge/368086 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/failed_skipped_10s. ___ 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/unify_sleep_time into lp:widelands
Added them back in and set the commas. -- https://code.launchpad.net/~widelands-dev/widelands/unify_sleep_time/+merge/368086 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/failed_skipped_10s. ___ 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/unify_sleep_time into lp:widelands
The proposal to merge lp:~widelands-dev/widelands/unify_sleep_time into lp:widelands has been updated. Description changed to: The basic idea is, we can guarantee that a failed or skipped program will always be continued after a grace time of 10 seconds. All calls within a program, may it be sleep or animate, are now part of a completed program cycle. For more details, see: https://code.launchpad.net/~widelands-dev/widelands/unify_sleep_time/+merge/368086 -- Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/failed_skipped_10s. ___ 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/unify_sleep_time into lp:widelands
Toni Förster has proposed merging lp:~widelands-dev/widelands/unify_sleep_time
into lp:widelands with lp:~widelands-dev/widelands/failed_skipped_10s as a
prerequisite.
Commit message:
move sleep behind return/consume/callworker
Requested reviews:
hessenfarmer (stephan-lutz)
For more details, see:
https://code.launchpad.net/~widelands-dev/widelands/unify_sleep_time/+merge/368086
--
Your team Widelands Developers is subscribed to branch
lp:~widelands-dev/widelands/failed_skipped_10s.
=== modified file 'data/tribes/buildings/productionsites/atlanteans/bakery/init.lua'
--- data/tribes/buildings/productionsites/atlanteans/bakery/init.lua 2017-09-03 07:59:51 +
+++ data/tribes/buildings/productionsites/atlanteans/bakery/init.lua 2019-05-29 18:35:25 +
@@ -54,10 +54,10 @@
-- TRANSLATORS: Completed/Skipped/Did not start baking bread because ...
descname = pgettext("atlanteans_building", "baking bread"),
actions = {
-"sleep=35000",
"return=skipped unless economy needs atlanteans_bread",
"consume=water:2 blackroot_flour cornmeal",
-"animate=working 3",
+"animate=working 35000",
+"sleep=3",
"produce=atlanteans_bread:2"
}
},
=== modified file 'data/tribes/buildings/productionsites/atlanteans/barracks/init.lua'
--- data/tribes/buildings/productionsites/atlanteans/barracks/init.lua 2017-09-03 07:59:51 +
+++ data/tribes/buildings/productionsites/atlanteans/barracks/init.lua 2019-05-29 18:35:25 +
@@ -57,9 +57,9 @@
-- TRANSLATORS: Completed/Skipped/Did not start recruiting soldier because ...
descname = pgettext("atlanteans_building", "recruiting soldier"),
actions = {
-"sleep=15000",
"return=skipped unless economy needs atlanteans_soldier",
"consume=tabard trident_light atlanteans_recruit",
+"sleep=15000",
"animate=working 15000",
"recruit=atlanteans_soldier"
}
=== modified file 'data/tribes/buildings/productionsites/atlanteans/blackroot_farm/init.lua'
--- data/tribes/buildings/productionsites/atlanteans/blackroot_farm/init.lua 2018-09-06 08:21:35 +
+++ data/tribes/buildings/productionsites/atlanteans/blackroot_farm/init.lua 2019-05-29 18:35:25 +
@@ -56,16 +56,16 @@
-- TRANSLATORS: Completed/Skipped/Did not start planting blackroot because ...
descname = _"planting blackroot",
actions = {
-"sleep=2",
-"callworker=plant"
+"callworker=plant",
+"sleep=2"
}
},
harvest = {
-- TRANSLATORS: Completed/Skipped/Did not start harvesting blackroot because ...
descname = _"harvesting blackroot",
actions = {
-"sleep=5000",
-"callworker=harvest"
+"callworker=harvest",
+"sleep=5000"
}
},
},
=== modified file 'data/tribes/buildings/productionsites/atlanteans/charcoal_kiln/init.lua'
--- data/tribes/buildings/productionsites/atlanteans/charcoal_kiln/init.lua 2017-09-03 07:59:51 +
+++ data/tribes/buildings/productionsites/atlanteans/charcoal_kiln/init.lua 2019-05-29 18:35:25 +
@@ -50,9 +50,9 @@
-- TRANSLATORS: Completed/Skipped/Did not start producing coal because ...
descname = _"producing coal",
actions = {
-"sleep=3",
"return=skipped unless economy needs coal",
"consume=log:6",
+"sleep=3",
"animate=working 9", -- Charcoal fires will burn for some days in real life
"produce=coal"
}
=== modified file 'data/tribes/buildings/productionsites/atlanteans/coalmine/init.lua'
--- data/tribes/buildings/productionsites/atlanteans/coalmine/init.lua 2018-09-12 03:04:08 +
+++ data/tribes/buildings/productionsites/atlanteans/coalmine/init.lua 2019-05-29 18:35:25 +
@@ -58,10 +58,9 @@
descname = _"mining coal",
actions = {
-- time total: 105 + 7 x 3.6
-"sleep=5000",
"return=skipped unless economy needs coal",
"consume=smoked_fish,smoked_meat:2 atlanteans_bread:2",
-"sleep=3",
+"sleep=35000",
-- after having the food the miners are working 7 times
-- each cycle lasts 10 seconds for mining and producing coal
-- and 3.6 seconds to deliver the coal to the flag
=== modified file 'data/tri
Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/failed_skipped_10s into lp:widelands
Okay, I'm going to set a new branch up that contains the changes to the lua files. Base will be this branch. -- https://code.launchpad.net/~widelands-dev/widelands/failed_skipped_10s/+merge/368014 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/failed_skipped_10s. ___ 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/immovables_icon_wrong_path_menu into lp:widelands
Will look into this. :) -- https://code.launchpad.net/~widelands-dev/widelands/immovables_icon_wrong_path_menu/+merge/368011 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/immovables_icon_wrong_path_menu 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-1830776-password-field-captures-input into lp:widelands
@bunnybot merge :) -- https://code.launchpad.net/~widelands-dev/widelands/bug-1830776-password-field-captures-input/+merge/368063 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/bug-1830776-password-field-captures-input. ___ 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/immovables_icon_wrong_path_menu into lp:widelands
untangle :D -- https://code.launchpad.net/~widelands-dev/widelands/immovables_icon_wrong_path_menu/+merge/368011 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/immovables_icon_wrong_path_menu 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-1830778-lobby-initial-client-layout-broken into lp:widelands
Toni Förster has proposed merging
lp:~widelands-dev/widelands/bug-1830778-lobby-initial-client-layout-broken into
lp:widelands.
Commit message:
lobby set Game column in client list to 3/8 of the width
Requested reviews:
Widelands Developers (widelands-dev)
Related bugs:
Bug #1830778 in widelands: "Initially broken table layout in metaserver lobby
when table is empty"
https://bugs.launchpad.net/widelands/+bug/1830778
For more details, see:
https://code.launchpad.net/~widelands-dev/widelands/bug-1830778-lobby-initial-client-layout-broken/+merge/368066
--
Your team Widelands Developers is requested to review the proposed merge of
lp:~widelands-dev/widelands/bug-1830778-lobby-initial-client-layout-broken into
lp:widelands.
=== modified file 'src/ui_fsmenu/internet_lobby.cc'
--- src/ui_fsmenu/internet_lobby.cc 2019-05-26 17:21:15 +
+++ src/ui_fsmenu/internet_lobby.cc 2019-05-29 13:31:15 +
@@ -158,7 +158,7 @@
clientsonline_list_.add_column((lisw_ - 22) * 3 / 8, pgettext("player", "Name"));
clientsonline_list_.add_column((lisw_ - 22) * 2 / 8, _("Version"));
clientsonline_list_.add_column(
- 0, _("Game"), "", UI::Align::kLeft, UI::TableColumnType::kFlexible);
+ (lisw_ - 22) * 3 / 8, _("Game"), "", UI::Align::kLeft, UI::TableColumnType::kFlexible);
clientsonline_list_.set_column_compare(
0, boost::bind(::compare_clienttype, this, _1, _2));
clientsonline_list_.double_clicked.connect(
___
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-1830776-password-field-captures-input into lp:widelands
Toni Förster has proposed merging
lp:~widelands-dev/widelands/bug-1830776-password-field-captures-input into
lp:widelands.
Commit message:
don't force focus on password field
Requested reviews:
Widelands Developers (widelands-dev)
Related bugs:
Bug #1830776 in widelands: "Input is captured in password field in online
loginbox"
https://bugs.launchpad.net/widelands/+bug/1830776
For more details, see:
https://code.launchpad.net/~widelands-dev/widelands/bug-1830776-password-field-captures-input/+merge/368063
--
Your team Widelands Developers is requested to review the proposed merge of
lp:~widelands-dev/widelands/bug-1830776-password-field-captures-input into
lp:widelands.
=== modified file 'src/wui/login_box.cc'
--- src/wui/login_box.cc 2019-05-26 01:59:32 +
+++ src/wui/login_box.cc 2019-05-29 12:51:06 +
@@ -144,6 +144,7 @@
} else {
ta_password->set_style(g_gr->styles().font_style(UI::FontStyle::kLabel));
eb_password->set_can_focus(true);
+ eb_password->focus();
}
}
@@ -168,7 +169,6 @@
if (eb_password->text().empty() && cb_register->get_state()) {
eb_password->set_tooltip(_("Please enter your password!"));
loginbtn->set_enabled(false);
- eb_password->focus();
}
Section& s = g_options.pull_section("global");
___
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/failed_skipped_10s into lp:widelands
Did some thinking :D > It is not necessary for buildings with leading sleep times of less then 10 > secs as these would been masked by the code now. > Furthermore it is not necessary for buildings with only one output as the > effect of wasted time if undersupplied would been averaged over time. But now in all programs that have a sleep before consume and/or skipped it will always be 10s plus sleep. E.g. the barbarian's baker has a sleep of 30 seconds before consume. Every fail would now result in 10s + 30s before for the next execution. Even if the time would be 1 second it would now always be 10s + 1s, the first sleep never gets masked but added. That's why I would like to have skipped the first, consume the second and sleep the third call in every program. Generally, having a sleep before consume would be a time penalty, regardless of the length. Having every program like this would also have the benefit, that the program flow itself would be unified. A program skipped or failed means, it starts 10 second later before it would fail or skip again. Otherwise, it would be 10s plus whatever sleep time we have before consume/skip. The sleep times then would be part of a completed cycle and not a failed or skipped. Does this sound reasonable? > That was the basis for my suggestion above. > > I'd like to keep the sleep times around at least of one third to one half of > the total time as it looks more natural if a building isn't busy all the time. > Having only working animations would make the screen a bit unquiet I am > afraid. Sounds sensible. -- https://code.launchpad.net/~widelands-dev/widelands/failed_skipped_10s/+merge/368014 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/failed_skipped_10s. ___ 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/failed_skipped_10s into lp:widelands
Okay, so basically only the buildings you listed above? -- https://code.launchpad.net/~widelands-dev/widelands/failed_skipped_10s/+merge/368014 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/failed_skipped_10s. ___ 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/immovables_icon_wrong_path_menu into lp:widelands
Changed the icon for the ship and added menu.png for all bushes. The bushes don't appear in the encyclopedia because nordfriese needs to entangle the lua files first. Currently, all information including terrain affinity are in one file. -- https://code.launchpad.net/~widelands-dev/widelands/immovables_icon_wrong_path_menu/+merge/368011 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/immovables_icon_wrong_path_menu 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/failed_skipped_10s into lp:widelands
It basically affects all buildings. Most buildings have a sleep before skipped and/or consume. So we need to move them as well. But the question is, do we want to move them or add them to the animation cycle? Or at least move some seconds to the animation cycle? -- https://code.launchpad.net/~widelands-dev/widelands/failed_skipped_10s/+merge/368014 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/failed_skipped_10s. ___ 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/failed_skipped_10s into lp:widelands
Hmm, there are many more. The question is. Shall we move the sleep time just behind consume, or remove sleep and add the time to the animation time, were applicable? -- https://code.launchpad.net/~widelands-dev/widelands/failed_skipped_10s/+merge/368014 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/failed_skipped_10s. ___ 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/failed_skipped_10s into lp:widelands
Found some more. Barbarian's mines. Going to add the changes to this branch, since it won't be merged because the casern_test failed. I guess we need to adapt this test as well... -- https://code.launchpad.net/~widelands-dev/widelands/failed_skipped_10s/+merge/368014 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/failed_skipped_10s. ___ 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/immovables_icon_wrong_path_menu into lp:widelands
should be fixed -- https://code.launchpad.net/~widelands-dev/widelands/immovables_icon_wrong_path_menu/+merge/368011 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/immovables_icon_wrong_path_menu 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/immovables_icon_wrong_path_menu into lp:widelands
I used GIMP, already. Where do you get these warnings? -- https://code.launchpad.net/~widelands-dev/widelands/immovables_icon_wrong_path_menu/+merge/368011 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/immovables_icon_wrong_path_menu 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/failed_skipped_10s into lp:widelands
The proposal to merge lp:~widelands-dev/widelands/failed_skipped_10s into lp:widelands has been updated. Commit message changed to: add failed programs to the skipped stack don't show % for trend move sleep behind consume in metal_workshop & toolsmithy added sound to helmsmithy For more details, see: https://code.launchpad.net/~widelands-dev/widelands/failed_skipped_10s/+merge/368014 -- Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/failed_skipped_10s. ___ 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/failed_skipped_10s into lp:widelands
Toni Förster has proposed merging
lp:~widelands-dev/widelands/failed_skipped_10s into lp:widelands.
Commit message:
add failed programs to the skipped stack
don't show % for trend
Requested reviews:
hessenfarmer (stephan-lutz)
For more details, see:
https://code.launchpad.net/~widelands-dev/widelands/failed_skipped_10s/+merge/368014
--
Your team Widelands Developers is subscribed to branch
lp:~widelands-dev/widelands/failed_skipped_10s.
=== modified file 'src/logic/map_objects/tribes/productionsite.cc'
--- src/logic/map_objects/tribes/productionsite.cc 2019-05-26 17:21:15 +
+++ src/logic/map_objects/tribes/productionsite.cc 2019-05-28 21:06:25 +
@@ -428,7 +428,7 @@
}
const std::string trend_str =
- g_gr->styles().color_tag((boost::format(_("%i%%")) % trend).str(), color);
+ g_gr->styles().color_tag((boost::format(_("%i")) % trend).str(), color);
// TODO(GunChleoc): We might need to reverse the order here for RTL languages
statistics_string_on_changed_statistics_ =
@@ -924,8 +924,8 @@
program_timer_ = true;
uint32_t tdelta = 10;
- SkippedPrograms::const_iterator i = skipped_programs_.find(program_name);
- if (i != skipped_programs_.end()) {
+ FailedSkippedPrograms::const_iterator i = failed_skipped_programs_.find(program_name);
+ if (i != failed_skipped_programs_.end()) {
uint32_t const gametime = game.get_gametime();
uint32_t const earliest_allowed_start_time = i->second + 1;
if (gametime + tdelta < earliest_allowed_start_time)
@@ -956,13 +956,14 @@
switch (result) {
case ProgramResult::kFailed:
+ failed_skipped_programs_[program_name] = game.get_gametime();
statistics_.erase(statistics_.begin(), statistics_.begin() + 1);
statistics_.push_back(false);
calc_statistics();
update_crude_statistics(current_duration, false);
break;
case ProgramResult::kCompleted:
- skipped_programs_.erase(program_name);
+ failed_skipped_programs_.erase(program_name);
statistics_.erase(statistics_.begin(), statistics_.begin() + 1);
statistics_.push_back(true);
train_workers(game);
@@ -970,11 +971,11 @@
calc_statistics();
break;
case ProgramResult::kSkipped:
- skipped_programs_[program_name] = game.get_gametime();
+ failed_skipped_programs_[program_name] = game.get_gametime();
update_crude_statistics(current_duration, false);
break;
case ProgramResult::kNone:
- skipped_programs_.erase(program_name);
+ failed_skipped_programs_.erase(program_name);
break;
}
=== modified file 'src/logic/map_objects/tribes/productionsite.h'
--- src/logic/map_objects/tribes/productionsite.h 2019-05-22 15:46:08 +
+++ src/logic/map_objects/tribes/productionsite.h 2019-05-28 21:06:25 +
@@ -307,13 +307,13 @@
int32_t fetchfromflag_; ///< Number of wares to fetch from flag
- /// If a program has ended with the result Skipped, that program may not
+ /// If a program has ended with the result Failed or Skipped, that program may not
/// start again until a certain time has passed. This is a map from program
- /// name to game time. When a program ends with the result Skipped, its name
+ /// name to game time. When a program ends with the result Failed or Skipped, its name
/// is added to this map, with the current game time. (When the program ends
/// with any other result, its name is removed from the map.)
- using SkippedPrograms = std::map;
- SkippedPrograms skipped_programs_;
+ using FailedSkippedPrograms = std::map;
+ FailedSkippedPrograms failed_skipped_programs_;
using Stack = std::vector;
Stack stack_; ///< program stack
=== modified file 'src/map_io/map_buildingdata_packet.cc'
--- src/map_io/map_buildingdata_packet.cc 2019-05-18 11:58:43 +
+++ src/map_io/map_buildingdata_packet.cc 2019-05-28 21:06:25 +
@@ -646,13 +646,13 @@
if (pr_descr.programs().count(program_name)) {
uint32_t const skip_time = fr.unsigned_32();
if (gametime < skip_time)
- throw GameDataError("program %s was skipped at time %u, but time is only "
+ throw GameDataError("program %s failed/was skipped at time %u, but time is only "
"%u",
program_name, skip_time, gametime);
- productionsite.skipped_programs_[program_name] = skip_time;
+ productionsite.failed_skipped_programs_[program_name] = skip_time;
} else {
fr.unsigned_32(); // eat skip time
- log("WARNING: productionsite has skipped program \"%s\", which "
+ log("WARNING: productionsite has failed/skipped program \"%s\", which "
"does not exist\n",
program_name);
}
@@ -1129,10 +1129,10 @@
fw.signed_32(productionsite.fetchfromflag_);
// skipped programs
- assert(productionsite.skipped_programs_.size() <= std::numeric_limits::max());
- fw.unsigned_8(productionsite.skippe
[Widelands-dev] [Merge] lp:~widelands-dev/widelands/immovables_icon_wrong_path_menu into lp:widelands
Toni Förster has proposed merging
lp:~widelands-dev/widelands/immovables_icon_wrong_path_menu into lp:widelands.
Commit message:
Fixes wrong path for encyclopedia immovables icon.
Added missing menu icons for immovables.
Requested reviews:
Widelands Developers (widelands-dev)
For more details, see:
https://code.launchpad.net/~widelands-dev/widelands/immovables_icon_wrong_path_menu/+merge/368011
--
Your team Widelands Developers is requested to review the proposed merge of
lp:~widelands-dev/widelands/immovables_icon_wrong_path_menu into lp:widelands.
=== modified file 'data/tribes/immovables/ashes/init.lua'
--- data/tribes/immovables/ashes/init.lua 2017-11-12 16:21:28 +
+++ data/tribes/immovables/ashes/init.lua 2019-05-28 19:51:40 +
@@ -41,6 +41,8 @@
-- TRANSLATORS: This is an immovable name used in lists of immovables
descname = pgettext("immovable", "Ashes"),
helptext_script = dirname .. "helptexts.lua",
+ icon = dirname .. "menu.png",
+ size = "small",
programs = {
program = {
"animate=idle 45000",
=== added file 'data/tribes/immovables/ashes/menu.png'
Binary files data/tribes/immovables/ashes/menu.png 1970-01-01 00:00:00 + and data/tribes/immovables/ashes/menu.png 2019-05-28 19:51:40 + differ
=== modified file 'data/tribes/immovables/barleyfield/harvested/init.lua'
--- data/tribes/immovables/barleyfield/harvested/init.lua 2018-04-09 09:11:29 +
+++ data/tribes/immovables/barleyfield/harvested/init.lua 2019-05-28 19:51:40 +
@@ -5,6 +5,7 @@
name = "barleyfield_harvested",
-- TRANSLATORS: This is an immovable name used in lists of immovables
descname = pgettext("immovable", "Barley Field (harvested)"),
+ icon = dirname .. "menu.png",
helptext_script = dirname .. "helptexts.lua",
attributes = { "field" },
programs = {
=== added file 'data/tribes/immovables/barleyfield/harvested/menu.png'
Binary files data/tribes/immovables/barleyfield/harvested/menu.png 1970-01-01 00:00:00 + and data/tribes/immovables/barleyfield/harvested/menu.png 2019-05-28 19:51:40 + differ
=== modified file 'data/tribes/immovables/barleyfield/medium/init.lua'
--- data/tribes/immovables/barleyfield/medium/init.lua 2018-04-09 09:11:29 +
+++ data/tribes/immovables/barleyfield/medium/init.lua 2019-05-28 19:51:40 +
@@ -5,6 +5,7 @@
name = "barleyfield_medium",
-- TRANSLATORS: This is an immovable name used in lists of immovables
descname = pgettext("immovable", "Barley Field (medium)"),
+ icon = dirname .. "menu.png",
size = "small",
helptext_script = dirname .. "helptexts.lua",
attributes = { "field", "flowering" },
=== added file 'data/tribes/immovables/barleyfield/medium/menu.png'
Binary files data/tribes/immovables/barleyfield/medium/menu.png 1970-01-01 00:00:00 + and data/tribes/immovables/barleyfield/medium/menu.png 2019-05-28 19:51:40 + differ
=== modified file 'data/tribes/immovables/barleyfield/ripe/init.lua'
--- data/tribes/immovables/barleyfield/ripe/init.lua 2018-04-09 09:11:29 +
+++ data/tribes/immovables/barleyfield/ripe/init.lua 2019-05-28 19:51:40 +
@@ -6,6 +6,7 @@
-- TRANSLATORS: This is an immovable name used in lists of immovables
descname = pgettext("immovable", "Barley Field (ripe)"),
size = "small",
+ icon = dirname .. "menu.png",
helptext_script = dirname .. "helptexts.lua",
attributes = { "ripe_barley", "field" },
programs = {
=== added file 'data/tribes/immovables/barleyfield/ripe/menu.png'
Binary files data/tribes/immovables/barleyfield/ripe/menu.png 1970-01-01 00:00:00 + and data/tribes/immovables/barleyfield/ripe/menu.png 2019-05-28 19:51:40 + differ
=== modified file 'data/tribes/immovables/barleyfield/small/init.lua'
--- data/tribes/immovables/barleyfield/small/init.lua 2018-04-09 09:11:29 +
+++ data/tribes/immovables/barleyfield/small/init.lua 2019-05-28 19:51:40 +
@@ -5,6 +5,7 @@
name = "barleyfield_small",
-- TRANSLATORS: This is an immovable name used in lists of immovables
descname = pgettext("immovable", "Barley Field (small)"),
+ icon = dirname .. "menu.png",
size = "small",
helptext_script = dirname .. "helptexts.lua",
attributes = { "field" },
=== added file 'data/tribes/immovables/barleyfield/small/menu.png'
Binary files data/tribes/immovables/barleyfield/small/menu.png 1970-01-01 00:00:00 + and data/tribes/immovables/barleyfield/small/menu.png 2019-05-28 19:51:40 + differ
=== modified file 'data/tribes/immovables/barleyfield/tiny/init.lua'
--- data/tribes/immovables/barleyfield/tiny/init.lua 2018-04-09 09:11:29 +
+++
Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/list-directories-in-cpp into lp:widelands
Review: Approve LGTM :) -- https://code.launchpad.net/~widelands-dev/widelands/list-directories-in-cpp/+merge/366614 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/list-directories-in-cpp. ___ 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-1797702-spaces-in-names-clean-start into lp:widelands
Since the parent branch has been merged, this can go in as well. @bunnybot merge -- https://code.launchpad.net/~widelands-dev/widelands/bug-1797702-spaces-in-names-clean-start/+merge/367314 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/bug-1827786-metaserver-login-box-clean-start. ___ 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/wrong-password-message into lp:widelands
Review: Approve -- https://code.launchpad.net/~widelands-dev/widelands/wrong-password-message/+merge/367929 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/wrong-password-message. ___ 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/choose-attack-soldiers into lp:widelands
I'd say 2. That would be 20 soldiers right? -- https://code.launchpad.net/~widelands-dev/widelands/choose-attack-soldiers/+merge/367471 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/choose-attack-soldiers. ___ 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/tribe-immovable-file-structure into lp:widelands
Review: Approve LGTM :) -- https://code.launchpad.net/~widelands-dev/widelands/tribe-immovable-file-structure/+merge/367611 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/tribe-immovable-file-structure. ___ 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/constructionsite_options into lp:widelands
Would it be possible to move the tabs for Warehouses' and Ports' to the top, instead of having to tab rows? -- https://code.launchpad.net/~widelands-dev/widelands/constructionsite_options/+merge/367428 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/constructionsite_options 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/economy-target-profiles into lp:widelands
Review: Approve I think I forgot to approve this :) -- https://code.launchpad.net/~widelands-dev/widelands/economy-target-profiles/+merge/366987 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/economy-target-profiles. ___ 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-1827786-metaserver-login-box-clean-start into lp:widelands
Also, this needs to be resolved on the Metaserver side. -- https://code.launchpad.net/~widelands-dev/widelands/bug-1827786-metaserver-login-box-clean-start/+merge/367320 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/bug-1825932-open-games-clean-start. ___ 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-1827786-metaserver-login-box-clean-start into lp:widelands
> Setting a correct password and clicking on 'Save' connects immediately to the > lobby and immediately disconnect again. One can see this in channel #widelands > on IRC. > That is currently the only way to check whether the password was correct or not. -- https://code.launchpad.net/~widelands-dev/widelands/bug-1827786-metaserver-login-box-clean-start/+merge/367320 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/bug-1825932-open-games-clean-start. ___ 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/list-directories-in-cpp into lp:widelands
Review: Needs Fixing The merge conflict needs fixing. Also this is not part of this branch but maybe can be foxed here. Game: Reading Map Data ... Game: Reading Map Data took 7ms Game: Reading Player Info ... ┏━ Running Lua for world: Here are newlines missing. Besides that it sped up the loading for me. -- https://code.launchpad.net/~widelands-dev/widelands/list-directories-in-cpp/+merge/366614 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/list-directories-in-cpp. ___ 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/font_size-lua into lp:widelands
Review: Approve LGTM :) -- https://code.launchpad.net/~widelands-dev/widelands/font_size-lua/+merge/366938 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/font_size-lua. ___ 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-1827786-metaserver-login-box-clean-start into lp:widelands
The proposal to merge lp:~widelands-dev/widelands/bug-1827786-metaserver-login-box-clean-start into lp:widelands has been updated. Commit message changed to: redesigned login box - renamed to Online game Settings - limit the possible characters for usernames - draw a red box around the input field for erroneous input - tell user were to register their username - clicking registered checkbox focuses password field - remove check from registered_ clears password field - password field is only accessible when checkbox is clicked - when a password is set, * is shown on opening - login box handles the settings instead of multiplayer multiplayer login redesign - only show login dialog when no name or invalid name is set - Group of 2 buttons for Online Game & Settings - renamed Internet game to Online game - moved settings saving to login box For more details, see: https://code.launchpad.net/~widelands-dev/widelands/bug-1827786-metaserver-login-box-clean-start/+merge/367320 -- Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/bug-1825932-open-games-clean-start. ___ 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-1827786-metaserver-login-box-clean-start into lp:widelands
Can you give it another try? -- https://code.launchpad.net/~widelands-dev/widelands/bug-1827786-metaserver-login-box-clean-start/+merge/367320 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/bug-1825932-open-games-clean-start. ___ 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/list-directories-in-cpp into lp:widelands
Same savegame with this branch. Second and third phase loading Map Objects ... took 37ms Not sure what triggers the underrun on your system. The question is, is this caused by changes in this branch OR is this a problem with your system that you never noticed until this branch... -- https://code.launchpad.net/~widelands-dev/widelands/list-directories-in-cpp/+merge/366614 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/list-directories-in-cpp 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-1827786-metaserver-login-box-clean-start into lp:widelands
The proposal to merge lp:~widelands-dev/widelands/bug-1827786-metaserver-login-box-clean-start into lp:widelands has been updated. Commit message changed to: redesigned login box - renamed to Online game Settings - limit the possible characters for usernames - draw a red box around the input field for erroneous input - tell user were to register their username - clicking registered checkbox focuses password field - remove check from registered clears password field - password field is only accessible when checkbox is clicked - when a password is set, * is shown on opening multiplayer login redesign - only show login dialog when no name or invalid name is set - Group of 2 buttons for Online Game & Settings - renamed Internet game to Online game For more details, see: https://code.launchpad.net/~widelands-dev/widelands/bug-1827786-metaserver-login-box-clean-start/+merge/367320 -- Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/bug-1825932-open-games-clean-start. ___ 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/constructionsite_options into lp:widelands
Seems to be fixed. -- https://code.launchpad.net/~widelands-dev/widelands/constructionsite_options/+merge/367428 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/constructionsite_options 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/economy-target-profiles into lp:widelands
r9110 fixed it. Thanks allot. -- https://code.launchpad.net/~widelands-dev/widelands/economy-target-profiles/+merge/366987 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/economy-target-profiles. ___ 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/constructionsite_options into lp:widelands
And another assertion. Assertion failed: (animation_index < animations.size()), function draw, file /Users/toni/Launchpad/widelands-repo/working_tree/src/logic/map_objects/tribes/constructionsite.cc, line 85. -- https://code.launchpad.net/~widelands-dev/widelands/constructionsite_options/+merge/367428 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/constructionsite_options 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/economy-target-profiles into lp:widelands
crash: NOCOM: EconomyOptionsWindow::update_profiles_select(Default) Planning to select »Default« Did not select it because it is already selected NOCOM: EconomyOptionsWindow::update_profiles, applicable »« Desired and actual state of the empty »« profile don´t match NOCOM: EconomyOptionsWindow::update_profiles_needed() Added Default Added Efficiency Added Stockpile Added the empty profile NOCOM: EconomyOptionsWindow::update_profiles_select() Planning to select »Project-Id-Version: Widelands Report-Msgid-Bugs-To: https://wl.widelands.org/wiki/ReportingBugs/ POT-Creation-Date: 2019-04-22 05:17+ PO-Revision-Date: 2019-03-03 08:20+ Last-Translator: GunChleoc Language-Team: English (United States) (http://www.transifex.com/widelands/widelands/language/en_US/) Language: en_US MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Plural-Forms: nplurals=2; plural=(n != 1); « Selected it! Assertion failed: (dropdown_.has_selection()), function update_profiles_select, file /Users/toni/Launchpad/widelands-repo/working_tree/src/wui/economy_options_window.cc, line 427. Abort trap: 6 -- https://code.launchpad.net/~widelands-dev/widelands/economy-target-profiles/+merge/366987 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/economy-target-profiles. ___ 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
+1 -- 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:~widelands-dev/widelands/bug-1827786-metaserver-login-box-clean-start into lp:widelands
I gave it another run. The button is now called “Login settings” and sits in between the “LAN / Direct IP” ans “Back”.[1] The Title of the Login box has be renamed accordingly, also the “Login” button has been renamed to “Save”.[2] The window opens automatically when no username or an invalid username is set or the wrong password has been entered. Otherwise, the user has to click the button. Clicking on “Save” in the box only closes the window but does not login automatically. [1]https://fosuta.org/pics/multi-new.png [2]https://fosuta.org/pics/login-new.png -- https://code.launchpad.net/~widelands-dev/widelands/bug-1827786-metaserver-login-box-clean-start/+merge/367320 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/bug-1825932-open-games-clean-start. ___ 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-1827786-metaserver-login-box-clean-start into lp:widelands
The proposal to merge lp:~widelands-dev/widelands/bug-1827786-metaserver-login-box-clean-start into lp:widelands has been updated. Commit message changed to: redesigned login box - limit the possible characters for usernames - draw a red box around the input field for erroneous input - tell user were to register their username - clicking registered checkbox focuses password field - remove check from registered clears password field - password field is only accessible when checkbox is clicked - when a password is set, * is shown on opening multiplayer login redesign - only show login dialog when no name or wrong is set For more details, see: https://code.launchpad.net/~widelands-dev/widelands/bug-1827786-metaserver-login-box-clean-start/+merge/367320 -- Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/bug-1825932-open-games-clean-start. ___ 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-1827786-metaserver-login-box-clean-start into lp:widelands
Hmm, I'm still uncertain. What about this? https://fosuta.org/pics/multi-settings.png I have to flesh out the details, though. Bu would this Screen look okay? -- https://code.launchpad.net/~widelands-dev/widelands/bug-1827786-metaserver-login-box-clean-start/+merge/367320 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/bug-1825932-open-games-clean-start. ___ 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/constructionsite_options into lp:widelands
Assertion failed: (military_site_->capacity_ != capacity), function set_soldier_capacity, file /Users/toni/Launchpad/widelands-repo/working_tree/src/logic/map_objects/tribes/militarysite.cc, line 85. -- https://code.launchpad.net/~widelands-dev/widelands/constructionsite_options/+merge/367428 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/constructionsite_options 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-1827786-metaserver-login-box-clean-start into lp:widelands
Well another solution would be: We rename the back button to "Leave lobby" Above the button we have a checkbox "Clear login data" -- https://code.launchpad.net/~widelands-dev/widelands/bug-1827786-metaserver-login-box-clean-start/+merge/367320 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/bug-1825932-open-games-clean-start. ___ 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/constructionsite_options into lp:widelands
With this branch I get crashes after a while. Not sure if the culprit is this branch or something in trunk, though. /Users/toni/Launchpad/widelands-repo/working_tree/src/graphic/animation.cc:451] Requested unknown animation with id: -432781024 ==54196==ERROR: AddressSanitizer: SEGV on unknown address 0x (pc 0x bp 0x7ffee6344650 sp 0x7ffee63445a8 T0) -- https://code.launchpad.net/~widelands-dev/widelands/constructionsite_options/+merge/367428 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/constructionsite_options 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/constructionsite_options into lp:widelands
Your buttons are a little too big. The buttons for in-/decreasing the wares are 24x24 while yours are 25x30. Also, some wares are covered by the button; see the fish in the tavern (I guess that is because of your buttons being to big) -- https://code.launchpad.net/~widelands-dev/widelands/constructionsite_options/+merge/367428 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/constructionsite_options 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/constructionsite_options into lp:widelands
Four warnings left: src/logic/playercommand.cc:2288:6: warning: default label in switch which covers all enumeration values [-Wcovered-switch-default] default: src/logic/playercommand.cc:2384:6: warning: default label in switch which covers all enumeration values [-Wcovered-switch-default] default: src/wui/constructionsitewindow.cc:197:3: warning: default label in switch which covers all enumeration values [-Wcovered-switch-default] default: src/logic/map_objects/tribes/building_settings.cc:176:5: warning: default label in switch which covers all enumeration values [-Wcovered-switch-default] default: -- https://code.launchpad.net/~widelands-dev/widelands/constructionsite_options/+merge/367428 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/constructionsite_options 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/constructionsite_options into lp:widelands
hmm. I would prefer icons but you are completely right. I opened a topic in the forum: https://wl.widelands.org/forum/topic/4518/?page=1#post-27957 -- https://code.launchpad.net/~widelands-dev/widelands/constructionsite_options/+merge/367428 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/constructionsite_options 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-1827786-metaserver-login-box-clean-start into lp:widelands
The proposal to merge lp:~widelands-dev/widelands/bug-1827786-metaserver-login-box-clean-start into lp:widelands has been updated. Commit message changed to: redesigned login box - limit the possible characters for usernames - draw a red box around the input field for erroneous input - tell user were to register their username - clicking registered checkbox focuses password field - remove check from registered clears password field - password field is only accessible when checkbox is clicked - when a password is set, * is shown on opening multiplayer login redesign - only show login dialog when no name is set & unregisterd users lobby - let registered user logout from their account For more details, see: https://code.launchpad.net/~widelands-dev/widelands/bug-1827786-metaserver-login-box-clean-start/+merge/367320 -- Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/bug-1825932-open-games-clean-start. ___ 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-1827786-metaserver-login-box-clean-start into lp:widelands
We have a logout button now :D The login dialog will be shown only for non registered users. Registered users may log out from their account from within the lobby. The additional login button from the Multiplayer menu is removed. -- https://code.launchpad.net/~widelands-dev/widelands/bug-1827786-metaserver-login-box-clean-start/+merge/367320 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/bug-1825932-open-games-clean-start. ___ 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-1827786-metaserver-login-box-clean-start into lp:widelands
I have moved username validation to internet gaming. I'm currently experimenting with a logout button stay tuned :=) -- https://code.launchpad.net/~widelands-dev/widelands/bug-1827786-metaserver-login-box-clean-start/+merge/367320 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/bug-1825932-open-games-clean-start. ___ 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/constructionsite_options into lp:widelands
Some comments regarding the UI. I think we should keep the UI consistent. Instead of checkboxes please use the icons/buttons that are used in the building's window. The same applies for the priority settings. We use traffic lights instead of buttons. -- https://code.launchpad.net/~widelands-dev/widelands/constructionsite_options/+merge/367428 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/constructionsite_options 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/constructionsite_options into lp:widelands
I get these compiler warnings a couple of times.
/Users/toni/Launchpad/widelands-repo/working_tree/src/logic/map_objects/tribes/building_settings.h:42:8:
warning: 'Widelands::BuildingSettings' has virtual functions but non-virtual
destructor [-Wnon-virtual-dtor]
struct BuildingSettings {
^
/Users/toni/Launchpad/widelands-repo/working_tree/src/logic/map_objects/tribes/building_settings.h:57:8:
warning: 'Widelands::ProductionsiteSettings' has virtual functions but
non-virtual destructor [-Wnon-virtual-dtor]
struct ProductionsiteSettings : public BuildingSettings {
^
/Users/toni/Launchpad/widelands-repo/working_tree/src/logic/map_objects/tribes/building_settings.h:74:8:
warning: 'Widelands::MilitarysiteSettings' has virtual functions but
non-virtual destructor [-Wnon-virtual-dtor]
struct MilitarysiteSettings : public BuildingSettings {
^
/Users/toni/Launchpad/widelands-repo/working_tree/src/logic/map_objects/tribes/building_settings.h:86:8:
warning: 'Widelands::TrainingsiteSettings' has virtual functions but
non-virtual destructor [-Wnon-virtual-dtor]
struct TrainingsiteSettings : public ProductionsiteSettings {
^
/Users/toni/Launchpad/widelands-repo/working_tree/src/logic/map_objects/tribes/building_settings.h:97:8:
warning: 'Widelands::WarehouseSettings' has virtual functions but non-virtual
destructor [-Wnon-virtual-dtor]
struct WarehouseSettings : public BuildingSettings {
^
5 warnings generated.
--
https://code.launchpad.net/~widelands-dev/widelands/constructionsite_options/+merge/367428
Your team Widelands Developers is requested to review the proposed merge of
lp:~widelands-dev/widelands/constructionsite_options 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/font_size-lua into lp:widelands
=== modified file 'src/ui_fsmenu/internet_lobby.cc'
--- src/ui_fsmenu/internet_lobby.cc 2019-05-13 06:04:34 +
+++ src/ui_fsmenu/internet_lobby.cc 2019-05-15 08:36:30 +
@@ -296,6 +296,8 @@
case kClientSuperuser:
pic =
g_gr->images().get("images/wui/overlays/roadb_green.png");
er.set_picture(0, pic);
+ er.set_color(RGBColor(0, 255, 0));
+ er.set_picture(0, pic);
break;
case kClientIRC:
// No icon for IRC users
--
https://code.launchpad.net/~widelands-dev/widelands/font_size-lua/+merge/366938
Your team Widelands Developers is requested to review the proposed merge of
lp:~widelands-dev/widelands/font_size-lua 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/font_size-lua into lp:widelands
In trunk admins are written in green in the client list. Did you remove this on purpose? If not, I'm going to post the patch the next comment, -- https://code.launchpad.net/~widelands-dev/widelands/font_size-lua/+merge/366938 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/font_size-lua 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-1827786-metaserver-login-box-clean-start into lp:widelands
I could think of another option. We remove the button entirely. The login window is always shown for non registered users. When a user has entered a password, the dialog won't be shown as long as the password is valid. -- https://code.launchpad.net/~widelands-dev/widelands/bug-1827786-metaserver-login-box-clean-start/+merge/367320 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/bug-1825932-open-games-clean-start. ___ 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-1827786-metaserver-login-box-clean-start into lp:widelands
I made the "show login dialog" button a proper button. kaputtnik has second thoughts, though. here is a screenshot: https://i.ibb.co/b3W3x3W/internetgame.png -- https://code.launchpad.net/~widelands-dev/widelands/bug-1827786-metaserver-login-box-clean-start/+merge/367320 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/bug-1825932-open-games-clean-start. ___ 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-1827786-metaserver-login-box-clean-start into lp:widelands
Carets are also fixed. -- https://code.launchpad.net/~widelands-dev/widelands/bug-1827786-metaserver-login-box-clean-start/+merge/367320 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/bug-1825932-open-games-clean-start. ___ 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/economy-target-profiles into lp:widelands
Diff comments:
>
> === modified file 'src/wui/economy_options_window.cc'
> --- src/wui/economy_options_window.cc 2019-02-23 11:00:49 +
> +++ src/wui/economy_options_window.cc 2019-05-11 13:37:58 +
> @@ -186,35 +281,399 @@
> const Widelands::Economy::TargetQuantity& tq = is_wares
> ?
>
> economy->ware_target_quantity(index) :
>
> economy->worker_target_quantity(index);
> - // Don't allow negative new amount.
> - if (amount >= 0 || -amount <=
> static_cast(tq.permanent)) {
> - if (is_wares) {
> - game.send_player_command(*new
> Widelands::CmdSetWareTargetQuantity(
> -game.get_gametime(),
> player_->player_number(), serial_, index,
> -tq.permanent + amount));
> + // Don't allow negative new amount
> + const int old_amount = static_cast(tq.permanent);
> + const int new_amount = std::max(0, old_amount + delta);
> + if (new_amount == old_amount) {
> + continue;
> + }
> + if (is_wares) {
> + game.send_player_command(*new
> Widelands::CmdSetWareTargetQuantity(
> +game.get_gametime(),
> player_->player_number(), serial_, index, new_amount));
> + } else {
> + game.send_player_command(*new
> Widelands::CmdSetWorkerTargetQuantity(
> +game.get_gametime(),
> player_->player_number(), serial_, index, new_amount));
> + }
> + }
> + }
> +}
> +
> +void EconomyOptionsWindow::EconomyOptionsPanel::reset_target() {
> + Widelands::Game& game =
> dynamic_cast(player_->egbase());
> + const bool is_wares = type_ == Widelands::wwWARE;
> + const auto& items = is_wares ? player_->tribe().wares() :
> player_->tribe().workers();
> + const PredefinedTargets settings =
> economy_options_window_->get_selected_target();
> +
> + bool anything_selected = false;
> + bool second_phase = false;
> +
> +run_second_phase:
> + for (const Widelands::DescriptionIndex& index : items) {
> + if (display_.ware_selected(index) || (second_phase &&
> !display_.is_ware_hidden(index))) {
> + anything_selected = true;
> + if (is_wares) {
> + game.send_player_command(*new
> Widelands::CmdSetWareTargetQuantity(
> + game.get_gametime(),
> player_->player_number(), serial_, index, settings.wares.at(index)));
> + } else {
> + game.send_player_command(*new
> Widelands::CmdSetWorkerTargetQuantity(
> + game.get_gametime(),
> player_->player_number(), serial_, index, settings.workers.at(index)));
> + }
> + }
> + }
> +
> + if (!second_phase && !anything_selected) {
> + // Nothing was selected, now go through the loop again and
> change everything
> + second_phase = true;
> + goto run_second_phase;
> + }
> +}
> +
> +constexpr unsigned kThinkInterval = 200;
> +
> +void EconomyOptionsWindow::think() {
> + const uint32_t time = player_->egbase().get_gametime();
> + if (time - time_last_thought_ < kThinkInterval ||
> !player_->get_economy(serial_)) {
> + // If our economy has been deleted, die() was already called,
> no need to do anything
> + return;
> + }
> + time_last_thought_ = time;
> + update_profiles();
> +}
> +
> +std::string EconomyOptionsWindow::applicable_target() {
> + const Widelands::Economy* eco = player_->get_economy(serial_);
> + for (const auto& pair : predefined_targets_) {
> + bool matches = true;
> + if (tabpanel_.active() == 0) {
> + for (const Widelands::DescriptionIndex& index :
> player_->tribe().wares()) {
> + const auto it = pair.second.wares.find(index);
> + if (it != pair.second.wares.end() &&
> eco->ware_target_quantity(index).permanent != it->second) {
> + matches = false;
> + break;
> + }
> + }
> + } else {
> + for (const Widelands::DescriptionIndex& index :
> player_->tribe().workers()) {
> + const auto it = pair.second.workers.find(index);
> + if (it !=
Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1827786-metaserver-login-box-clean-start into lp:widelands
Please test again it should address all issues. The only problem is that the
caret does not move properly. Help is appreciated. :)
@Gun have a look at the diff comment, please.
Diff comments:
>
> === modified file 'src/ui_fsmenu/multiplayer.cc'
> --- src/ui_fsmenu/multiplayer.cc 2019-05-11 18:50:30 +
> +++ src/ui_fsmenu/multiplayer.cc 2019-05-14 13:16:07 +
> @@ -90,37 +107,17 @@
> */
> void FullscreenMenuMultiPlayer::internet_login() {
> Section& s = g_options.pull_section("global");
> - if (auto_log_) {
> - nickname_ = s.get_string("nickname", _("nobody"));
> - password_ = s.get_string("password_sha1", "nobody");
> - register_ = s.get_bool("registered", false);
> - } else {
> - LoginBox lb(*this);
> - if (lb.run() ==
> UI::Panel::Returncodes::kOk) {
> - nickname_ = lb.get_nickname();
> - /// NOTE: The password is only stored (in memory and on
> disk) and transmitted (over the
> - /// network
> - /// to the metaserver) as cryptographic hash. This does
> NOT mean that the password is
> - /// stored
> - /// securely on the local disk. While the password
> should be secure while transmitted to
> - /// the
> - /// metaserver (no-one can use the transmitted data to
> log in as the user) this is not the
> - /// case
> - /// for local storage. The stored hash of the password
> makes it hard to look at the
> - /// configuration
> - /// file and figure out the plaintext password to,
> e.g., log in on the forum. However, the
> - /// stored hash can be copied to another system and
> used to log in as the user on the
> - /// metaserver.
> - // Further note: SHA-1 is considered broken and
> shouldn't be used anymore. But since the
> - // passwords on the server are protected by SHA-1 we
> have to use it here, too
> - password_ = crypto::sha1(lb.get_password());
> - register_ = lb.registered();
> -
> - s.set_bool("registered", lb.registered());
> - s.set_bool("auto_log", lb.set_automaticlog());
> - } else {
> - return;
> - }
> +
> + nickname_ = s.get_string("nickname", "");
> + password_ = s.get_string("password_sha1", "nobody");
> + register_ = s.get_bool("registered", false);
> +
> + // Checks can be done directly in editbox' by using valid_username().
> + // This is just to be on the safe side, in case the user changed the
> password in the config file.
> + if (nickname_.empty() ||
> nickname_.find_first_not_of("abcdefghijklmnopqrstuvwxyz"
> + "ABCDEFGHIJKLMNOPQRSTUVWXYZ1234567890@.+-_") <=
> nickname_.size()) {
As the comment says, this is just to make sure that the name is valid in case
the user did a change the name directly in the config file. For all other
username related checks I use valid_username(). Can this stay in?
> + show_internet_login();
> + return;
> }
>
> // Try to connect to the metaserver
--
https://code.launchpad.net/~widelands-dev/widelands/bug-1827786-metaserver-login-box-clean-start/+merge/367320
Your team Widelands Developers is subscribed to branch
lp:~widelands-dev/widelands/bug-1825932-open-games-clean-start.
___
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-1797702-spaces-in-names-clean-start into lp:widelands
Solved :) -- https://code.launchpad.net/~widelands-dev/widelands/bug-1797702-spaces-in-names-clean-start/+merge/367314 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/bug-1827786-metaserver-login-box-clean-start. ___ 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/font_size-lua into lp:widelands
And one more. This is the handling of direct messages. I know this is branch is about fonts but maybe we can address this here. Do we need: sender @recepiant: text For direct messages? The name is already coloured green and the text italic. This differentiates the message more than enough from normal messages IMHO. For the sender: @recepiant: text For the recipient: sender: text This should be sufficient, IMHO. -- https://code.launchpad.net/~widelands-dev/widelands/font_size-lua/+merge/366938 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/font_size-lua 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/font_size-lua into lp:widelands
On more question. We have 2 different fonts now. The one used in editboxes is completely different from the other font. Is this intentionally? -- https://code.launchpad.net/~widelands-dev/widelands/font_size-lua/+merge/366938 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/font_size-lua 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/list-directories-in-cpp into lp:widelands
I got ~100 compile warnings:
src/io/filesystem/filesystem.h:150:71: warning: unknown command tag name
[-Wdocumentation-unknown-command]
/// Returns all files in the given 'directory' that match
'basename[_\d{1,3}].extension'
^~
--
https://code.launchpad.net/~widelands-dev/widelands/list-directories-in-cpp/+merge/366614
Your team Widelands Developers is requested to review the proposed merge of
lp:~widelands-dev/widelands/list-directories-in-cpp 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/overlapping_workareas into lp:widelands
Review: Approve Perfect. -- https://code.launchpad.net/~widelands-dev/widelands/overlapping_workareas/+merge/366623 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/overlapping_workareas. ___ 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-1825932-open-games-clean-start into lp:widelands
Well, then. @bunnybot merge -- https://code.launchpad.net/~widelands-dev/widelands/bug-1825932-open-games-clean-start/+merge/367318 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/bug-1825932-open-games-clean-start. ___ 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
