Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/full_texture_atlas into lp:widelands
I will try to look at the code shoonish. Regarding a feature freeze, there are 2 things that still need doing on my end: 1. Font renderer switchover: We have 1 wordwrap bug that needs fixing (https://bugs.launchpad.net/widelands/+bug/1530723), and after it has been fixed, I need to merge https://code.launchpad.net/~widelands-dev/widelands/multiline_textarea to speed up text rendering again. Then it will be just bug fixing. 2. Savegame compatibility is not done. We need to fix that up, because we want to keep compatibility again starting from builg 19 - we need to identify the packages that we can ignore with map loading and not load them (implement https://bugs.launchpad.net/widelands/+bug/1531463 and scrap https://code.launchpad.net/~widelands-dev/widelands/map_compatibility/+merge/276088). I would also like the editor help in. It's not 100% slick (e.g. no resources help yet), but it does already contain some very valuable information and shouldn't introduce new bugs https://code.launchpad.net/~widelands-dev/widelands/editor_help -- https://code.launchpad.net/~widelands-dev/widelands/full_texture_atlas/+merge/281909 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/full_texture_atlas 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/use_image_cache into lp:widelands
I have a VMWare VM, so I could eventually test it. I want to review the prerequisite branch first though (the VM makes my whole machine slow when linking...) -- https://code.launchpad.net/~widelands-dev/widelands/use_image_cache/+merge/282106 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/full_texture_atlas. ___ 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/full_texture_atlas into lp:widelands
My understanding of feature freeze is that we will finish all opened work (f.e. branches waiting for merges, or ones that are really follow ups of what is opened now) but no brand new and unrelated changes/improvements will be started. F.e. I am not going to make any changes to AI, there is only one branch waiting for merge review, this is what to be nice to have merged before release... -- https://code.launchpad.net/~widelands-dev/widelands/full_texture_atlas/+merge/281909 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/full_texture_atlas 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/use_image_cache into lp:widelands
AFAIK VirtualBox is bit worse in regard to 3D acceleration, but testing in VMWare is also very usefull -- https://code.launchpad.net/~widelands-dev/widelands/use_image_cache/+merge/282106 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/full_texture_atlas. ___ 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/full_texture_atlas into lp:widelands
Review: Approve
Some small nits, otherwise LGTM
Diff comments:
>
> === modified file 'src/graphic/make_texture_atlas_main.cc'
> --- src/graphic/make_texture_atlas_main.cc2016-01-04 20:54:08 +
> +++ src/graphic/make_texture_atlas_main.cc2016-01-07 22:08:20 +
> @@ -62,11 +88,121 @@
> g_gr = new Graphic(1, 1, false);
> }
>
> +// Returns true if 'filename' is ends with a image extension.
Typos:
// Returns true if 'filename' ends with an image extension.
> +bool is_image(const std::string& filename) {
> + return boost::ends_with(filename, ".png") || boost::ends_with(filename,
> ".jpg");
> +}
> +
> +// Recursively adds all images in 'directory' to 'ordered_images' and
> +// 'handled_images' for which 'predicate' returns true. We keep track of the
> +// images twice because we want to make sure that some end up in the same
> +// (first) texture atlas, so we add them first and we use the set to know
> that
> +// we already added an image.
> +void find_images(const std::string& directory,
> + std::unordered_set* images,
> + std::vector* ordered_images) {
> + for (const std::string& filename : g_fs->list_directory(directory)) {
> + if (g_fs->is_directory(filename)) {
> + find_images(filename, images, ordered_images);
> + continue;
> + }
> + if (is_image(filename) && !images->count(filename)) {
> + images->insert(filename);
> + ordered_images->push_back(filename);
> + }
> + }
> +}
> +
> +void dump_result(const std::map& pack_info,
> + std::vector>* texture_atlases,
> + FileSystem* fs) {
> +
> + for (size_t i = 0; i < texture_atlases->size(); ++i) {
> + std::unique_ptr sw(
> +fs->open_stream_write((boost::format("output_%02i.png") %
> i).str()));
> + save_to_png(texture_atlases->at(i).get(), sw.get(),
> ColorType::RGBA);
> + }
> +
> + {
> + std::unique_ptr
> sw(fs->open_stream_write("output.lua"));
> + sw->text("return {\n");
> + for (const auto& pair : pack_info) {
> + sw->text(" [\"");
> + sw->text(pair.first);
> + sw->text("\"] = {\n");
> +
> + switch (pair.second.type) {
> + case PackInfo::Type::kPacked:
> + sw->text(" type = \"packed\",\n");
> + sw->text(
> +(boost::format(" texture_atlas =
> %d,\n") % pair.second.texture_atlas).str());
> + sw->text((boost::format(" rect = { %d,
> %d, %d, %d },\n") % pair.second.rect.x %
> + pair.second.rect.y %
> pair.second.rect.w % pair.second.rect.h).str());
> + break;
> +
> + case PackInfo::Type::kUnpacked:
> + sw->text(" type = \"unpacked\",\n");
> + break;
> + }
> + sw->text(" },\n");
> + }
> + sw->text("}\n");
> + }
> +}
> +
> +// Pack the images in 'filenames' into texture atlases.
> +std::vector> pack_images(const
> std::vector& filenames,
> + const int max_size,
> + std::map PackInfo>* pack_info,
> + Texture* first_texture,
> +
>
> TextureAtlas::PackedTexture* first_atlas_packed_texture) {
> + std::vector>>
> to_be_packed;
> + for (const auto& filename : filenames) {
> + std::unique_ptr image = load_image(filename, g_fs);
> + const auto area = image->width() * image->height();
> + if (area < kMaxAreaForTextureAtlas) {
> + to_be_packed.push_back(std::make_pair(filename,
> std::move(image)));
> + } else {
> + pack_info->insert(std::make_pair(filename, PackInfo{
> +
> PackInfo::Type::kUnpacked, 0, Rect(),
> +}));
> + }
> + }
> +
> + TextureAtlas atlas;
> + int packed_texture_index = 0;
> + if (first_texture != nullptr) {
> + atlas.add(*first_texture);
> + packed_texture_index = 1;
> + }
> + for (auto& pair : to_be_packed) {
> + atlas.add(*pair.second);
> + }
> +
> + std::vector> texture_atlases;
> + std::vector packed_textures;
> + atlas.pack(max_size, &texture_atlases, &packed_textures);
> +
> + if (first_texture !
Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/ai_ship_tweaks into lp:widelands
Is this branch ready for review, or are you still playing with it? -- https://code.launchpad.net/~widelands-dev/widelands/ai_ship_tweaks/+merge/280192 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/ai_ship_tweaks. ___ 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/table_align into lp:widelands
@bunnybot merge -- https://code.launchpad.net/~widelands-dev/widelands/table_align/+merge/279685 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/table_align. ___ 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/table_align into lp:widelands
The proposal to merge lp:~widelands-dev/widelands/table_align into lp:widelands has been updated. Status: Needs review => Merged For more details, see: https://code.launchpad.net/~widelands-dev/widelands/table_align/+merge/279685 -- Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/table_align. ___ 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] [Build #8833225] amd64 build of widelands 1:18-ppa0-bzr7699-201601111817~ubuntu14.04.1 in ubuntu trusty RELEASE [~widelands-dev/ubuntu/widelands-daily]
* Source Package: widelands * Version: 1:18-ppa0-bzr7699-20160817~ubuntu14.04.1 * Architecture: amd64 * Archive: ~widelands-dev/ubuntu/widelands-daily * Component: main * State: Failed to build * Duration: 17 minutes * Build Log: https://launchpad.net/~widelands-dev/+archive/ubuntu/widelands-daily/+build/8833225/+files/buildlog_ubuntu-trusty-amd64.widelands_1%3A18-ppa0-bzr7699-20160817~ubuntu14.04.1_BUILDING.txt.gz * Builder: https://launchpad.net/builders/lcy01-28 * Source: not available If you want further information about this situation, feel free to contact a member of the Launchpad Buildd Administrators team. -- amd64 build of widelands 1:18-ppa0-bzr7699-20160817~ubuntu14.04.1 in ubuntu trusty RELEASE https://launchpad.net/~widelands-dev/+archive/ubuntu/widelands-daily/+build/8833225 You are receiving this email because you created this version of this package. ___ 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] [Build #8833226] i386 build of widelands 1:18-ppa0-bzr7699-201601111817~ubuntu14.04.1 in ubuntu trusty RELEASE [~widelands-dev/ubuntu/widelands-daily]
* Source Package: widelands * Version: 1:18-ppa0-bzr7699-20160817~ubuntu14.04.1 * Architecture: i386 * Archive: ~widelands-dev/ubuntu/widelands-daily * Component: main * State: Failed to build * Duration: 17 minutes * Build Log: https://launchpad.net/~widelands-dev/+archive/ubuntu/widelands-daily/+build/8833226/+files/buildlog_ubuntu-trusty-i386.widelands_1%3A18-ppa0-bzr7699-20160817~ubuntu14.04.1_BUILDING.txt.gz * Builder: https://launchpad.net/builders/lgw01-03 * Source: not available If you want further information about this situation, feel free to contact a member of the Launchpad Buildd Administrators team. -- i386 build of widelands 1:18-ppa0-bzr7699-20160817~ubuntu14.04.1 in ubuntu trusty RELEASE https://launchpad.net/~widelands-dev/+archive/ubuntu/widelands-daily/+build/8833226 You are receiving this email because you created this version of this package. ___ 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] [Build #8833282] i386 build of widelands 1:18-ppa0-bzr7699-201601111818~ubuntu16.04.1 in ubuntu xenial RELEASE [~widelands-dev/ubuntu/widelands-daily]
* Source Package: widelands * Version: 1:18-ppa0-bzr7699-20160818~ubuntu16.04.1 * Architecture: i386 * Archive: ~widelands-dev/ubuntu/widelands-daily * Component: main * State: Failed to build * Duration: 17 minutes * Build Log: https://launchpad.net/~widelands-dev/+archive/ubuntu/widelands-daily/+build/8833282/+files/buildlog_ubuntu-xenial-i386.widelands_1%3A18-ppa0-bzr7699-20160818~ubuntu16.04.1_BUILDING.txt.gz * Builder: https://launchpad.net/builders/lcy01-14 * Source: not available If you want further information about this situation, feel free to contact a member of the Launchpad Buildd Administrators team. -- i386 build of widelands 1:18-ppa0-bzr7699-20160818~ubuntu16.04.1 in ubuntu xenial RELEASE https://launchpad.net/~widelands-dev/+archive/ubuntu/widelands-daily/+build/8833282 You are receiving this email because you created this version of this package. ___ 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] [Build #8833241] i386 build of widelands 1:18-ppa0-bzr7699-201601111817~ubuntu15.10.1 in ubuntu wily RELEASE [~widelands-dev/ubuntu/widelands-daily]
* Source Package: widelands * Version: 1:18-ppa0-bzr7699-20160817~ubuntu15.10.1 * Architecture: i386 * Archive: ~widelands-dev/ubuntu/widelands-daily * Component: main * State: Failed to build * Duration: 22 minutes * Build Log: https://launchpad.net/~widelands-dev/+archive/ubuntu/widelands-daily/+build/8833241/+files/buildlog_ubuntu-wily-i386.widelands_1%3A18-ppa0-bzr7699-20160817~ubuntu15.10.1_BUILDING.txt.gz * Builder: https://launchpad.net/builders/lcy01-22 * Source: not available If you want further information about this situation, feel free to contact a member of the Launchpad Buildd Administrators team. -- i386 build of widelands 1:18-ppa0-bzr7699-20160817~ubuntu15.10.1 in ubuntu wily RELEASE https://launchpad.net/~widelands-dev/+archive/ubuntu/widelands-daily/+build/8833241 You are receiving this email because you created this version of this package. ___ 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/ai_ship_tweaks into lp:widelands
Of course, it is ready and waiting for review... -- https://code.launchpad.net/~widelands-dev/widelands/ai_ship_tweaks/+merge/280192 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/ai_ship_tweaks. ___ 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] [Build #8833239] i386 build of widelands 1:18-ppa0-bzr7699-201601111817~ubuntu15.04.1 in ubuntu vivid RELEASE [~widelands-dev/ubuntu/widelands-daily]
* Source Package: widelands * Version: 1:18-ppa0-bzr7699-20160817~ubuntu15.04.1 * Architecture: i386 * Archive: ~widelands-dev/ubuntu/widelands-daily * Component: main * State: Failed to build * Duration: 23 minutes * Build Log: https://launchpad.net/~widelands-dev/+archive/ubuntu/widelands-daily/+build/8833239/+files/buildlog_ubuntu-vivid-i386.widelands_1%3A18-ppa0-bzr7699-20160817~ubuntu15.04.1_BUILDING.txt.gz * Builder: https://launchpad.net/builders/lcy01-34 * Source: not available If you want further information about this situation, feel free to contact a member of the Launchpad Buildd Administrators team. -- i386 build of widelands 1:18-ppa0-bzr7699-20160817~ubuntu15.04.1 in ubuntu vivid RELEASE https://launchpad.net/~widelands-dev/+archive/ubuntu/widelands-daily/+build/8833239 You are receiving this email because you created this version of this package. ___ 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] [Build #8833240] amd64 build of widelands 1:18-ppa0-bzr7699-201601111817~ubuntu15.10.1 in ubuntu wily RELEASE [~widelands-dev/ubuntu/widelands-daily]
* Source Package: widelands * Version: 1:18-ppa0-bzr7699-20160817~ubuntu15.10.1 * Architecture: amd64 * Archive: ~widelands-dev/ubuntu/widelands-daily * Component: main * State: Failed to build * Duration: 23 minutes * Build Log: https://launchpad.net/~widelands-dev/+archive/ubuntu/widelands-daily/+build/8833240/+files/buildlog_ubuntu-wily-amd64.widelands_1%3A18-ppa0-bzr7699-20160817~ubuntu15.10.1_BUILDING.txt.gz * Builder: https://launchpad.net/builders/lcy01-20 * Source: not available If you want further information about this situation, feel free to contact a member of the Launchpad Buildd Administrators team. -- amd64 build of widelands 1:18-ppa0-bzr7699-20160817~ubuntu15.10.1 in ubuntu wily RELEASE https://launchpad.net/~widelands-dev/+archive/ubuntu/widelands-daily/+build/8833240 You are receiving this email because you created this version of this package. ___ 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_clang into lp:widelands
works like a charm. gonna merge this as it only affects travis. @bunnybot merge -- https://code.launchpad.net/~widelands-dev/widelands/travis_clang/+merge/282123 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/travis_clang 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] [Build #8833281] amd64 build of widelands 1:18-ppa0-bzr7699-201601111818~ubuntu16.04.1 in ubuntu xenial RELEASE [~widelands-dev/ubuntu/widelands-daily]
* Source Package: widelands * Version: 1:18-ppa0-bzr7699-20160818~ubuntu16.04.1 * Architecture: amd64 * Archive: ~widelands-dev/ubuntu/widelands-daily * Component: main * State: Failed to build * Duration: 35 minutes * Build Log: https://launchpad.net/~widelands-dev/+archive/ubuntu/widelands-daily/+build/8833281/+files/buildlog_ubuntu-xenial-amd64.widelands_1%3A18-ppa0-bzr7699-20160818~ubuntu16.04.1_BUILDING.txt.gz * Builder: https://launchpad.net/builders/lgw01-59 * Source: not available If you want further information about this situation, feel free to contact a member of the Launchpad Buildd Administrators team. -- amd64 build of widelands 1:18-ppa0-bzr7699-20160818~ubuntu16.04.1 in ubuntu xenial RELEASE https://launchpad.net/~widelands-dev/+archive/ubuntu/widelands-daily/+build/8833281 You are receiving this email because you created this version of this package. ___ 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] [Build #8833238] amd64 build of widelands 1:18-ppa0-bzr7699-201601111817~ubuntu15.04.1 in ubuntu vivid RELEASE [~widelands-dev/ubuntu/widelands-daily]
* Source Package: widelands * Version: 1:18-ppa0-bzr7699-20160817~ubuntu15.04.1 * Architecture: amd64 * Archive: ~widelands-dev/ubuntu/widelands-daily * Component: main * State: Failed to build * Duration: 36 minutes * Build Log: https://launchpad.net/~widelands-dev/+archive/ubuntu/widelands-daily/+build/8833238/+files/buildlog_ubuntu-vivid-amd64.widelands_1%3A18-ppa0-bzr7699-20160817~ubuntu15.04.1_BUILDING.txt.gz * Builder: https://launchpad.net/builders/lgw01-58 * Source: not available If you want further information about this situation, feel free to contact a member of the Launchpad Buildd Administrators team. -- amd64 build of widelands 1:18-ppa0-bzr7699-20160817~ubuntu15.04.1 in ubuntu vivid RELEASE https://launchpad.net/~widelands-dev/+archive/ubuntu/widelands-daily/+build/8833238 You are receiving this email because you created this version of this package. ___ 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_clang into lp:widelands
The proposal to merge lp:~widelands-dev/widelands/travis_clang into lp:widelands has been updated. Status: Needs review => Merged For more details, see: https://code.launchpad.net/~widelands-dev/widelands/travis_clang/+merge/282123 -- Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/travis_clang 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/error_shadow into lp:widelands
SirVer has proposed merging lp:~widelands-dev/widelands/error_shadow into lp:widelands. Requested reviews: Widelands Developers (widelands-dev) For more details, see: https://code.launchpad.net/~widelands-dev/widelands/error_shadow/+merge/282225 I introduced a couple of warnings in my recent branches that are only there for GCC. With the recent travis changes and turning them into errors, bunnybot/travis will catch these in the future once this branch is merged. I am awaiting bunnybots reply and see if there are currently errors in code. -- Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/error_shadow into lp:widelands. === modified file 'CMakeLists.txt' --- CMakeLists.txt 2016-01-05 10:35:13 + +++ CMakeLists.txt 2016-01-11 20:22:14 + @@ -157,7 +157,6 @@ wl_add_flag(WL_COMPILE_DIAGNOSTICS "-Wpacked") wl_add_flag(WL_COMPILE_DIAGNOSTICS "-Wpointer-arith") wl_add_flag(WL_COMPILE_DIAGNOSTICS "-Wredundant-decls") - wl_add_flag(WL_COMPILE_DIAGNOSTICS "-Wshadow") wl_add_flag(WL_COMPILE_DIAGNOSTICS "-Wsign-promo") wl_add_flag(WL_COMPILE_DIAGNOSTICS "-Wswitch-default") wl_add_flag(WL_COMPILE_DIAGNOSTICS "-Wsync-nand") @@ -170,6 +169,7 @@ # Turn some warnings into errors. wl_add_flag(WL_COMPILE_DIAGNOSTICS "-Werror=uninitialized") wl_add_flag(WL_COMPILE_DIAGNOSTICS "-Werror=return-type") +wl_add_flag(WL_COMPILE_DIAGNOSTICS "-Werror=shadow") IF (WIN32) ___ 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/error_shadow into lp:widelands
The proposal to merge lp:~widelands-dev/widelands/error_shadow into lp:widelands has been updated. Commit Message changed to: Change -Wshadow into a compile error. For more details, see: https://code.launchpad.net/~widelands-dev/widelands/error_shadow/+merge/282225 -- Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/error_shadow 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/error_shadow into lp:widelands
The proposal to merge lp:~widelands-dev/widelands/error_shadow into lp:widelands has been updated. Commit Message changed to: Change -Wshadow into a compile error. Run with make -k on travis to get as many errors as possible from each failing run. For more details, see: https://code.launchpad.net/~widelands-dev/widelands/error_shadow/+merge/282225 -- Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/error_shadow 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/error_shadow into lp:widelands
Review: Approve LGTM -- https://code.launchpad.net/~widelands-dev/widelands/error_shadow/+merge/282225 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/error_shadow. ___ 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/use_image_cache into lp:widelands
I will look into running with a minimal texture atlas through a commandline option and profile how much performance that cost on my system. Probably not before the weekend though. In the meantime, more testing with virtual machines would be great! -- https://code.launchpad.net/~widelands-dev/widelands/use_image_cache/+merge/282106 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/full_texture_atlas. ___ 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/split_overlay_manager into lp:widelands
cool, thanks. @bunnybot merge -- https://code.launchpad.net/~widelands-dev/widelands/split_overlay_manager/+merge/282112 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/split_overlay_manager. ___ 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] Bunnybot says...
Hi, I am bunnybot (https://github.com/widelands/bunnybot). I am keeping the source branch lp:~widelands-dev/widelands/error_shadow mirrored to https://github.com/widelands/widelands/tree/_widelands_dev_widelands_error_shadow You can give me commands by starting a line with @bunnybot . I understand: merge: Merges the source branch into the target branch, closing the merge proposal. I will use the proposed commit message if it is set. -- https://code.launchpad.net/~widelands-dev/widelands/error_shadow/+merge/282225 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/error_shadow. ___ 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/split_overlay_manager into lp:widelands
The proposal to merge lp:~widelands-dev/widelands/split_overlay_manager into lp:widelands has been updated. Status: Needs review => Merged For more details, see: https://code.launchpad.net/~widelands-dev/widelands/split_overlay_manager/+merge/282112 -- Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/split_overlay_manager. ___ 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] Bunnybot says...
Travis build 251 has changed state to: failed. Details: https://travis-ci.org/widelands/widelands/builds/101708331. -- https://code.launchpad.net/~widelands-dev/widelands/error_shadow/+merge/282225 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/error_shadow. ___ 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-website/copyrightyear_and_links into lp:widelands-website
The proposal to merge lp:~widelands-dev/widelands-website/copyrightyear_and_links into lp:widelands-website has been updated. Status: Needs review => Merged For more details, see: https://code.launchpad.net/~widelands-dev/widelands-website/copyrightyear_and_links/+merge/281450 -- 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-website/copyrightyear_and_links into lp:widelands-website
Great! merged and deployed. thanks :) kaputtnik, would you be willing and interested in learning how to deploy/merge on the server so that I am no longer the single point of failure? -- https://code.launchpad.net/~widelands-dev/widelands-website/copyrightyear_and_links/+merge/281450 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
