[Widelands-dev] [Merge] lp:~widelands-dev/widelands/fix_context_selection into lp:widelands
The proposal to merge lp:~widelands-dev/widelands/fix_context_selection into lp:widelands has been updated. Status: Needs review => Merged For more details, see: https://code.launchpad.net/~widelands-dev/widelands/fix_context_selection/+merge/368238 -- Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/fix_context_selection. ___ 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/fix_context_selection into lp:widelands
Review: Approve Tested on 2 Linux and 1 Windows machines. I'll merge this now, because it seems to be OK. @kaputtnik: Can you test with your old laptop some time too, just in case? @bunnybot merge -- https://code.launchpad.net/~widelands-dev/widelands/fix_context_selection/+merge/368238 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/fix_context_selection. ___ 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-1826744-lobby-commands into lp:widelands
Continuous integration builds have changed state: Travis build 5145. State: passed. Details: https://travis-ci.org/widelands/widelands/builds/540930580. Appveyor build 4927. State: failed. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_bug_1826744_lobby_commands-4927. -- 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/fix_context_selection into lp:widelands
Should this be tested some how or are the Travis/Appveyor builds enough testing? -- https://code.launchpad.net/~widelands-dev/widelands/fix_context_selection/+merge/368238 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/fix_context_selection 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
[Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1826744-lobby-commands into lp:widelands
Notabilis has proposed merging
lp:~widelands-dev/widelands/bug-1826744-lobby-commands into lp:widelands.
Commit message:
Adding support for /warn and /kick commands of superusers in the internet
gaming lobby.
Requested reviews:
Widelands Developers (widelands-dev)
Related bugs:
Bug #1826744 in widelands: "Implement lobby commands"
https://bugs.launchpad.net/widelands/+bug/1826744
For more details, see:
https://code.launchpad.net/~widelands-dev/widelands/bug-1826744-lobby-commands/+merge/368285
/warn is sending a system message to a single user.
/kick is banning the IP of the user for 24 hours to avoid immediate reconnects.
--
Your team Widelands Developers is requested to review the proposed merge of
lp:~widelands-dev/widelands/bug-1826744-lobby-commands into lp:widelands.
=== modified file 'src/network/internet_gaming.cc'
--- src/network/internet_gaming.cc 2019-06-02 09:29:59 +
+++ src/network/internet_gaming.cc 2019-06-03 19:31:05 +
@@ -459,14 +459,15 @@
return;
} else if (cmd == IGPCMD_ERROR) {
- std::string errortype = packet.string();
+ const std::string errortype = packet.string();
if (errortype != IGPCMD_LOGIN && errortype != IGPCMD_PWD_CHALLENGE) {
log("InternetGaming: Strange ERROR in connecting state: %s\n", errortype.c_str());
throw WLWarning(
_("Mixed up"), _("The metaserver sent a strange ERROR during connection"));
}
// Clients login request got rejected
- logout(packet.string());
+ const std::string message = packet.string();
+ logout(message);
set_error();
return;
@@ -682,6 +683,14 @@
}
}
+ else if (subcmd == IGPCMD_CMD) {
+// Something went wrong with the command
+message += _("Command could not be executed.");
+message =
+ (boost::format("%s %s") % message % InternetGamingMessages::get_message(reason))
+ .str();
+ }
+
else if (subcmd == IGPCMD_GAME_OPEN) {
// Something went wrong with the newly opened game
message = InternetGamingMessages::get_message(reason);
@@ -901,6 +910,15 @@
// beginning
// with a "/" - let's see...
+ if (msg == "/help") {
+ format_and_add_chat("", "", true, _("Supported admin commands:"));
+ format_and_add_chat("", "", true, _("/motd sets a permanent greeting message"));
+ format_and_add_chat("", "", true, _("/announcement send a one time system message"));
+ format_and_add_chat("", "", true, _("/warnsend a private system message to the given user"));
+ format_and_add_chat("", "", true, _("/kick removes the given user or game from the metaserver"));
+ return;
+ }
+
// Split up in "cmd" "arg"
std::string cmd, arg;
std::string temp = msg.substr(1); // cut off '/'
@@ -944,6 +962,15 @@
m.string(arg);
net->send(m);
return;
+ } else if (!arg.empty() && (cmd == "warn" || cmd == "kick")) {
+ // warn a user by sending a private system message or
+ // kick a user or game from the metaserver
+ SendPacket m;
+ m.string(IGPCMD_CMD);
+ m.string(cmd);
+ m.string(arg);
+ net->send(m);
+ return;
} else {
// let everything else pass
goto normal;
=== modified file 'src/network/internet_gaming_protocol.h'
--- src/network/internet_gaming_protocol.h 2019-06-01 16:31:13 +
+++ src/network/internet_gaming_protocol.h 2019-06-03 19:31:05 +
@@ -299,6 +299,15 @@
static const std::string IGPCMD_CHAT = "CHAT";
/**
+ * Sent by the client to issue a superuser command.
+ *
+ * The client sends this message to the metaserver with the following payload:
+ * \li string:the command
+ * \li string:arbitrary parameters.
+ */
+static const std::string IGPCMD_CMD = "CMD";
+
+/**
* Sent by the metaserver to inform the client, that the list of games was changed. No payload is
* sent,
* as e.g. clients in a game are not really interested about other games and we want to keep traffic
___
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
Continuous integration builds have changed state: Travis build 5143. State: passed. Details: https://travis-ci.org/widelands/widelands/builds/540719162. Appveyor build 4925. State: failed. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_unify_sleep_time-4925. -- 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
Review: Approve code review shall be good to go from my side -- 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/fix_context_selection into lp:widelands
Continuous integration builds have changed state: Travis build 5140. State: passed. Details: https://travis-ci.org/widelands/widelands/builds/540645510. Appveyor build 4922. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_fix_context_selection-4922. -- https://code.launchpad.net/~widelands-dev/widelands/fix_context_selection/+merge/368238 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/fix_context_selection 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] Current state of launchpad->github migration
Hey everyone, just want to ask, if there are any current plans to finish the migration to github? With a new laptop i just noticed that it is increasingly difficult to get the bzr tools running, because the windows binaries are very old and everything still depends on python2. Breezy is not available for windows, and compiling/installing it via PIP does require a visual studio compiler on your system. I would really like to work with git only, because it is just so convenient. Is there anything i can do to help with the migration? -- This message was sent from Launchpad by Tino (https://launchpad.net/~tino79) to each member of the Widelands Developers team using the "Contact this team" link on the Widelands Developers team page (https://launchpad.net/~widelands-dev). For more information see https://help.launchpad.net/YourAccount/ContactingPeople ___ 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
Looks good so far except that the woodcutters will stand around 4 seconds now until the log appears. that might look weird. so we should either keep the idle time like it is (which means we add the additional time to the working time) or we introduce a short work cycle of 4 secs instead of idling. -- 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/fix_context_selection into lp:widelands
Continuous integration builds have changed state: Travis build 5138. State: errored. Details: https://travis-ci.org/widelands/widelands/builds/540496020. Appveyor build 4920. State: failed. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_fix_context_selection-4920. -- https://code.launchpad.net/~widelands-dev/widelands/fix_context_selection/+merge/368238 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/fix_context_selection 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
