Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/fix_zip_filesystem into lp:widelands
Testers: This should be a refactoring only to make sure we are not broken by c++14 (which deprecates our inproper use of Copy construction in this case). No noticeable changes in behavior. -- https://code.launchpad.net/~widelands-dev/widelands/fix_zip_filesystem/+merge/282884 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/fix_zip_filesystem 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/fix_editor_transparency_issue into lp:widelands
SirVer has proposed merging
lp:~widelands-dev/widelands/fix_editor_transparency_issue into lp:widelands.
Commit message:
- Fix transparency issues with representative_image().
- Refactor RenderTarget::drawanim(rect) into blit_animation and make
RenderTarget no longer depend on logic/ code.
Requested reviews:
Widelands Developers (widelands-dev)
Related bugs:
Bug #1519361 in widelands: "PlayerColor in Building menu causes render errors"
https://bugs.launchpad.net/widelands/+bug/1519361
For more details, see:
https://code.launchpad.net/~widelands-dev/widelands/fix_editor_transparency_issue/+merge/282874
Fix transparency issues in the editor and some mild refactorings.
--
Your team Widelands Developers is requested to review the proposed merge of
lp:~widelands-dev/widelands/fix_editor_transparency_issue into lp:widelands.
=== modified file 'src/graphic/animation.cc'
--- src/graphic/animation.cc 2016-01-08 21:00:39 +
+++ src/graphic/animation.cc 2016-01-17 19:57:08 +
@@ -37,8 +37,6 @@
#include "graphic/surface.h"
#include "graphic/texture.h"
#include "io/filesystem/layered_filesystem.h"
-#include "logic/map_objects/bob.h"
-#include "logic/map_objects/map_object.h"
#include "scripting/lua_table.h"
#include "sound/sound_handler.h"
@@ -229,13 +227,11 @@
int h = image->height();
Texture* rv = new Texture(w, h);
-
- // Initialize the rectangle
- rv->fill_rect(Rect(Point(0, 0), w, h), RGBAColor(255, 255, 255, 0));
-
if (!hasplrclrs_ || clr == nullptr) {
- rv->blit(Rect(Point(0, 0), w, h), *image, Rect(Point(0, 0), w, h), 1., BlendMode::UseAlpha);
+ // No player color means we simply want an exact copy of the original image.
+ rv->blit(Rect(Point(0, 0), w, h), *image, Rect(Point(0, 0), w, h), 1., BlendMode::Copy);
} else {
+ rv->fill_rect(Rect(Point(0, 0), w, h), RGBAColor(0, 0, 0, 0));
rv->blit_blended(Rect(Point(0, 0), w, h), *image,
*g_gr->images().get(pc_mask_image_files_[0]), Rect(Point(0, 0), w, h), *clr);
}
=== modified file 'src/graphic/diranimations.h'
--- src/graphic/diranimations.h 2015-02-18 09:07:31 +
+++ src/graphic/diranimations.h 2016-01-17 19:57:08 +
@@ -26,8 +26,6 @@
#include "logic/widelands.h"
-namespace Widelands {struct MapObjectDescr;}
-
/// Manages a set of 6 animations, one for each possible direction.
struct DirAnimations {
DirAnimations
=== modified file 'src/graphic/game_renderer.cc'
--- src/graphic/game_renderer.cc 2016-01-10 11:36:05 +
+++ src/graphic/game_renderer.cc 2016-01-17 19:57:08 +
@@ -296,14 +296,14 @@
const Player & owner = egbase.player(owner_number[F]);
uint32_t const anim_idx = owner.tribe().frontier_animation();
if (vision[F])
- dst.drawanim(pos[F], anim_idx, 0, );
+ dst.blit_animation(pos[F], anim_idx, 0, owner.get_playercolor());
for (uint32_t d = 1; d < 4; ++d) {
if
((vision[F] || vision[d]) &&
isborder[d] &&
(owner_number[d] == owner_number[F] || !owner_number[d]))
{
- dst.drawanim(middle(pos[F], pos[d]), anim_idx, 0, );
+ dst.blit_animation(middle(pos[F], pos[d]), anim_idx, 0, owner.get_playercolor());
}
}
}
@@ -354,8 +354,8 @@
if (cur_frame) // not the first frame
// draw the prev frame from top to where next image will be drawing
- dst.drawanimrect
-(pos[F], anim_idx, tanim - FRAME_LENGTH, owner, Rect(Point(0, 0), w, h - lines));
+ dst.blit_animation(pos[F], anim_idx, tanim - FRAME_LENGTH,
+ owner->get_playercolor(), Rect(Point(0, 0), w, h - lines));
else if (csinf.was) {
// Is the first frame, but there was another building here before,
// get its last build picture and draw it instead.
@@ -365,11 +365,12 @@
} catch (MapObjectDescr::AnimationNonexistent &) {
a = csinf.was->get_animation("idle");
}
- dst.drawanimrect
-(pos[F], a, tanim - FRAME_LENGTH, owner, Rect(Point(0, 0), w, h - lines));
+ dst.blit_animation(pos[F], a, tanim - FRAME_LENGTH, owner->get_playercolor(),
+ Rect(Point(0, 0), w, h - lines));
}
assert(lines <= h);
- dst.drawanimrect(pos[F], anim_idx, tanim, owner, Rect(Point(0, h - lines), w, lines));
+ dst.blit_animation(pos[F], anim_idx, tanim, owner->get_playercolor(),
+ Rect(Point(0, h - lines), w, lines));
} else if (upcast(const BuildingDescr, building, map_object_descr)) {
// this is a building therefore we either draw unoccupied or idle animation
uint32_t pic;
@@ -378,11 +379,12 @@
} catch (MapObjectDescr::AnimationNonexistent &) {
pic = building->get_animation("idle");
}
- dst.drawanim(pos[F], pic, 0, owner);
+ dst.blit_animation(pos[F], pic, 0, owner->get_playercolor());
} else if (const uint32_t pic = map_object_descr->main_animation()) {
- dst.drawanim(pos[F], pic, 0, owner);
+
[Widelands-dev] Bunnybot says...
Hi, I am bunnybot (https://github.com/widelands/bunnybot). I am keeping the source branch lp:~widelands-dev/widelands/fix_editor_transparency_issue mirrored to https://github.com/widelands/widelands/tree/_widelands_dev_widelands_fix_editor_transparency_issue 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/fix_editor_transparency_issue/+merge/282874 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/fix_editor_transparency_issue 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/png_alternative_method into lp:widelands
kaputtnik, as always thanks for testing :) Tino, did you find a way to find the images with broken profile? If so, we could revert this branch and only fix the ones that are broken - this would not make this such a huge change for little gain (the size of most PNGs is < 1 block anyways, so shrinking them is not really beneficial). -- https://code.launchpad.net/~widelands-dev/widelands/png_alternative_method/+merge/282856 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/png_alternative_method. ___ 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_zip_filesystem into lp:widelands
The proposal to merge lp:~widelands-dev/widelands/fix_zip_filesystem into lp:widelands has been updated. Commit Message changed to: Use std::shared_ptr to properly share zip files between classes. ZipFilesystem, any child filesystems created by make_sub_file_system, and any ZipStream[Write|Read] created from such a filesystem access the same physical zip file and corresponding state. If one wrote while the other read, the outcome was undefined. This changes the code to move the zip file abstraction into a wrapper class that properly reopens files for the correct access. This also get's rid of the improper (and deprecated) use of the implicit copy constructor - the state was copied, but not properly shared before. For more details, see: https://code.launchpad.net/~widelands-dev/widelands/fix_zip_filesystem/+merge/282884 -- Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/fix_zip_filesystem 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/fix_zip_filesystem into lp:widelands
SirVer has proposed merging lp:~widelands-dev/widelands/fix_zip_filesystem into
lp:widelands.
Requested reviews:
Widelands Developers (widelands-dev)
For more details, see:
https://code.launchpad.net/~widelands-dev/widelands/fix_zip_filesystem/+merge/282884
Fix deprecated use of implicit copy constructor and the mess that ZipFilesystem
was in general.
--
Your team Widelands Developers is requested to review the proposed merge of
lp:~widelands-dev/widelands/fix_zip_filesystem into lp:widelands.
=== modified file 'src/io/filesystem/zip_filesystem.cc'
--- src/io/filesystem/zip_filesystem.cc 2015-10-25 15:44:36 +
+++ src/io/filesystem/zip_filesystem.cc 2016-01-17 21:52:36 +
@@ -35,28 +35,99 @@
#include "io/streamread.h"
#include "io/streamwrite.h"
+ZipFilesystem::ZipFile::ZipFile(const std::string& zipfile)
+ : state_(State::kIdle),
+ path_(zipfile),
+ basename_(fs_filename(zipfile.c_str())),
+ write_handle_(nullptr),
+ read_handle_(nullptr) {
+}
+
+ZipFilesystem::ZipFile::~ZipFile() {
+ close();
+}
+
+void ZipFilesystem::ZipFile::close() {
+ if (state_ == State::kZipping) {
+ zipClose(write_handle_, nullptr);
+ } else if (state_ == State::kUnzipping) {
+ unzClose(read_handle_);
+ }
+ state_ = State::kIdle;
+}
+
+void ZipFilesystem::ZipFile::open_for_zip() {
+ if (state_ == State::kZipping)
+ return;
+
+ close();
+
+ write_handle_ = zipOpen(path_.c_str(), APPEND_STATUS_ADDINZIP);
+ if (!write_handle_) {
+ // Couldn't open for append, so create new.
+ write_handle_ = zipOpen(path_.c_str(), APPEND_STATUS_CREATE);
+ }
+
+ state_ = State::kZipping;
+}
+
+void ZipFilesystem::ZipFile::open_for_unzip() {
+ if (state_ == State::kUnzipping)
+ return;
+
+ close();
+
+ read_handle_ = unzOpen(path_.c_str());
+ if (!read_handle_)
+ throw FileTypeError
+ ("ZipFilesystem::open_for_unzip", path_, "not a .zip file");
+ state_ = State::kUnzipping;
+}
+
+std::string ZipFilesystem::ZipFile::strip_basename(const std::string& filename) {
+ if (filename.compare(0, basename_.length(), basename_) == 0)
+ {
+ // filename contains the name of the zip file as first element. This means
+ // this is an old zip file where all data were in a directory named as the
+ // file inside the zip file.
+ // return the filename without the first element
+ return filename.substr(basename_.length() + 1);
+ }
+
+ // seems to be a new zipfile without directory or a old zipfile was renamed
+ if (*filename.begin() == '/')
+ return filename.substr(1);
+ return filename;
+}
+
+const zipFile& ZipFilesystem::ZipFile::write_handle() {
+ open_for_zip();
+ return write_handle_;
+}
+
+const unzFile& ZipFilesystem::ZipFile::read_handle() {
+ open_for_unzip();
+ return read_handle_;
+}
+
+const std::string& ZipFilesystem::ZipFile::path() const {
+ return path_;
+}
+
/**
* Initialize the real file-system
*/
-ZipFilesystem::ZipFilesystem(const std::string & zipfile)
-:
-m_state (STATE_IDLE),
-m_zipfile(nullptr),
-m_unzipfile (nullptr),
-m_oldzip (false),
-m_zipfilename(zipfile),
-m_basenamezip(fs_filename(zipfile.c_str())),
-m_basename ()
-{
+ZipFilesystem::ZipFilesystem(const std::string& zipfile)
+ : zip_file_(new ZipFile(zipfile)), basedir_in_zip_file_() {
// TODO(unknown): check OS permissions on whether the file is writable
}
-/**
- * Cleanup code
- */
-ZipFilesystem::~ZipFilesystem()
-{
- m_close();
+ZipFilesystem::ZipFilesystem(const std::shared_ptr& shared_data,
+ const std::string& basedir_in_zip_file)
+ : zip_file_(shared_data), basedir_in_zip_file_(basedir_in_zip_file) {
+}
+
+ZipFilesystem::~ZipFilesystem() {
}
/**
@@ -72,11 +143,9 @@
* cross-platform way of doing this
*/
std::set ZipFilesystem::list_directory(const std::string& path_in) {
- m_open_unzip();
-
assert(path_in.size()); // prevent invalid read below
- std::string path = m_basename;
+ std::string path = basedir_in_zip_file_;
if (*path_in.begin() != '/')
path += "/";
path += path_in;
@@ -85,18 +154,18 @@
if (*path.begin() == '/')
path = path.substr(1);
- unzCloseCurrentFile(m_unzipfile);
- unzGoToFirstFile(m_unzipfile);
+ unzCloseCurrentFile(zip_file_->read_handle());
+ unzGoToFirstFile(zip_file_->read_handle());
unz_file_info file_info;
char filename_inzip[256];
std::set results;
for (;;) {
unzGetCurrentFileInfo
- (m_unzipfile, _info, filename_inzip, sizeof(filename_inzip),
+ (zip_file_->read_handle(), _info, filename_inzip, sizeof(filename_inzip),
nullptr, 0, nullptr, 0);
- std::string complete_filename = strip_basename(filename_inzip);
+ std::string complete_filename = zip_file_->strip_basename(filename_inzip);
std::string filename = fs_filename(complete_filename.c_str());
std::string filepath =
complete_filename.substr
@@ -108,9 +177,9 @@
if
(('/' + path == filepath || path == filepath || path.length() == 1)
&& filename.size())
- results.insert(complete_filename.substr(m_basename.size()));
+
Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/png_alternative_method into lp:widelands
Review: Approve No, sorry. As a test, I've run "pngcrush -ow -rem allb -reduce" (compiled with gcc 5.3.0 and libpng 1.6.20) once more over all files does not change anything. BZR then only shows changes on the three files kaputtnik comitted last, but there is no visual difference. Still 1-4 occurences of the "libpng warning: iCCP: known incorrect sRGB profile" when i quit widelands. Perhaps some windows only issue, i think we can ignore safely. -- https://code.launchpad.net/~widelands-dev/widelands/png_alternative_method/+merge/282856 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/png_alternative_method. ___ 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/png_alternative_method into lp:widelands
> In favor of reverting the branch, i would just correct them by hand with gimp > :-) The problem is that we do not have a bullet proof way of figuring out which ones are broken. Do you know one? If so, go for it and fix the PNGs and we can drop this branch. > We should consider to remove images which are double. They needn't much > space, but are confusing, because without knowledge of the code one didn't > know which image is used what for. Just my opinion :-) I am all for this. Some images are doubled so that they could theoretically be changed in the future - it was just convenient to reuse a already existing image in some cases. -- https://code.launchpad.net/~widelands-dev/widelands/png_alternative_method/+merge/282856 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/png_alternative_method. ___ 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/fix_zip_filesystem mirrored to https://github.com/widelands/widelands/tree/_widelands_dev_widelands_fix_zip_filesystem 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/fix_zip_filesystem/+merge/282884 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/fix_zip_filesystem 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] Bunnybot says...
Travis build 293 has changed state to: passed. Details: https://travis-ci.org/widelands/widelands/builds/10397. -- https://code.launchpad.net/~widelands-dev/widelands/fix_editor_transparency_issue/+merge/282874 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/fix_editor_transparency_issue 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] Bunnybot says...
Travis build 295 has changed state to: passed. Details: https://travis-ci.org/widelands/widelands/builds/103019352. -- https://code.launchpad.net/~widelands-dev/widelands/fix_zip_filesystem/+merge/282884 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/fix_zip_filesystem 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
Thanks for testing everybody! Thanks for reviewing, Tibor. @bunnybot merge -- 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/png_alternative_method into lp:widelands
I cannot detect any visual regressions. Still getting one "libpng warning: iCCP: known incorrect sRGB profile" on exit. Any hint how to find the corresponding image? -- https://code.launchpad.net/~widelands-dev/widelands/png_alternative_method/+merge/282856 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/png_alternative_method 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/stricter_travis into lp:widelands
Review: Resubmit This grew a bit and needs another look. -- https://code.launchpad.net/~widelands-dev/widelands/stricter_travis/+merge/282852 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/stricter_travis. ___ 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/stricter_travis into lp:widelands
The proposal to merge lp:~widelands-dev/widelands/stricter_travis into lp:widelands has been updated. Commit Message changed to: - Change warnings around switches: GCC no longer complains if a switch has no default, clang complains if a switch that covers all cases has a default. - Introduces a NEVER_HERE() macro and get rid of assert(false) - Run regression test on travis after each build. Regression test now also output full stdout on error. - Make codecheck warnings critical errors for debug builds on travis. For more details, see: https://code.launchpad.net/~widelands-dev/widelands/stricter_travis/+merge/282852 -- Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/stricter_travis. ___ 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/stricter_travis into lp:widelands
It also fixed a real bug (removes wrong assert). -- https://code.launchpad.net/~widelands-dev/widelands/stricter_travis/+merge/282852 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/stricter_travis. ___ 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/png_alternative_method into lp:widelands
add a log("## %s", filename.c_str()) in load_image() in image_io I guess.
--
https://code.launchpad.net/~widelands-dev/widelands/png_alternative_method/+merge/282856
Your team Widelands Developers is requested to review the proposed merge of
lp:~widelands-dev/widelands/png_alternative_method 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/use_image_cache into lp:widelands
The proposal to merge lp:~widelands-dev/widelands/use_image_cache into lp:widelands has been updated. Status: Needs review => Merged For more details, see: 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-website/iso_date_image_options into lp:widelands-website
Review: Resubmit Thanks GunChleoc, i have adjusted the . Browsers do mostly correct such misplaced things automatically, so it's not easy to verify this during testing... -- https://code.launchpad.net/~widelands-dev/widelands-website/iso_date_image_options/+merge/282653 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/png_alternative_method into lp:widelands
Some of the workarea pics have lost transparency. F.e. pics/workarea123.png which is used in the buildings menu. The indicator for small buildings in buildhelp is darker -> pics/small.png funnily enough pics/easy.png, which shows the same symbol, doesn't got darker. -- https://code.launchpad.net/~widelands-dev/widelands/png_alternative_method/+merge/282856 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/png_alternative_method 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/png_alternative_method into lp:widelands
Sorry the indicator for small buildings got not darker. Tino, i couldn't see such messages anymore, even after exit. Have you run the game with the "--datadir" option? I have fixed the workarea oics and pushed the changes into this branch. For now i couldn't find more wrong images. I want to make another test later. -- https://code.launchpad.net/~widelands-dev/widelands/png_alternative_method/+merge/282856 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/png_alternative_method 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/png_alternative_method into lp:widelands
Seems to be all ok. At least i haven't found any strange colored images in game or editor yet. May i haven't checked all images. Some are also difficult to compare with old status, because some images aren't shown correct also in former revisions. So this isn't a result of this change. I want to make some more tests before approving. -- https://code.launchpad.net/~widelands-dev/widelands/png_alternative_method/+merge/282856 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/png_alternative_method 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/png_alternative_method into lp:widelands
Review: Approve Seems now all is good :-) -- https://code.launchpad.net/~widelands-dev/widelands/png_alternative_method/+merge/282856 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/png_alternative_method. ___ 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
