The proposal to merge lp:~widelands-dev/widelands/freebsd into lp:widelands has
been updated.
Status: Needs review => Merged
For more details, see:
https://code.launchpad.net/~widelands-dev/widelands/freebsd/+merge/225867
--
https://code.launchpad.net/~widelands-dev/widelands/freebsd/+merge
Review: Approve
Cool, that is how I expected it to look. I merged to trunk now.
--
https://code.launchpad.net/~widelands-dev/widelands/freebsd/+merge/225867
Your team Widelands Developers is subscribed to branch
lp:~widelands-dev/widelands/freebsd.
__
Tino did this in trunk this morning too.
--
https://code.launchpad.net/~hjd/widelands/add_flag/+merge/226741
Your team Widelands Developers is requested to review the proposed merge of
lp:~hjd/widelands/add_flag into lp:widelands.
___
Mailing list: htt
The proposal to merge lp:~hjd/widelands/add_flag into lp:widelands has been
updated.
Status: Needs review => Merged
For more details, see:
https://code.launchpad.net/~hjd/widelands/add_flag/+merge/226741
--
https://code.launchpad.net/~hjd/widelands/add_flag/+merge/226741
Your team Widelands
The proposal to merge lp:~widelands-dev/widelands/mapobject_cleanup_soldier
into lp:widelands has been updated.
Status: Needs review => Merged
For more details, see:
https://code.launchpad.net/~widelands-dev/widelands/mapobject_cleanup_soldier/+merge/226754
--
https://code.launchpad.net/~wi
The proposal to merge lp:~widelands-dev/widelands/mapobject_cleanup_worker into
lp:widelands has been updated.
Status: Needs review => Merged
For more details, see:
https://code.launchpad.net/~widelands-dev/widelands/mapobject_cleanup_worker/+merge/226745
--
https://code.launchpad.net/~wide
Review: Approve
one question. But I went ahead and merged already.
Diff comments:
> === modified file 'src/economy/idleworkersupply.cc'
> --- src/economy/idleworkersupply.cc 2014-06-01 18:00:48 +
> +++ src/economy/idleworkersupply.cc 2014-07-14 20:49:30 +
> @@ -79,7 +79,7 @@
> void
Review: Approve
--
https://code.launchpad.net/~widelands-dev/widelands/mapobject_cleanup_soldier/+merge/226754
Your team Widelands Developers is subscribed to branch
lp:~widelands-dev/widelands/mapobject_cleanup_soldier.
___
Mailing list: https://lau
The proposal to merge lp:~widelands-dev/widelands/mapobject_cleanup_building
into lp:widelands has been updated.
Status: Needs review => Merged
For more details, see:
https://code.launchpad.net/~widelands-dev/widelands/mapobject_cleanup_building/+merge/226755
--
https://code.launchpad.net/~
Review: Approve
Applied after fixing a small merge conflict due to recent merges.
--
https://code.launchpad.net/~widelands-dev/widelands/mapobject_cleanup_building/+merge/226755
Your team Widelands Developers is subscribed to branch
lp:~widelands-dev/widelands/mapobject_cleanup_building.
__
Review: Approve
--
https://code.launchpad.net/~widelands-dev/widelands/mapobject_cleanup_misc/+merge/226756
Your team Widelands Developers is subscribed to branch
lp:~widelands-dev/widelands/mapobject_cleanup_misc.
___
Mailing list: https://launchpad
The proposal to merge lp:~widelands-dev/widelands/mapobject_cleanup_misc into
lp:widelands has been updated.
Status: Needs review => Merged
For more details, see:
https://code.launchpad.net/~widelands-dev/widelands/mapobject_cleanup_misc/+merge/226756
--
https://code.launchpad.net/~wideland
The proposal to merge lp:~widelands-dev/widelands/fix_world_names into
lp:widelands has been updated.
Status: Needs review => Rejected
For more details, see:
https://code.launchpad.net/~widelands-dev/widelands/fix_world_names/+merge/226592
--
https://code.launchpad.net/~widelands-dev/widela
GunChleoc has proposed merging
lp:~widelands-dev/widelands/mapobject_cleanup_misc into lp:widelands.
Requested reviews:
Widelands Developers (widelands-dev)
Related bugs:
Bug #1341082 in widelands: "Building help: clean up name, descname"
https://bugs.launchpad.net/widelands/+bug/1341082
F
GunChleoc has proposed merging
lp:~widelands-dev/widelands/mapobject_cleanup_soldier into lp:widelands.
Requested reviews:
Widelands Developers (widelands-dev)
Related bugs:
Bug #1341082 in widelands: "Building help: clean up name, descname"
https://bugs.launchpad.net/widelands/+bug/1341082
GunChleoc has proposed merging
lp:~widelands-dev/widelands/mapobject_cleanup_building into lp:widelands.
Requested reviews:
Widelands Developers (widelands-dev)
Related bugs:
Bug #1341082 in widelands: "Building help: clean up name, descname"
https://bugs.launchpad.net/widelands/+bug/134108
GunChleoc has proposed merging
lp:~widelands-dev/widelands/mapobject_cleanup_worker into lp:widelands.
Requested reviews:
Widelands Developers (widelands-dev)
Related bugs:
Bug #1341082 in widelands: "Building help: clean up name, descname"
https://bugs.launchpad.net/widelands/+bug/1341082
I merged it into another branch and it worked :)
--
https://code.launchpad.net/~widelands-dev/widelands/bug-1332627/+merge/226628
Your team Widelands Developers is subscribed to branch
lp:~widelands-dev/widelands/bug-1332627.
___
Mailing list: https://
Hans Joachim Desserud has proposed merging lp:~hjd/widelands/add_flag into
lp:widelands.
Requested reviews:
Widelands Developers (widelands-dev)
For more details, see:
https://code.launchpad.net/~hjd/widelands/add_flag/+merge/226741
Rename the remaining calls to wl_add_flag. (This method was
The proposal to merge lp:~widelands-dev/widelands/bug-1332627 into lp:widelands
has been updated.
Status: Needs review => Merged
For more details, see:
https://code.launchpad.net/~widelands-dev/widelands/bug-1332627/+merge/226628
--
https://code.launchpad.net/~widelands-dev/widelands/bug-13
On second thought, that cannot really explain linker errors. If you still have
them after a make clean please open a bug report and we'll investigate.
--
https://code.launchpad.net/~widelands-dev/widelands/bug-1332627/+merge/226628
Your team Widelands Developers is subscribed to branch
lp:~widel
Awesome! Merged. I tweaked the codecheck rule and fixed the remaining
boost::noncopyable. The linking error probably came from not fixing the
dependencies in the CMakeLists.txt files. make codecheck lists those.
--
https://code.launchpad.net/~widelands-dev/widelands/bug-1332627/+merge/226628
Yo
The proposal to merge lp:~widelands-dev/widelands/skeletons2seashells into
lp:widelands has been updated.
Status: Needs review => Merged
For more details, see:
https://code.launchpad.net/~widelands-dev/widelands/skeletons2seashells/+merge/226725
--
https://code.launchpad.net/~widelands-dev/
Review: Approve
hardly anything to complain about in this branch :P.
--
https://code.launchpad.net/~widelands-dev/widelands/skeletons2seashells/+merge/226725
Your team Widelands Developers is subscribed to branch
lp:~widelands-dev/widelands/skeletons2seashells.
_
src/wui/unique_window_handler.h creates a linking problem. so I reverted it.
All the rest are done. Please double-check the codecheck rule.
--
https://code.launchpad.net/~widelands-dev/widelands/bug-1332627/+merge/226628
Your team Widelands Developers is subscribed to branch
lp:~widelands-dev/wi
GunChleoc has proposed merging lp:~widelands-dev/widelands/skeletons2seashells
into lp:widelands.
Requested reviews:
Widelands Developers (widelands-dev)
For more details, see:
https://code.launchpad.net/~widelands-dev/widelands/skeletons2seashells/+merge/226725
Some small i18n stuff
--
http
OK, new branch:
https://code.launchpad.net/~widelands-dev/widelands/skeletons2seashells
Let's scrap this one.
--
https://code.launchpad.net/~widelands-dev/widelands/fix_world_names/+merge/226592
Your team Widelands Developers is subscribed to branch
lp:~widelands-dev/widelands/fix_world_names.
Now that things are running a bit better, I can post the complete error
messages. Here's the one I get with current trunk:
[ 69%] Building CXX object src/wui/CMakeFiles/wui.dir/mapviewpixelfunctions.cc.o
/usr/home/bsd/dev/widelands/src/wui/mapviewpixelfunctions.cc:114:16: error: use
of unde
No, changing the descname is fine and can be done without issues. I think this
is preferable to Teppos suggestion actually.
--
https://code.launchpad.net/~widelands-dev/widelands/fix_world_names/+merge/226592
Your team Widelands Developers is subscribed to branch
lp:~widelands-dev/widelands/fix_
TypeName() = default; should be here
ITransportCostCalculator() = default
And I was wrong in my first comment. It is needed when the copy constructor is
deleted.
--
https://code.launchpad.net/~widelands-dev/widelands/bug-1332627/+merge/226628
Your team Widelands Developers is subscribed to bran
The proposal to merge lp:~widelands-dev/widelands/rename_goldweaver into
lp:widelands has been updated.
Status: Needs review => Merged
For more details, see:
https://code.launchpad.net/~widelands-dev/widelands/rename_goldweaver/+merge/226580
--
https://code.launchpad.net/~widelands-dev/wide
Review: Approve
--
https://code.launchpad.net/~widelands-dev/widelands/rename_goldweaver/+merge/226580
Your team Widelands Developers is subscribed to branch
lp:~widelands-dev/widelands/rename_goldweaver.
___
Mailing list: https://launchpad.net/~wide
Review: Needs Fixing
Diff comments:
> === modified file 'src/base/i18n.cc'
> --- src/base/i18n.cc 2014-06-21 15:17:04 +
> +++ src/base/i18n.cc 2014-07-14 12:52:01 +
> @@ -19,6 +19,10 @@
>
> #include "base/i18n.h"
>
> +#ifdef __FreeBSD__
> +# include
> +#endif
> +
> #include
>
>First: FreeBSD is not a prority at all.
Hehe, I know. This was mainly an experiment to see whether things were still
working after the shift to more c++11, reorganizing the cmake build and similar
changes.
Thanks for the feedback, I've added a cast before calling std::abs now. I
feared I migh
Yes, I have grepped for "weaver", and also tested the Atlantean campaign.
We have broken the savegames recently with a whole bunch of these, so I think
one more can't hurt, as long as we do it before Build 19.
I have merged trunk, so the text conflict should be gone now.
--
https://code.launchp
I did the change to the macro.
struct ITransportCostCalculator {
virtual ~ITransportCostCalculator() {}
virtual int32_t calc_cost_estimate(Coords, Coords) const = 0;
DISALLOW_COPY_AND_ASSIGN(ITransportCostCalculator);
TypeName() = default;
};
results in:
[ 5%]
I had another idea: what will heppen if I change just the localization string,
e.g.
name = "skeleton4",
descname = _ "Seashell",
Will that cause problems?
--
https://code.launchpad.net/~widelands-dev/widelands/fix_world_names/+merge/226592
Your team Widelands Developers is subscribed to branch
If it's creating a problem, leave it - it is not that important.
I will add translator comments instead, so translators will know that it's a
seashell if they're paying attention.
--
https://code.launchpad.net/~widelands-dev/widelands/fix_world_names/+merge/226592
Your team Widelands Developers
OK, will do :)
--
https://code.launchpad.net/~widelands-dev/widelands/editor_tweaks/+merge/226606
Your team Widelands Developers is subscribed to branch
lp:~widelands-dev/widelands/editor_tweaks.
___
Mailing list: https://launchpad.net/~widelands-dev
P
39 matches
Mail list logo
