[Widelands-dev] [Merge] lp:~widelands-dev/widelands/appveyor_fix into lp:widelands
Continuous integration builds have changed state: Travis build 3881. State: passed. Details: https://travis-ci.org/widelands/widelands/builds/423709137. Appveyor build 3679. State: failed. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_appveyor_fix-3679. -- https://code.launchpad.net/~widelands-dev/widelands/appveyor_fix/+merge/354160 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/appveyor_fix 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/empire04_bug_fix_enhance into lp:widelands
seems good to go to me as well. -- https://code.launchpad.net/~widelands-dev/widelands/empire04_bug_fix_enhance/+merge/353742 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/empire04_bug_fix_enhance 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/appveyor_fix into lp:widelands
hessenfarmer has proposed merging lp:~widelands-dev/widelands/appveyor_fix into
lp:widelands.
Commit message:
I need an appveyor build to further debug this
Requested reviews:
Widelands Developers (widelands-dev)
For more details, see:
https://code.launchpad.net/~widelands-dev/widelands/appveyor_fix/+merge/354160
--
Your team Widelands Developers is requested to review the proposed merge of
lp:~widelands-dev/widelands/appveyor_fix into lp:widelands.
=== modified file 'src/graphic/gl/initialize.cc'
--- src/graphic/gl/initialize.cc 2018-08-28 07:53:33 +
+++ src/graphic/gl/initialize.cc 2018-09-02 20:46:28 +
@@ -48,26 +48,29 @@
SDL_GL_MakeCurrent(sdl_window, gl_context);
#ifdef USE_GLBINDING
- glbinding::Binding::initialize();
+ glbinding::Binding::initialize(nullptr, false);
// The undocumented command line argument --debug_gl_trace will set
// Trace::kYes. This will log every OpenGL call that is made, together with
// arguments, return values and glError status. This requires that Widelands
// is built using -DOPTION_USE_GLBINDING:BOOL=ON. It is a NoOp for GLEW.
+
if (trace == Trace::kYes) {
- setCallbackMaskExcept(
+ glbinding::setCallbackMaskExcept(
glbinding::CallbackMask::After | glbinding::CallbackMask::ParametersAndReturnValue,
{"glGetError"});
glbinding::setAfterCallback([](const glbinding::FunctionCall& call) {
log("%s(", call.function->name());
for (size_t i = 0; i < call.parameters.size(); ++i) {
-log("%s", call.parameters[i]->asString().c_str());
+// log("%s", call.parameters[i]->asString().c_str());
+log("%s", call.parameters[i].get());
if (i < call.parameters.size() - 1)
log(", ");
}
log(")");
if (call.returnValue) {
-log(" -> %s", call.returnValue->asString().c_str());
+// log(" -> %s", call.returnValue->asString().c_str());
+log(" -> %s", call.returnValue.get());
}
const auto error = glGetError();
log(" [%s]\n", gl_error_to_string(error));
@@ -84,9 +87,6 @@
// See graphic/gl/system_headers.h for an explanation of the next line.
glewExperimental = GL_TRUE;
GLenum err = glewInit();
- // LeakSanitizer reports a memory leak which is triggered somewhere above this line, probably
- // coming from the gaphics drivers
-
if (err != GLEW_OK) {
log("glewInit returns %i\nYour OpenGL installation must be __very__ broken. %s\n", err,
glewGetErrorString(err));
=== modified file 'src/graphic/gl/system_headers.h'
--- src/graphic/gl/system_headers.h 2018-04-07 16:59:00 +
+++ src/graphic/gl/system_headers.h 2018-09-02 20:46:28 +
@@ -36,7 +36,16 @@
#ifdef USE_GLBINDING
#include
+#include
+#include
+#include
#include
+
+#include
+#include
+#include
+#include
+#include
// This fakes that most other gl bindings define gl functions in the public namespace.
CLANG_DIAG_OFF("-Wheader-hygiene")
using namespace gl;
___
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/mines-worldsavior into lp:widelands
I already had a look at some of the changes made here. From my side it looks okay so far. Any particular I have to look at? -- https://code.launchpad.net/~widelands-dev/widelands/mines-worldsavior/+merge/350716 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/mines-worldsavior. ___ 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/rework-resource-indicators into lp:widelands
Code looks good to me - I have removed the iterators and pushed a commit. - Barbarian indicators are good. - Empire: I still have a bit of difficulty seeing the difference between no resources and stones. Maybe give them a bevel or something? Or give the marble a bit of color. The Arena's color might work better. - Atlanteans: I still can't see the indicators for stones on a grey mountain. They need brighter colors overall. Lay the borders on thick. - Frisians are good now -- https://code.launchpad.net/~widelands-dev/widelands/rework-resource-indicators/+merge/353996 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/rework-resource-indicators. ___ 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/frisian-buildings into lp:widelands
The proposal to merge lp:~widelands-dev/widelands/frisian-buildings into lp:widelands has been updated. Status: Needs review => Merged For more details, see: https://code.launchpad.net/~widelands-dev/widelands/frisian-buildings/+merge/354156 -- Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/frisian-buildings 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/frisian-buildings into lp:widelands
Another try. If this one isn´t good enough, then I´ll redesign the hq completely, similar to the photo. -- https://code.launchpad.net/~widelands-dev/widelands/frisian-buildings/+merge/354156 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/frisian-buildings 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/rework-resource-indicators into lp:widelands
OK, refactored the building help so it now queries the highest resi for the given resource from the given TribeDescr and uses its representative_image. The barbarian scenario also uses representative_image for each resi now instead of fixed image paths. There was no need to define an icon, as representative_image points to the first idle frame by default. -- https://code.launchpad.net/~widelands-dev/widelands/rework-resource-indicators/+merge/353996 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/rework-resource-indicators. ___ 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
