[Widelands-dev] [Merge] lp:~widelands-dev/widelands/geologist-messages into lp:widelands
Continuous integration builds have changed state: Travis build 3997. State: passed. Details: https://travis-ci.org/widelands/widelands/builds/430196840. Appveyor build 3794. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_geologist_messages-3794. -- https://code.launchpad.net/~widelands-dev/widelands/geologist-messages/+merge/355267 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/geologist-messages 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-1791891-key-modifier-inputqueue into lp:widelands
Personally, I would prefer to keep the modifiers in this branch as they are and modify the minimize feature, e.g., by only minimizing on clicking the window title. The bug report only mentions the priority buttons, but we have the same problem with the dismantle and burn buttons. Admittedly the latter ones already are in build19 and nobody complained about them yet. But that would also mean that the big buttons of this branch will probably be fine independent of the bug report. Unfortunately I am unable to merge trunk in this branch, since I am currently in a "secure" WiFi where only web and mail is allowed. So no bzr for me at the moment. -- https://code.launchpad.net/~widelands-dev/widelands/bug-1791891-key-modifier-inputqueue/+merge/354732 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/bug-1791891-key-modifier-inputqueue. ___ 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/geologist-messages into lp:widelands
Benedikt Straub has proposed merging lp:~widelands-dev/widelands/geologist-messages into lp:widelands. Commit message: Geologist messages use the resource´s image as icon instead of the resource indicator´s Requested reviews: Widelands Developers (widelands-dev) Related bugs: Bug #1793021 in widelands: "ressource indicators wrong display in message box" https://bugs.launchpad.net/widelands/+bug/1793021 For more details, see: https://code.launchpad.net/~widelands-dev/widelands/geologist-messages/+merge/355267 -- Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/geologist-messages into lp:widelands. === modified file 'src/logic/map_objects/tribes/worker.cc' --- src/logic/map_objects/tribes/worker.cc 2018-09-10 12:32:56 + +++ src/logic/map_objects/tribes/worker.cc 2018-09-18 18:26:02 + @@ -959,7 +959,7 @@ const ResourceDescription* const rdescr = world.get_resource(position.field->get_resources()); const TribeDescr& t = owner().tribe(); - const Immovable& ri = game.create_immovable( + game.create_immovable( position, t.get_resource_indicator( rdescr, (rdescr && rdescr->detectable()) ? position.field->get_resources_amount() : 0), @@ -980,7 +980,7 @@ get_owner()->add_message_with_timeout( game, std::unique_ptr( new Message(Message::Type::kGeologists, game.get_gametime(), - rdescr->descname(), ri.descr().representative_image_filename(), + rdescr->descname(), rdescr->representative_image(), rdescr->descname(), message, position, serial_, rdescr->name())), rdescr->timeout_ms(), rdescr->timeout_radius()); } ___ 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/delete_user into lp:widelands-website
"Ancestor" = "Vorfahre" oder "Ahn"? I think that wouldn't fit. The name has to follow the Username rules, so no space. Ex-Member? We could choose "anonymized" insted of "Anonymous". One question about the online gaming password: I have removed the string "WARNING: The online gaming password is transmitted in cleartext. Do not use your website password!" AFAIK it is not transmitted in cleartext anymore? Just to be sure. -- https://code.launchpad.net/~widelands-dev/widelands-website/delete_user/+merge/354978 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/bug1629013_obsoletewinfiles into lp:widelands
The proposal to merge lp:~widelands-dev/widelands/bug1629013_obsoletewinfiles into lp:widelands has been updated. Status: Needs review => Merged For more details, see: https://code.launchpad.net/~widelands-dev/widelands/bug1629013_obsoletewinfiles/+merge/355178 -- Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/bug1629013_obsoletewinfiles 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/bug1629013_obsoletewinfiles into lp:widelands
Continuous integration builds have changed state: Travis build 3994. State: passed. Details: https://travis-ci.org/widelands/widelands/builds/429922544. Appveyor build 3791. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_bug1629013_obsoletewinfiles-3791. -- https://code.launchpad.net/~widelands-dev/widelands/bug1629013_obsoletewinfiles/+merge/355178 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/bug1629013_obsoletewinfiles 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/bug1792297_worker_encyclopedia into lp:widelands
Perhaps I should have explained that this branch contains 2 separate fixes to 2 separate problems mentioned in the forum. the first is the fix of the linked bug. This is done in buildhelp, which now shows the correct experience levels of all upgrades in each building where experience does matter. The second fix was intended to show each possible working place for each worker not only the ones where he is required. -- https://code.launchpad.net/~widelands-dev/widelands/bug1792297_worker_encyclopedia/+merge/354986 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/bug1792297_worker_encyclopedia 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/bug1792297_worker_encyclopedia into lp:widelands
the experience section is present for each of the lower level workers. Not for the most educated worker which makes sense in the worker help (imho). the "instead of" string was meant to determine that the experienced worker can be a replacement for the mentioned less experienced worker in the specified building. id we are going to use (required) and (optional) some information will be lost. Just for my understanding what is your rational against the instead of string? Will try to fix the format of the strings tonight though -- https://code.launchpad.net/~widelands-dev/widelands/bug1792297_worker_encyclopedia/+merge/354986 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/bug1792297_worker_encyclopedia 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/bug1629013_obsoletewinfiles into lp:widelands
Thanks! @bunnybot merge -- https://code.launchpad.net/~widelands-dev/widelands/bug1629013_obsoletewinfiles/+merge/355178 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/bug1629013_obsoletewinfiles 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/balancing-worldsavior into lp:widelands
The zero master miners in village start conditions is not a bug, it is a feature. -- https://code.launchpad.net/~widelands-dev/widelands/balancing-worldsavior/+merge/355158 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/balancing-worldsavior 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/bug1792297_worker_encyclopedia into lp:widelands
Oh, and another thing: use bformat to assemble your strings - hard-coding word order will cause problems for translators -- https://code.launchpad.net/~widelands-dev/widelands/bug1792297_worker_encyclopedia/+merge/354986 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/bug1792297_worker_encyclopedia 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/bug1792297_worker_encyclopedia into lp:widelands
Yes, a (required) is a good idea. Further details are then available at the building help. What I meant was that the building help has a section where the needed experience for upgrades is shown. The worker help could have the same section - or maybe it already does and I overlooked it? -- https://code.launchpad.net/~widelands-dev/widelands/bug1792297_worker_encyclopedia/+merge/354986 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/bug1792297_worker_encyclopedia 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/delete_user into lp:widelands-website
Review: Approve How about "Former Member(s)"? Or "Ancestor(s)"? Would fit with the tribes terminology theme I agree, don't waste too much energy into trying to write a Javascript. -- https://code.launchpad.net/~widelands-dev/widelands-website/delete_user/+merge/354978 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/bug1629013_obsoletewinfiles into lp:widelands
Tino has proposed merging
lp:~widelands-dev/widelands/bug1629013_obsoletewinfiles into lp:widelands.
Commit message:
Remove obsolete mingw files.
Only "widelands.rc.cmake" is needed, which cmake needs to generate the
ressource file widelands.rc
Requested reviews:
Widelands Developers (widelands-dev)
Related bugs:
Bug #1629013 in widelands: "Remove unused supplementary win32 files"
https://bugs.launchpad.net/widelands/+bug/1629013
For more details, see:
https://code.launchpad.net/~widelands-dev/widelands/bug1629013_obsoletewinfiles/+merge/355178
--
Your team Widelands Developers is requested to review the proposed merge of
lp:~widelands-dev/widelands/bug1629013_obsoletewinfiles into lp:widelands.
=== removed directory 'utils/win32/mingw'
=== removed file 'utils/win32/mingw/WL.exe.Manifest'
--- utils/win32/mingw/WL.exe.Manifest 2008-03-13 21:29:56 +
+++ utils/win32/mingw/WL.exe.Manifest 1970-01-01 00:00:00 +
@@ -1,23 +0,0 @@
-
-
-
-Widelands
-
-
-
-
-
-
=== removed file 'utils/win32/mingw/Widelands_win.h'
--- utils/win32/mingw/Widelands_win.h 2016-09-29 16:47:19 +
+++ utils/win32/mingw/Widelands_win.h 1970-01-01 00:00:00 +
@@ -1,42 +0,0 @@
-/*
- * Copyright (C) 2006-2015 by the Widelands Development Team
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- *
- */
-
-#ifndef WIDELANDS_WIN_H
-#define WIDELANDS_WIN_H
-
-#include "wlversion.h"
-
-/* VERSION DEFINITIONS */
-#define VER_STRING "0.0.0.19"
-#define VER_MAJOR 0
-#define VER_MINOR 0
-#define VER_RELEASE 0
-#define VER_BUILD 19
-#define COMPANY_NAME "The Widelands Development Team"
-#define FILE_VERSION BUILD_ID
-#define FILE_DESCRIPTION "Widelands - realtime strategy game"
-#define INTERNAL_NAME "WL"
-#define LEGAL_COPYRIGHT "GPL v2"
-#define WWW "http:\/\/wl.widelands.org"
-#define License "Gnu GPL v2"
-#define ORIGINAL_FILENAME "widelands"
-#define PRODUCT_NAME "Widelands"
-#define PRODUCT_VERSION BUILD_ID
-
-#endif /*WIDELANDS_WIN_H*/
=== removed file 'utils/win32/mingw/Widelands_win.rc'
--- utils/win32/mingw/Widelands_win.rc 2016-09-29 16:47:19 +
+++ utils/win32/mingw/Widelands_win.rc 1970-01-01 00:00:00 +
@@ -1,60 +0,0 @@
-/*
- * Copyright (C) 2006-2016 by the Widelands Development Team
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- *
- */
-
-#include "wlversion.h"
-
-#include // included for version info constants
-
-A ICON MOVEABLE PURE LOADONCALL DISCARDABLE "../WL.ico"
-
-// SUPPORT FOR WINDOWS XP THEMES:
-// THIS WILL MAKE THE PROGRAM USE THE COMMON CONTROLS
-// LIBRARY VERSION 6.0 (IF IT IS AVAILABLE)
-1 24 "WL.exe.Manifest"
-
-//
-// TO CHANGE VERSION INFORMATION, EDIT OPTIONS BELOW...
-//
-1 VERSIONINFO
-FILEVERSION 0,0,0,19
-PRODUCTVERSION 0,0,0,19
-FILETYPE VFT_APP
-{
- BLOCK "StringFileInfo"
- {
- BLOCK "080904E4"
- {
- VALUE "CompanyName", "The Widelands Development Team"
- VALUE "FileVersion", BUILD_ID
- VALUE "FileDescription", "Widelands - realtime strategy game"
- VALUE "InternalName", "WL"
- VALUE "LegalCopyright", "GPL v2"
- VALUE "WWW", "http://www.widelands.org;
- VALUE "License", "Gnu GPL v2"
- VALUE "OriginalFilename", "widelands"
- VALUE "ProductName", "Widelands - an Open-Source realtime strategy game"
- VALUE "ProductVersion", BUILD_ID
- }
- }
- BLOCK "VarFileInfo"
- {
- VALUE "Translation", 0x0809, 1252
- }
-}
-
=== removed file 'utils/win32/mingw/wlversion.h'
--- utils/win32/mingw/wlversion.h 2016-09-29 16:47:19 +
+++ utils/win32/mingw/wlversion.h 1970-01-01 00:00:00 +
@@ -1,2 +0,0 @@
-#define BUILD_ID "Build19"
-#define BUILD_TYPE "inoffical"
=== modified file 'utils/win32/widelands.rc.cmake'
