[Widelands-dev] [Merge] lp:~widelands-dev/widelands/speedup_saveloading into lp:widelands
The proposal to merge lp:~widelands-dev/widelands/speedup_saveloading into lp:widelands has been updated. Commit message changed to: Tweak performance for saveloading and introduce an optional "init" function for winconditions with costly calculations - Affected win conditions: Artifacts, Wood Gnome, Territorial Time, Territorial Lord. - Saveload long lists of fields via C++ because Lua persistence is very expensive - Use map index for iteration when writing - Clean up writing CmdFlagAction - Bulk skip all commands with greater duetime when writing command queue packet For more details, see: https://code.launchpad.net/~widelands-dev/widelands/speedup_saveloading/+merge/364205 -- Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/speedup_saveloading. ___ 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/speedup_saveloading into lp:widelands
The only change that could possibly make it slower are the changes to the map resources packet, so I have reverted that. The important speed up is for the win conditions. All the other changes are omitting data, and the extra boolean comparisons should be a lot faster than writing to / reading from disk. Have you made more than one test run? The numbers are not that radically different. -- https://code.launchpad.net/~widelands-dev/widelands/speedup_saveloading/+merge/364205 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/speedup_saveloading. ___ 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/speedup_saveloading into lp:widelands
Well I'd say these numbers are within the margin of error. If you compare saving and loading times, you can see the difference this branch makes, though. @GunChleoc not sure if r9015 was necessary. I don't really see a difference. -- https://code.launchpad.net/~widelands-dev/widelands/speedup_saveloading/+merge/364205 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/speedup_saveloading. ___ 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/recalculate_seafaring_performance into lp:widelands
GunChleoc has proposed merging
lp:~widelands-dev/widelands/recalculate_seafaring_performance into lp:widelands.
Commit message:
Skip recalculate_allows_seafaring more often when setting/unsetting port spaces
via Lua
Requested reviews:
Widelands Developers (widelands-dev)
For more details, see:
https://code.launchpad.net/~widelands-dev/widelands/recalculate_seafaring_performance/+merge/364235
A small performance tweak for Build 21.
- When adding a port space and seafaring is already allowed, no need to check
it again.
- When removing a port space and seafaring is already disallowed, no need to
check it again.
--
Your team Widelands Developers is requested to review the proposed merge of
lp:~widelands-dev/widelands/recalculate_seafaring_performance into lp:widelands.
=== modified file 'src/logic/map.cc'
--- src/logic/map.cc 2019-03-02 09:31:11 +
+++ src/logic/map.cc 2019-03-11 07:49:11 +
@@ -1434,8 +1434,10 @@
success = force || is_port_space_allowed(world, get_fcoords(c));
if (success) {
port_spaces_.insert(c);
+ recalculate_seafaring &= !allows_seafaring();
}
} else {
+ recalculate_seafaring &= allows_seafaring();
port_spaces_.erase(c);
success = true;
}
___
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/speedup_saveloading into lp:widelands
It didn't gain us that much anyway, so better safe than sorry this close to the release. The big think here was removing the field lists from Lua ;) -- https://code.launchpad.net/~widelands-dev/widelands/speedup_saveloading/+merge/364205 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/speedup_saveloading. ___ 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/speedup_saveloading into lp:widelands
Sound sane :-) are you planning to add them for b21? -- https://code.launchpad.net/~widelands-dev/widelands/speedup_saveloading/+merge/364205 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/speedup_saveloading. ___ 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/speedup_saveloading into lp:widelands
Continuous integration builds have changed state: Travis build 4580. State: failed. Details: https://travis-ci.org/widelands/widelands/builds/504553847. Appveyor build 4367. State: failed. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_speedup_saveloading-4367. -- https://code.launchpad.net/~widelands-dev/widelands/speedup_saveloading/+merge/364205 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/speedup_saveloading. ___ 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/speedup_saveloading into lp:widelands
Refusing to merge, since Travis is not green. Use @bunnybot merge force for merging anyways. Travis build 4580. State: failed. Details: https://travis-ci.org/widelands/widelands/builds/504553847. -- https://code.launchpad.net/~widelands-dev/widelands/speedup_saveloading/+merge/364205 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/speedup_saveloading. ___ 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/speedup_saveloading into lp:widelands
Travis hiccup while downloading brew bottles. @bunnybot merge force -- https://code.launchpad.net/~widelands-dev/widelands/speedup_saveloading/+merge/364205 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/speedup_saveloading. ___ 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/speedup_saveloading into lp:widelands
The proposal to merge lp:~widelands-dev/widelands/speedup_saveloading into lp:widelands has been updated. Status: Needs review => Merged For more details, see: https://code.launchpad.net/~widelands-dev/widelands/speedup_saveloading/+merge/364205 -- Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/speedup_saveloading. ___ 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/speedup_saveloading into lp:widelands
I guess we could. -- https://code.launchpad.net/~widelands-dev/widelands/speedup_saveloading/+merge/364205 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/speedup_saveloading. ___ 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/recalculate_seafaring_performance into lp:widelands
Continuous integration builds have changed state: Travis build 4581. State: errored. Details: https://travis-ci.org/widelands/widelands/builds/504572315. Appveyor build 4368. State: failed. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_recalculate_seafaring_performance-4368. -- https://code.launchpad.net/~widelands-dev/widelands/recalculate_seafaring_performance/+merge/364235 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/recalculate_seafaring_performance 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:~nordfriese/widelands/workareas into lp:widelands
Benedikt Straub has proposed merging lp:~nordfriese/widelands/workareas into
lp:widelands.
Commit message:
Show the work areas of buildings as overlays on triangles
Requested reviews:
Widelands Developers (widelands-dev)
Related bugs:
Bug #1789712 in widelands: "Change buildhelp overlays"
https://bugs.launchpad.net/widelands/+bug/1789712
For more details, see:
https://code.launchpad.net/~nordfriese/widelands/workareas/+merge/364266
--
Your team Widelands Developers is requested to review the proposed merge of
lp:~nordfriese/widelands/workareas into lp:widelands.
=== renamed file 'data/images/wui/overlays/workarea123.png' => 'data/images/wui/buildings/toggle_workarea.png'
=== added file 'data/images/wui/overlays/grid_marker.png'
Binary files data/images/wui/overlays/grid_marker.png 1970-01-01 00:00:00 + and data/images/wui/overlays/grid_marker.png 2019-03-11 16:44:08 + differ
=== removed file 'data/images/wui/overlays/workarea1.png'
Binary files data/images/wui/overlays/workarea1.png 2016-03-20 10:08:15 + and data/images/wui/overlays/workarea1.png 1970-01-01 00:00:00 + differ
=== removed file 'data/images/wui/overlays/workarea12.png'
Binary files data/images/wui/overlays/workarea12.png 2016-03-20 10:08:15 + and data/images/wui/overlays/workarea12.png 1970-01-01 00:00:00 + differ
=== removed file 'data/images/wui/overlays/workarea2.png'
Binary files data/images/wui/overlays/workarea2.png 2016-03-20 10:08:15 + and data/images/wui/overlays/workarea2.png 1970-01-01 00:00:00 + differ
=== removed file 'data/images/wui/overlays/workarea23.png'
Binary files data/images/wui/overlays/workarea23.png 2014-12-03 20:13:06 + and data/images/wui/overlays/workarea23.png 1970-01-01 00:00:00 + differ
=== removed file 'data/images/wui/overlays/workarea3.png'
Binary files data/images/wui/overlays/workarea3.png 2014-12-03 20:13:06 + and data/images/wui/overlays/workarea3.png 1970-01-01 00:00:00 + differ
=== added file 'data/shaders/workarea.fp'
--- data/shaders/workarea.fp 1970-01-01 00:00:00 +
+++ data/shaders/workarea.fp 2019-03-11 16:44:08 +
@@ -0,0 +1,7 @@
+#version 120
+
+varying vec4 var_overlay;
+
+void main() {
+ gl_FragColor = var_overlay;
+}
=== added file 'data/shaders/workarea.vp'
--- data/shaders/workarea.vp 1970-01-01 00:00:00 +
+++ data/shaders/workarea.vp 2019-03-11 16:44:08 +
@@ -0,0 +1,15 @@
+#version 120
+
+// Attributes.
+attribute vec2 attr_position;
+attribute vec4 attr_overlay;
+
+uniform float u_z_value;
+
+// Output of vertex shader.
+varying vec4 var_overlay;
+
+void main() {
+ var_overlay = attr_overlay;
+ gl_Position = vec4(attr_position, u_z_value, 1.);
+}
=== modified file 'src/editor/editorinteractive.cc'
--- src/editor/editorinteractive.cc 2019-02-27 17:19:00 +
+++ src/editor/editorinteractive.cc 2019-03-11 16:44:08 +
@@ -262,7 +262,7 @@
void EditorInteractive::draw(RenderTarget& dst) {
const auto& ebase = egbase();
- auto* fields_to_draw = map_view()->draw_terrain(ebase, &dst);
+ auto* fields_to_draw = map_view()->draw_terrain(ebase, Workareas(), &dst);
const float scale = 1.f / map_view()->view().zoom;
const uint32_t gametime = ebase.get_gametime();
=== modified file 'src/graphic/CMakeLists.txt'
--- src/graphic/CMakeLists.txt 2018-07-19 16:43:14 +
+++ src/graphic/CMakeLists.txt 2019-03-11 16:44:08 +
@@ -231,6 +231,8 @@
gl/terrain_program.h
gl/dither_program.cc
gl/dither_program.h
+gl/workarea_program.cc
+gl/workarea_program.h
DEPENDS
base_exceptions
base_geometry
=== modified file 'src/graphic/game_renderer.cc'
--- src/graphic/game_renderer.cc 2019-02-23 11:00:49 +
+++ src/graphic/game_renderer.cc 2019-03-11 16:44:08 +
@@ -59,6 +59,7 @@
void draw_terrain(const Widelands::EditorGameBase& egbase,
const FieldsToDraw& fields_to_draw,
const float scale,
+ Workareas workarea,
RenderTarget* dst) {
const Recti& bounding_rect = dst->get_rect();
const Surface& surface = dst->get_surface();
@@ -85,6 +86,16 @@
i.blend_mode = BlendMode::UseAlpha;
RenderQueue::instance().enqueue(i);
+ // Enqueue the drawing of the workarea overlay layer.
+ i.program_id = RenderQueue::Program::kTerrainWorkarea;
+ i.blend_mode = BlendMode::UseAlpha;
+ i.terrain_arguments.destination_rect =
+ Rectf(bounding_rect.x, surface_height - bounding_rect.y - bounding_rect.h, bounding_rect.w,
+ bounding_rect.h);
+ i.terrain_arguments.fields_to_draw = &fields_to_draw;
+ i.terrain_arguments.workareas = workarea;
+ RenderQueue::instance().enqueue(i);
+
// Enqueue the drawing of the road layer.
i.program_id = RenderQueue::Program::kTerrainRoad;
RenderQueue::instance().enqueue(i);
=== modified file 'src/graphic/game_renderer.h'
--- src/graphic/game_renderer.h 2019-02-23 11:00:49 +
+++ src/graphic/game_renderer.h 2019-03-11 16:44:08 +
@@ -33,6 +33,7 @@
void draw_terrain(const Widelands
Re: [Widelands-dev] [Merge] lp:~nordfriese/widelands/workareas into lp:widelands
A few nits in the comments
Diff comments:
>
> === added file 'src/graphic/gl/workarea_program.cc'
> --- src/graphic/gl/workarea_program.cc1970-01-01 00:00:00 +
> +++ src/graphic/gl/workarea_program.cc2019-03-11 16:44:08 +
> @@ -0,0 +1,139 @@
> +/*
> + * Copyright (C) 2006-2019 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 "graphic/gl/workarea_program.h"
> +
> +#include "graphic/gl/coordinate_conversion.h"
> +#include "graphic/gl/fields_to_draw.h"
> +#include "graphic/gl/utils.h"
> +#include "graphic/texture.h"
> +
> +// QuickRef:
> +// http://www.cs.unh.edu/~cs770/docs/glsl-1.20-quickref.pdf
> +// Full specification:
> +// http://www.opengl.org/registry/doc/GLSLangSpec.Full.1.20.8.pdf
> +// We target OpenGL 2.1 for the desktop here.
> +WorkareaProgram::WorkareaProgram() {
> + gl_program_.build("workarea");
> +
> + attr_position_ = glGetAttribLocation(gl_program_.object(),
> "attr_position");
> + attr_overlay_ = glGetAttribLocation(gl_program_.object(),
> "attr_overlay");
> +
> + u_z_value_ = glGetUniformLocation(gl_program_.object(), "u_z_value");
> +}
> +
> +void WorkareaProgram::gl_draw(int gl_texture, float z_value) {
> + glUseProgram(gl_program_.object());
> +
> + auto& gl_state = Gl::State::instance();
> + gl_state.enable_vertex_attrib_array(
> +{attr_position_, attr_overlay_});
> +
> + gl_array_buffer_.bind();
> + gl_array_buffer_.update(vertices_);
> +
> + Gl::vertex_attrib_pointer(
> +attr_position_, 2, sizeof(PerVertexData), offsetof(PerVertexData,
> gl_x));
> + Gl::vertex_attrib_pointer(
> +attr_overlay_, 4, sizeof(PerVertexData), offsetof(PerVertexData,
> overlay_r));
> +
> + gl_state.bind(GL_TEXTURE0, gl_texture);
> +
> + glUniform1f(u_z_value_, z_value);
> +
> + glDrawArrays(GL_TRIANGLES, 0, vertices_.size());
> +}
> +
> +#define WORKAREA_TRANSPARENCY 127
Please use a constexpr called kWorkareaTransparency
> +static RGBAColor workarea_colors[] {
> + RGBAColor(63, 31, 127, WORKAREA_TRANSPARENCY), // All three circles
> + RGBAColor(127, 63, 0, WORKAREA_TRANSPARENCY), // Medium and outer
> circle
> + RGBAColor(0, 127, 0, WORKAREA_TRANSPARENCY), // Outer circle
> + RGBAColor(63, 0, 127, WORKAREA_TRANSPARENCY), // Inner and medium
> circle
> + RGBAColor(127, 0, 0, WORKAREA_TRANSPARENCY), // Medium circle
> + RGBAColor(0, 0, 127, WORKAREA_TRANSPARENCY), // Inner circle
> +};
> +static inline RGBAColor apply_color(RGBAColor c1, RGBAColor c2) {
> + uint8_t r = (c1.r * c1.a + c2.r * c2.a) / (c1.a + c2.a);
> + uint8_t g = (c1.g * c1.a + c2.g * c2.a) / (c1.a + c2.a);
> + uint8_t b = (c1.b * c1.a + c2.b * c2.a) / (c1.a + c2.a);
> + uint8_t a = (c1.a + c2.a) / 2;
> + return RGBAColor(r, g, b, a);
> +}
> +
> +void WorkareaProgram::add_vertex(const FieldsToDraw::Field& field, RGBAColor
> overlay) {
> + vertices_.emplace_back();
> + PerVertexData& back = vertices_.back();
> +
> + back.gl_x = field.gl_position.x;
> + back.gl_y = field.gl_position.y;
> + back.overlay_r = overlay.r / 255.f;
> + back.overlay_g = overlay.g / 255.f;
> + back.overlay_b = overlay.b / 255.f;
> + back.overlay_a = overlay.a / 255.f;
> +}
> +
> +void WorkareaProgram::draw(uint32_t texture_id,
> +Workareas workarea,
> + const FieldsToDraw& fields_to_draw,
> + float z_value) {
> + vertices_.clear();
> + vertices_.reserve(fields_to_draw.size() * 3);
> +
> + for (size_t current_index = 0; current_index < fields_to_draw.size();
> ++current_index) {
> + const FieldsToDraw::Field& field =
> fields_to_draw.at(current_index);
> +
> + // The bottom right neighbor fields_to_draw is needed for both
> triangles
> + // associated with this field. If it is not in fields_to_draw,
> there is no need to
> + // draw any triangles.
> + if (field.brn_index == FieldsToDraw::kInvalidIndex) {
> + continue;
> + }
> +
> + // Down triangle.
> + if (field.bln_index != FieldsToDraw::kInvalidIndex) {
> +
Re: [Widelands-dev] [Merge] lp:~nordfriese/widelands/workareas into lp:widelands
I like it so far, the node markers are a little too thin, IMHO. Why not use the old workarea12.png or workarea1.png? They are small enough. -- https://code.launchpad.net/~nordfriese/widelands/workareas/+merge/364266 Your team Widelands Developers is requested to review the proposed merge of lp:~nordfriese/widelands/workareas 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/speedup_saveloading into lp:widelands
I did some more measurements on my slow machine, and the change in the resources packet didn't matter there. Let's keep it as it is, because the code is more readable. -- https://code.launchpad.net/~widelands-dev/widelands/speedup_saveloading/+merge/364205 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/speedup_saveloading. ___ 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:~nordfriese/widelands/workareas into lp:widelands
Implemented your comment and updated the documentation. I think the old markers are much too big and bright, I never really liked them. The purpose of these markers now is only to hint at the locations of nodes; IMHO a small, light cross is enough for that. If you want something bigger, you can always enable the buildhelp… -- https://code.launchpad.net/~nordfriese/widelands/workareas/+merge/364266 Your team Widelands Developers is requested to review the proposed merge of lp:~nordfriese/widelands/workareas 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:~nordfriese/widelands/workareas into lp:widelands
constexpr kWorkareaTransparency = 127; <- this needs a datatype, e.g. int. -- https://code.launchpad.net/~nordfriese/widelands/workareas/+merge/364266 Your team Widelands Developers is requested to review the proposed merge of lp:~nordfriese/widelands/workareas 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:~nordfriese/widelands/workareas into lp:widelands
Fair enough. But are they supposed to be a to look like a ++ Just a question; this is in no way related to your changes. I noticed that some military buildings, like the Fortress, have a different colour on the outer layer, what is this supposed to indicate? -- https://code.launchpad.net/~nordfriese/widelands/workareas/+merge/364266 Your team Widelands Developers is requested to review the proposed merge of lp:~nordfriese/widelands/workareas 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:~nordfriese/widelands/workareas into lp:widelands
Can't build r9014. src/graphic/gl/workarea_program.cc:63:11: error: C++ requires a type specifier for all declarations constexpr kWorkareaTransparency = 127; -- https://code.launchpad.net/~nordfriese/widelands/workareas/+merge/364266 Your team Widelands Developers is requested to review the proposed merge of lp:~nordfriese/widelands/workareas 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:~nordfriese/widelands/workareas into lp:widelands
Fixed the typo, should compile now. The marker is a small star (*) with six beams that point in the six cardinal directions. The outer circle(s) is/are the enhancement area(s). They indicate the additional area that will be part of the workarea after an upgrade. We already have different overlay images for those in trunk, it´s just more noticeable with the colours now. -- https://code.launchpad.net/~nordfriese/widelands/workareas/+merge/364266 Your team Widelands Developers is requested to review the proposed merge of lp:~nordfriese/widelands/workareas 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:~nordfriese/widelands/workareas into lp:widelands
I made two different versions of the marker. You can find them here: https://fosuta.org/pics/1_grid_marker.png https://fosuta.org/pics/2_grid_marker.png Would you give them a try? -- https://code.launchpad.net/~nordfriese/widelands/workareas/+merge/364266 Your team Widelands Developers is requested to review the proposed merge of lp:~nordfriese/widelands/workareas 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-website/post_registration_cleanup into lp:widelands-website
kaputtnik has proposed merging
lp:~widelands-dev/widelands-website/post_registration_cleanup into
lp:widelands-website.
Requested reviews:
Widelands Developers (widelands-dev)
For more details, see:
https://code.launchpad.net/~widelands-dev/widelands-website/post_registration_cleanup/+merge/364274
The latest server errors occur because:
1. I have overlooked renaming a template, so it was missing
2. Added the missing template as a new template... this was accidentally done
this morning on alpha instead of wl.widelands.org. Took me two hours to find
this mistake :D
So this branch is just a small cleanup.
- removed a (now) unused template
- fixed a url
To be clear i have also checked if registering is working, and the result is
fine.
--
Your team Widelands Developers is requested to review the proposed merge of
lp:~widelands-dev/widelands-website/post_registration_cleanup into
lp:widelands-website.
=== removed file 'templates/django_registration/activate.html'
--- templates/django_registration/activate.html 2019-03-06 16:37:05 +
+++ templates/django_registration/activate.html 1970-01-01 00:00:00 +
@@ -1,21 +0,0 @@
-{% extends "mainpage/base.html" %}
-{% comment %}
-vim:ft=htmldjango:
-{% endcomment %}
-
-{% block title %}
-Activation - {{ block.super }}
-{% endblock %}
-
-{% block content_header %}
-Activation
-{% endblock %}
-
-{% block content_main %}
-
-
- An error occured: Either this account has already been activated or activation key is invalid.
- Try logging in.
-
-
-{% endblock %}
=== modified file 'templates/django_registration/activation_failed.html'
--- templates/django_registration/activation_failed.html 2019-03-11 06:23:17 +
+++ templates/django_registration/activation_failed.html 2019-03-11 19:58:28 +
@@ -13,5 +13,8 @@
An error occured during activation: {{ activation_error.message }}
+
+You can try to log in.
+
{% endblock %}
=== modified file 'urls.py'
--- urls.py 2019-03-03 15:17:58 +
+++ urls.py 2019-03-11 19:58:28 +
@@ -25,7 +25,7 @@
url(r'^accounts/register/$', RegistrationView.as_view(
form_class=RegistrationWithCaptchaForm), name='django_registration_register'),
url(r'^accounts/', include('django_registration.backends.activation.urls')),
-url('^', include('django.contrib.auth.urls')),
+url(r'^', include('django.contrib.auth.urls')),
url(r'^ratings/', include('star_ratings.urls', namespace='ratings', app_name='ratings')),
# Formerly 3rd party
___
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:~nordfriese/widelands/workareas into lp:widelands
I think version 2 looks like a square with a circle in it, that looks strange. Version 1 is good, a bit too large though IMHO. I uploaded a new image similar to it now, how about this? -- https://code.launchpad.net/~nordfriese/widelands/workareas/+merge/364266 Your team Widelands Developers is requested to review the proposed merge of lp:~nordfriese/widelands/workareas 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:~nordfriese/widelands/workareas into lp:widelands
Looks good. -- https://code.launchpad.net/~nordfriese/widelands/workareas/+merge/364266 Your team Widelands Developers is requested to review the proposed merge of lp:~nordfriese/widelands/workareas 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:~nordfriese/widelands/workareas into lp:widelands
Continuous integration builds have changed state: Travis build 4585. State: errored. Details: https://travis-ci.org/widelands/widelands/builds/504893428. Appveyor build 4372. State: failed. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_nordfriese_widelands_workareas-4372. -- https://code.launchpad.net/~nordfriese/widelands/workareas/+merge/364266 Your team Widelands Developers is requested to review the proposed merge of lp:~nordfriese/widelands/workareas 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:~nordfriese/widelands/workareas into lp:widelands
I have done some testing as well and have selected multiple buildings on a slow machine - no problem :) For the grid, how about having another shader that draws lines on the edges? That would also take care of most of the work for adding a grid to the editor: https://bugs.launchpad.net/widelands/+bug/1529261 -- https://code.launchpad.net/~nordfriese/widelands/workareas/+merge/364266 Your team Widelands Developers is requested to review the proposed merge of lp:~nordfriese/widelands/workareas 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/post_registration_cleanup into lp:widelands-website
Review: Approve Ouch, sounds like you did not have fun. Code looks good :) -- https://code.launchpad.net/~widelands-dev/widelands-website/post_registration_cleanup/+merge/364274 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
