[Widelands-dev] [Merge] lp:~widelands-dev/widelands/findpath_modification into lp:widelands
Continuous integration builds have changed state: Travis build 3142. State: errored. Details: https://travis-ci.org/widelands/widelands/builds/337350395. Appveyor build 2949. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_findpath_modification-2949. -- https://code.launchpad.net/~widelands-dev/widelands/findpath_modification/+merge/337103 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/findpath_modification 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/findpath_modification into lp:widelands
wait a bit, I am doing further modification to the code.. -- https://code.launchpad.net/~widelands-dev/widelands/findpath_modification/+merge/337103 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/findpath_modification 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-1744583_fix_global_helptexts into lp:widelands
The proposal to merge lp:~widelands-dev/widelands/bug-1744583_fix_global_helptexts into lp:widelands has been updated. Status: Needs review => Merged For more details, see: https://code.launchpad.net/~widelands-dev/widelands/bug-1744583_fix_global_helptexts/+merge/337051 -- Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/bug-1744583_fix_global_helptexts. ___ 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-1744583_fix_global_helptexts into lp:widelands
Continuous integration builds have changed state: Travis build 3138. State: passed. Details: https://travis-ci.org/widelands/widelands/builds/337191548. Appveyor build 2945. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_bug_1744583_fix_global_helptexts-2945. -- https://code.launchpad.net/~widelands-dev/widelands/bug-1744583_fix_global_helptexts/+merge/337051 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/bug-1744583_fix_global_helptexts. ___ 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/frisians into lp:widelands
first observation is that the scenarios should be converted to new font renderer before merging. -- https://code.launchpad.net/~widelands-dev/widelands/frisians/+merge/336910 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/frisians 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/internet-gaming-reset into lp:widelands
Continuous integration builds have changed state: Travis build 3137. State: passed. Details: https://travis-ci.org/widelands/widelands/builds/337190809. Appveyor build 2944. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_internet_gaming_reset-2944. -- https://code.launchpad.net/~widelands-dev/widelands/internet-gaming-reset/+merge/337129 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/internet-gaming-reset 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/findpath_modification into lp:widelands
Continuous integration builds have changed state: Travis build 3136. State: passed. Details: https://travis-ci.org/widelands/widelands/builds/337165243. Appveyor build 2943. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_findpath_modification-2943. -- https://code.launchpad.net/~widelands-dev/widelands/findpath_modification/+merge/337103 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/findpath_modification 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-website/better_notification_mail into lp:widelands-website
Ooops, sorry for spamming you with emails. I just forgot that ./manage.py emit_notices must be called by hand on the alpha site and wrote post after post, wondering that no emails get send :-S -- https://code.launchpad.net/~widelands-dev/widelands-website/better_notification_mail/+merge/335028 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
[Widelands-dev] [Merge] lp:~widelands-dev/widelands/internet-gaming-reset into lp:widelands
Notabilis has proposed merging
lp:~widelands-dev/widelands/internet-gaming-reset into lp:widelands.
Commit message:
Resetting the local state of the internet gaming when logging into the
metaserver.
Requested reviews:
Widelands Developers (widelands-dev)
For more details, see:
https://code.launchpad.net/~widelands-dev/widelands/internet-gaming-reset/+merge/337129
Resetting the local state of the internet gaming when logging into the
metaserver.
Currently, this is only done on logout. If the game jumps to the main menu due
to other reasons (timeout, exception, ...) the state is not reset, resulting in
a wrong state of the lobby after logging in again.
--
Your team Widelands Developers is requested to review the proposed merge of
lp:~widelands-dev/widelands/internet-gaming-reset into lp:widelands.
=== modified file 'src/network/internet_gaming.cc'
--- src/network/internet_gaming.cc 2018-01-29 00:09:28 +
+++ src/network/internet_gaming.cc 2018-02-04 11:48:39 +
@@ -102,7 +102,6 @@
// First of all try to connect to the metaserver
log("InternetGaming: Connecting to the metaserver.\n");
NetAddress addr;
- net.reset();
if (NetAddress::resolve_to_v6(, meta_, port_)) {
net = NetClient::connect(addr);
}
@@ -127,6 +126,10 @@
const std::string& meta,
uint32_t port) {
+ // Reset local state. Only resetting on logout() or error isn't enough since
+ // the game might jump to the main menu from other places, too
+ reset();
+
clientname_ = nick;
reg_ = registered;
meta_ = meta;
=== modified file 'src/network/netrelayconnection.cc'
--- src/network/netrelayconnection.cc 2017-12-17 14:45:23 +
+++ src/network/netrelayconnection.cc 2018-02-04 11:48:39 +
@@ -291,7 +291,7 @@
assert(host.is_valid());
const boost::asio::ip::tcp::endpoint destination(host.ip, host.port);
- log("[NetRelayConnection]: Trying to connect to %s:%u ... ", host.ip.to_string().c_str(),
+ log("[NetRelayConnection] Trying to connect to %s:%u ... ", host.ip.to_string().c_str(),
host.port);
boost::system::error_code ec;
socket_.connect(destination, ec);
___
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-1744583_fix_global_helptexts into lp:widelands
travis has problems fetching packages... @bunnybot merge force -- https://code.launchpad.net/~widelands-dev/widelands/bug-1744583_fix_global_helptexts/+merge/337051 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/bug-1744583_fix_global_helptexts. ___ 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-1744583_fix_global_helptexts into lp:widelands
Refusing to merge, since Travis is not green. Use @bunnybot merge force for merging anyways. Travis build 3127. State: failed. Details: https://travis-ci.org/widelands/widelands/builds/336529933. -- https://code.launchpad.net/~widelands-dev/widelands/bug-1744583_fix_global_helptexts/+merge/337051 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/bug-1744583_fix_global_helptexts. ___ 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/better_notification_mail into lp:widelands-website
Review: Resubmit alpha site is running with database django_18 now, so only the 8 registered people in this database may get emails and not the people from the old alpha database. -- https://code.launchpad.net/~widelands-dev/widelands-website/better_notification_mail/+merge/335028 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-1744583_fix_global_helptexts into lp:widelands
Thanks :-) -- https://code.launchpad.net/~widelands-dev/widelands/bug-1744583_fix_global_helptexts/+merge/337051 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/bug-1744583_fix_global_helptexts. ___ 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-1744583_fix_global_helptexts into lp:widelands
Review: Approve review, compile, testplay All fine. @bunnybot merge -- https://code.launchpad.net/~widelands-dev/widelands/bug-1744583_fix_global_helptexts/+merge/337051 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/bug-1744583_fix_global_helptexts. ___ 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-1746481 into lp:widelands
Codecheck complains about printfs, but these are only for temporary DEBUG logs and will be removed before merge... -- https://code.launchpad.net/~widelands-dev/widelands/bug-1746481/+merge/337125 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/bug-1746481 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-1746481 into lp:widelands
Continuous integration builds have changed state: Travis build 3135. State: failed. Details: https://travis-ci.org/widelands/widelands/builds/337068986. Appveyor build 2942. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_bug_1746481-2942. -- https://code.launchpad.net/~widelands-dev/widelands/bug-1746481/+merge/337125 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/bug-1746481 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
