[Widelands-dev] [Merge] lp:~widelands-dev/widelands/collectors_notification into lp:widelands
Continuous integration builds have changed state: Travis build 4398. State: passed. Details: https://travis-ci.org/widelands/widelands/builds/478872308. Appveyor build 4189. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_collectors_notification-4189. -- https://code.launchpad.net/~widelands-dev/widelands/collectors_notification/+merge/361334 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/collectors_notification. ___ 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/user-status-lobby into lp:widelands
Continuous integration builds have changed state: Travis build 4397. State: passed. Details: https://travis-ci.org/widelands/widelands/builds/478871996. Appveyor build 4188. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_user_status_lobby-4188. -- https://code.launchpad.net/~widelands-dev/widelands/user-status-lobby/+merge/361704 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/user-status-lobby 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/user-status-lobby into lp:widelands
Toni Förster has proposed merging lp:~widelands-dev/widelands/user-status-lobby
into lp:widelands.
Commit message:
Properly formatted User Status overlay:
- centered and bold Heading
- proper aligned icons and text
Requested reviews:
Widelands Developers (widelands-dev)
For more details, see:
https://code.launchpad.net/~widelands-dev/widelands/user-status-lobby/+merge/361704
The current overlay looked a little off. It is much nicer looking now IMHO.
--
Your team Widelands Developers is requested to review the proposed merge of
lp:~widelands-dev/widelands/user-status-lobby into lp:widelands.
=== modified file 'src/ui_fsmenu/internet_lobby.cc'
--- src/ui_fsmenu/internet_lobby.cc 2018-12-13 07:24:01 +
+++ src/ui_fsmenu/internet_lobby.cc 2019-01-12 22:31:41 +
@@ -134,10 +134,12 @@
// prepare the lists
std::string t_tip =
- (boost::format("%s%s%s%s%s%s%s%s%s%s") % "" % _("User Status") %
- "" % " " % _("Registered") %
- " " % _("Administrator") %
- " " % _("Unregistered") % "")
+ (boost::format("%s%s%s%s%s%s%s%s%s%s")
+ % ""
+ % _("User Status") % ""
+ % " " % _("Administrator")
+ % " " % _("Registered")
+ % " " % _("Unregistered") % "")
.str();
clientsonline_list_.add_column(22, "*", t_tip);
/** TRANSLATORS: Player Name */
___
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/travis-brew into lp:widelands
You're very welcome :-) -- https://code.launchpad.net/~widelands-dev/widelands/travis-brew/+merge/361702 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/travis-brew 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/travis-brew into lp:widelands
Many thanks :-) -- https://code.launchpad.net/~widelands-dev/widelands/travis-brew/+merge/361702 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/travis-brew 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/json_writer into lp:widelands
Continuous integration builds have changed state: Travis build 4395. State: failed. Details: https://travis-ci.org/widelands/widelands/builds/478759403. Appveyor build 4186. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_json_writer-4186. -- https://code.launchpad.net/~widelands-dev/widelands/json_writer/+merge/357908 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/json_writer. ___ 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-brew into lp:widelands
The proposal to merge lp:~widelands-dev/widelands/travis-brew into lp:widelands has been updated. Status: Needs review => Merged For more details, see: https://code.launchpad.net/~widelands-dev/widelands/travis-brew/+merge/361702 -- Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/travis-brew 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/travis-brew into lp:widelands
@bunnybot merge -- https://code.launchpad.net/~widelands-dev/widelands/travis-brew/+merge/361702 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/travis-brew 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/travis-brew into lp:widelands
Continuous integration builds have changed state: Travis build 4394. State: passed. Details: https://travis-ci.org/widelands/widelands/builds/478743768. Appveyor build 4185. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_travis_brew-4185. -- https://code.launchpad.net/~widelands-dev/widelands/travis-brew/+merge/361702 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/travis-brew 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-1805155_frisian_bushes_and_resi into lp:widelands
Continuous integration builds have changed state: Travis build 4393. State: failed. Details: https://travis-ci.org/widelands/widelands/builds/478743572. Appveyor build 4184. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_bug_1805155_frisian_bushes_and_resi-4184. -- https://code.launchpad.net/~widelands-dev/widelands/bug-1805155_frisian_bushes_and_resi/+merge/361703 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/bug-1805155_frisian_bushes_and_resi 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-1805155_frisian_bushes_and_resi into lp:widelands
kaputtnik has proposed merging
lp:~widelands-dev/widelands/bug-1805155_frisian_bushes_and_resi into
lp:widelands.
Commit message:
Adapted buildcat.py to get translations for resources, added textdomain to
blueberry bushes.
Requested reviews:
Widelands Developers (widelands-dev)
Related bugs:
Bug #1805155 in widelands: "Frisian bushes not localized"
https://bugs.launchpad.net/widelands/+bug/1805155
For more details, see:
https://code.launchpad.net/~widelands-dev/widelands/bug-1805155_frisian_bushes_and_resi/+merge/361703
Adapted buildcat.py to get translations for resources, added textdomain to
blueberry bushes.
--
Your team Widelands Developers is requested to review the proposed merge of
lp:~widelands-dev/widelands/bug-1805155_frisian_bushes_and_resi into
lp:widelands.
=== modified file 'data/tribes/immovables/berry_bushes/blueberry/init.lua'
--- data/tribes/immovables/berry_bushes/blueberry/init.lua 2018-11-03 11:27:18 +
+++ data/tribes/immovables/berry_bushes/blueberry/init.lua 2019-01-12 13:19:48 +
@@ -1,3 +1,5 @@
+set_textdomain("tribes")
+
dirname = path.dirname (__file__)
terrain_affinity = {
=== modified file 'utils/buildcat.py'
--- utils/buildcat.py 2018-12-13 07:24:01 +
+++ utils/buildcat.py 2019-01-12 13:19:48 +
@@ -84,6 +84,7 @@
'../../data/tribes/*/*/*/helptexts.lua',
'../../data/tribes/*/*/*/*/helptexts.lua',
'../../data/tribes/*/*/*/*/*/helptexts.lua',
+'../../data/tribes/*/resi/helptexts/*.lua',
]),
('widelands_editor/widelands_editor', [
'../../data/scripting/editor/*.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/travis-brew into lp:widelands
Toni Förster has proposed merging lp:~widelands-dev/widelands/travis-brew into lp:widelands. Commit message: update homebrew before installing dependencies on osx Requested reviews: Widelands Developers (widelands-dev) For more details, see: https://code.launchpad.net/~widelands-dev/widelands/travis-brew/+merge/361702 >From the output on travis it seems as if there are some problems with updating >homebrew. -- Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/travis-brew into lp:widelands. === modified file '.travis.sh' --- .travis.sh 2018-12-24 10:43:43 + +++ .travis.sh 2019-01-12 12:48:22 + @@ -14,6 +14,8 @@ fi if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then + # Upgrade homebrew + brew update && brew upgrade # Install osx dependencies # boost, cmake, gettext and icu4c are preinstalled :) brew install glew sdl2 sdl2_image sdl2_mixer sdl2_ttf ___ 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-1811030-desync-ai into lp:widelands
I compiled the game revision of the other bug report with the changes of this branch applied and it indeed seems to fix the issues there. -- https://code.launchpad.net/~widelands-dev/widelands/bug-1811030-desync-ai/+merge/361689 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/bug-1811030-desync-ai. ___ 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-1811030-desync-ai into lp:widelands
The proposal to merge lp:~widelands-dev/widelands/bug-1811030-desync-ai into lp:widelands has been updated. Status: Needs review => Merged For more details, see: https://code.launchpad.net/~widelands-dev/widelands/bug-1811030-desync-ai/+merge/361689 -- Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/bug-1811030-desync-ai. ___ 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-1811030-desync-ai into lp:widelands
as travis had only unrelated Issues with OSX / homebrew: @bunnybot merge force kapputnik: that savegame from #1800366 shoud be to old, but it smells just like thes situation I had. -- https://code.launchpad.net/~widelands-dev/widelands/bug-1811030-desync-ai/+merge/361689 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/bug-1811030-desync-ai. ___ 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-1811030-desync-ai into lp:widelands
Refusing to merge, since Travis is not green. Use @bunnybot merge force for merging anyways. Travis build 4391. State: errored. Details: https://travis-ci.org/widelands/widelands/builds/478537625. -- https://code.launchpad.net/~widelands-dev/widelands/bug-1811030-desync-ai/+merge/361689 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/bug-1811030-desync-ai. ___ 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-1811030-desync-ai into lp:widelands
Notabilis, is this bug maybe also fixed with this branch? https://bugs.launchpad.net/widelands/+bug/1800366 -- https://code.launchpad.net/~widelands-dev/widelands/bug-1811030-desync-ai/+merge/361689 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/bug-1811030-desync-ai. ___ 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-1811030-desync-ai into lp:widelands
Review: Approve compile test Tested this now, Notabilis hint was 100% correct, I got a desync right at the start. This can go in. @bunnybot merge -- https://code.launchpad.net/~widelands-dev/widelands/bug-1811030-desync-ai/+merge/361689 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/bug-1811030-desync-ai. ___ 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-1811030-desync-ai into lp:widelands
I am compiling this branch. Klaus, i will try to be in the lobby the next days. Playing the map 'Crossing the Horizon' may speed up testing. -- https://code.launchpad.net/~widelands-dev/widelands/bug-1811030-desync-ai/+merge/361689 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/bug-1811030-desync-ai. ___ 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
