I used GIMP, already. Where do you get these warnings?
--
https://code.launchpad.net/~widelands-dev/widelands/immovables_icon_wrong_path_menu/+merge/368011
Your team Widelands Developers is requested to review the proposed merge of
lp:~widelands-dev/widelands/immovables_icon_wrong_path_menu into
When I open the encyclopedia. utils/optimize_pngs.py will also crash with these
files.
--
https://code.launchpad.net/~widelands-dev/widelands/immovables_icon_wrong_path_menu/+merge/368011
Your team Widelands Developers is requested to review the proposed merge of
lp:~widelands-dev/widelands/immo
Review: Approve
LGTM :)
I removed the gettext function from the pure placeholder, because it does not
need translation.
@bunnybot merge
--
https://code.launchpad.net/~widelands-dev/widelands/failed_skipped_10s/+merge/368014
Your team Widelands Developers is subscribed to branch
lp:~widelands-
The proposal to merge lp:~widelands-dev/widelands/appveyor_opengl into
lp:widelands has been updated.
Description changed to:
using glew for x64 builds as well now to get appveyor running again.
For more details, see:
https://code.launchpad.net/~widelands-dev/widelands/appveyor_opengl/+merge/3
hessenfarmer has proposed merging lp:~widelands-dev/widelands/appveyor_opengl
into lp:widelands.
Commit message:
Stick to glew for the moment being as glbinding is causing a lot of problem
recently
Requested reviews:
Widelands Developers (widelands-dev)
For more details, see:
https://code.la
The proposal to merge lp:~widelands-dev/widelands/appveyor_opengl into
lp:widelands has been updated.
Commit message changed to:
using glew for Appveyor CI
For more details, see:
https://code.launchpad.net/~widelands-dev/widelands/appveyor_opengl/+merge/368039
--
Your team Widelands Developers
Thanks everyone for the reviews, and thanks for the fixes :)
@bunnybot merge
--
https://code.launchpad.net/~widelands-dev/widelands/economy-target-profiles/+merge/366987
Your team Widelands Developers is subscribed to branch
lp:~widelands-dev/widelands/economy-target-profiles.
_
Review: Approve review
looks good to me. However there might be some complaints about having the sound
as some people (we all know) do find this annoying. However I like it.
--
https://code.launchpad.net/~widelands-dev/widelands/failed_skipped_10s/+merge/368014
Your team Widelands Developers i
should be fixed
--
https://code.launchpad.net/~widelands-dev/widelands/immovables_icon_wrong_path_menu/+merge/368011
Your team Widelands Developers is requested to review the proposed merge of
lp:~widelands-dev/widelands/immovables_icon_wrong_path_menu into lp:widelands.
Review: Approve
Code LGTM. Let's merge if AppVeyor comes through.
--
https://code.launchpad.net/~widelands-dev/widelands/appveyor_opengl/+merge/368039
Your team Widelands Developers is subscribed to branch
lp:~widelands-dev/widelands/appveyor_opengl.
Oops found some other buildings which need to be adopted to this scheme then
atlanteans crystal mine
empire marble mine, marble mine deep
frisians tailors shop, aqua farm, recycling center and eventually reindeer farm
--
https://code.launchpad.net/~widelands-dev/widelands/failed_skipped_10s/+merg
Found some more. Barbarian's mines. Going to add the changes to this branch,
since it won't be merged because the casern_test failed. I guess we need to
adapt this test as well...
--
https://code.launchpad.net/~widelands-dev/widelands/failed_skipped_10s/+merge/368014
Your team Widelands Develope
Hmm, there are many more. The question is. Shall we move the sleep time just
behind consume, or remove sleep and add the time to the animation time, were
applicable?
--
https://code.launchpad.net/~widelands-dev/widelands/failed_skipped_10s/+merge/368014
Your team Widelands Developers is subscrib
The errors are gone :)
I think the Atlantean Ship Under Construction is hard to see, maybe lighten it
up a bit?
Also, the Frisian berry bushes are still missing icons.
Note that I have run the optimizer, so you will have to pull this branch before
working on it.
--
https://code.launchpad.net/
It basically affects all buildings. Most buildings have a sleep before skipped
and/or consume. So we need to move them as well. But the question is, do we
want to move them or add them to the animation cycle? Or at least move some
seconds to the animation cycle?
--
https://code.launchpad.net/~w
Barbarians mines are not affected I think.
Basically the change of order is definitely necessary for all buildings with
multiple outputs and different inputs needed for the outputs (best example
atlantean or frisian toolsmithy).
It can be adopted (which I prefer) for buildings with multiple out
Changed the icon for the ship and added menu.png for all bushes. The bushes
don't appear in the encyclopedia because nordfriese needs to entangle the lua
files first. Currently, all information including terrain affinity are in one
file.
--
https://code.launchpad.net/~widelands-dev/widelands/im
Okay, so basically only the buildings you listed above?
--
https://code.launchpad.net/~widelands-dev/widelands/failed_skipped_10s/+merge/368014
Your team Widelands Developers is subscribed to branch
lp:~widelands-dev/widelands/failed_skipped_10s.
___
Unless you find others for which the criteria apply, but we could change that
anytime in a new branch as well.
--
https://code.launchpad.net/~widelands-dev/widelands/failed_skipped_10s/+merge/368014
Your team Widelands Developers is subscribed to branch
lp:~widelands-dev/widelands/failed_skipped
Did some thinking :D
> It is not necessary for buildings with leading sleep times of less then 10
> secs as these would been masked by the code now.
> Furthermore it is not necessary for buildings with only one output as the
> effect of wasted time if undersupplied would been averaged over time.
Toni Förster has proposed merging
lp:~widelands-dev/widelands/bug-1830776-password-field-captures-input into
lp:widelands.
Commit message:
don't force focus on password field
Requested reviews:
Widelands Developers (widelands-dev)
Related bugs:
Bug #1830776 in widelands: "Input is captured
Toni Förster has proposed merging
lp:~widelands-dev/widelands/bug-1830778-lobby-initial-client-layout-broken into
lp:widelands.
Commit message:
lobby set Game column in client list to 3/8 of the width
Requested reviews:
Widelands Developers (widelands-dev)
Related bugs:
Bug #1830778 in wide
untangle :D
--
https://code.launchpad.net/~widelands-dev/widelands/immovables_icon_wrong_path_menu/+merge/368011
Your team Widelands Developers is requested to review the proposed merge of
lp:~widelands-dev/widelands/immovables_icon_wrong_path_menu into lp:widelands.
On a second thought this sounds very reasonable.
especially the unifying aspect is a position I alkready took in the forum
discussion so if you want to unify them all I would have no objection. But we
should playtest the changes before merging in this case.
--
https://code.launchpad.net/~wide
The lua files are fine as they are, I have added the missing icon paths. No
untangling needed ;)
Some of the Frisian icons are hard to read though, because the lines are pretty
thin. Maybe more contrast would help here too? The ship under construction is
also very small, maybe cut off the mast
Review: Approve
Yep, that fixed it :)
@bunnybot emrge
--
https://code.launchpad.net/~widelands-dev/widelands/bug-1830776-password-field-captures-input/+merge/368063
Your team Widelands Developers is subscribed to branch
lp:~widelands-dev/widelands/bug-1830776-password-field-captures-input.
___
The proposal to merge
lp:~widelands-dev/widelands/bug-1830776-password-field-captures-input into
lp:widelands has been updated.
Commit message changed to:
Don't force focus on password field
For more details, see:
https://code.launchpad.net/~widelands-dev/widelands/bug-1830776-password-field-c
The proposal to merge
lp:~widelands-dev/widelands/bug-1830778-lobby-initial-client-layout-broken into
lp:widelands has been updated.
Commit message changed to:
Set "Game" column in client list to 3/8 of the width in the Internet lobby
For more details, see:
https://code.launchpad.net/~wideland
Review: Approve
LGTM :)
@bunnybot merge
--
https://code.launchpad.net/~widelands-dev/widelands/bug-1830778-lobby-initial-client-layout-broken/+merge/368066
Your team Widelands Developers is subscribed to branch
lp:~widelands-dev/widelands/bug-1830778-lobby-initial-client-layout-broken.
___
Continuous integration builds have changed state:
Travis build 5080. State: errored. Details:
https://travis-ci.org/widelands/widelands/builds/538595965.
Appveyor build 4860. State: failed. Details:
https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_economy_ta
Refusing to merge, since Travis is not green. Use @bunnybot merge force for
merging anyways.
Travis build 5080. State: errored. Details:
https://travis-ci.org/widelands/widelands/builds/538595965.
--
https://code.launchpad.net/~widelands-dev/widelands/economy-target-profiles/+merge/366987
Your
Inputqueues again
@bunnybot merge force
--
https://code.launchpad.net/~widelands-dev/widelands/economy-target-profiles/+merge/366987
Your team Widelands Developers is subscribed to branch
lp:~widelands-dev/widelands/economy-target-profiles.
___
Mailin
@bunnybot merge :)
--
https://code.launchpad.net/~widelands-dev/widelands/bug-1830776-password-field-captures-input/+merge/368063
Your team Widelands Developers is subscribed to branch
lp:~widelands-dev/widelands/bug-1830776-password-field-captures-input.
Will look into this. :)
--
https://code.launchpad.net/~widelands-dev/widelands/immovables_icon_wrong_path_menu/+merge/368011
Your team Widelands Developers is requested to review the proposed merge of
lp:~widelands-dev/widelands/immovables_icon_wrong_path_menu into lp:widelands.
Okay, I'm going to set a new branch up that contains the changes to the lua
files. Base will be this branch.
--
https://code.launchpad.net/~widelands-dev/widelands/failed_skipped_10s/+merge/368014
Your team Widelands Developers is subscribed to branch
lp:~widelands-dev/widelands/failed_skipped_1
The proposal to merge lp:~widelands-dev/widelands/economy-target-profiles into
lp:widelands has been updated.
Status: Needs review => Merged
For more details, see:
https://code.launchpad.net/~widelands-dev/widelands/economy-target-profiles/+merge/366987
--
Your team Widelands Developers is
Benedikt Straub has proposed merging lp:~widelands-dev/widelands/workarea-fixes
into lp:widelands.
Commit message:
· Draw a narrow border around workareas for better visibility
· Improve performance by only recalculating the workarea shader data when needed
· Add the hotkey W to enable/disable hi
Toni Förster has proposed merging lp:~widelands-dev/widelands/unify_sleep_time
into lp:widelands with lp:~widelands-dev/widelands/failed_skipped_10s as a
prerequisite.
Commit message:
move sleep behind return/consume/callworker
Requested reviews:
hessenfarmer (stephan-lutz)
For more details,
The proposal to merge lp:~widelands-dev/widelands/unify_sleep_time into
lp:widelands has been updated.
Description changed to:
The basic idea is, we can guarantee that a failed or skipped program will
always be continued after a grace time of 10 seconds.
All calls within a program, may it be s
some small comments see inline
Diff comments:
>
> === modified file
> 'data/tribes/buildings/productionsites/atlanteans/woodcutters_house/init.lua'
> ---
> data/tribes/buildings/productionsites/atlanteans/woodcutters_house/init.lua
> 2018-07-08 16:10:50 +
> +++
> data/tribes/buildi
Added them back in and set the commas.
--
https://code.launchpad.net/~widelands-dev/widelands/unify_sleep_time/+merge/368086
Your team Widelands Developers is subscribed to branch
lp:~widelands-dev/widelands/failed_skipped_10s.
___
Mailing list: https:
Continuous integration builds have changed state:
Travis build 5081. State: passed. Details:
https://travis-ci.org/widelands/widelands/builds/538820290.
Appveyor build 4861. State: failed. Details:
https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_bug_1830778
still wrong order for frisian aqua farm and claypit. Consume neeeds to be after
the callworker command otherwisw we will waste ressources unnecesseraliy
--
https://code.launchpad.net/~widelands-dev/widelands/unify_sleep_time/+merge/368086
Your team Widelands Developers is subscribed to branch
lp
The proposal to merge
lp:~widelands-dev/widelands/bug-1830778-lobby-initial-client-layout-broken into
lp:widelands has been updated.
Status: Needs review => Merged
For more details, see:
https://code.launchpad.net/~widelands-dev/widelands/bug-1830778-lobby-initial-client-layout-broken/+merg
Okay, fixed now :)
--
https://code.launchpad.net/~widelands-dev/widelands/unify_sleep_time/+merge/368086
Your team Widelands Developers is subscribed to branch
lp:~widelands-dev/widelands/failed_skipped_10s.
___
Mailing list: https://launchpad.net/~wid
Review: Approve code review
thanks a lot for doing all this bloody work.
Looks good now.
--
https://code.launchpad.net/~widelands-dev/widelands/unify_sleep_time/+merge/368086
Your team Widelands Developers is subscribed to branch
lp:~widelands-dev/widelands/failed_skipped_10s.
__
This branch fails:
test/maps/plain.wmf/scripting/test_casern.lua
How do I run the test locally?
--
https://code.launchpad.net/~widelands-dev/widelands/failed_skipped_10s/+merge/368014
Your team Widelands Developers is subscribed to branch
lp:~widelands-dev/widelands/failed_skipped_10s.
__
Continuous integration builds have changed state:
Travis build 5082. State: errored. Details:
https://travis-ci.org/widelands/widelands/builds/538820816.
Appveyor build 4862. State: failed. Details:
https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_bug_183077
Refusing to merge, since Travis is not green. Use @bunnybot merge force for
merging anyways.
Travis build 5082. State: errored. Details:
https://travis-ci.org/widelands/widelands/builds/538820816.
--
https://code.launchpad.net/~widelands-dev/widelands/bug-1830776-password-field-captures-input/+
inputqueues again.
@bunnybot merge force
--
https://code.launchpad.net/~widelands-dev/widelands/bug-1830776-password-field-captures-input/+merge/368063
Your team Widelands Developers is subscribed to branch
lp:~widelands-dev/widelands/bug-1830776-password-field-captures-input.
_
I just noticed that I forgot the training sites. I started by replacing the
dummy checks with return=no_stats.
I think we should add a return=fail if not enough food/wares are present (like
we have for the aqua farm). To avoid the 30s sleep. Or can we move the sleep
behind that consume part?
--
The proposal to merge
lp:~widelands-dev/widelands/bug-1830776-password-field-captures-input into
lp:widelands has been updated.
Status: Needs review => Merged
For more details, see:
https://code.launchpad.net/~widelands-dev/widelands/bug-1830776-password-field-captures-input/+merge/368063
-
Continuous integration builds have changed state:
Travis build 5085. State: errored. Details:
https://travis-ci.org/widelands/widelands/builds/538821683.
Appveyor build 4865. State: failed. Details:
https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_immovables
Continuous integration builds have changed state:
Travis build 5087. State: errored. Details:
https://travis-ci.org/widelands/widelands/builds/538879884.
Appveyor build 4867. State: failed. Details:
https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_workarea_f
Running regression tests locally:
./regression_test.py -b ./widelands
--
https://code.launchpad.net/~widelands-dev/widelands/failed_skipped_10s/+merge/368014
Your team Widelands Developers is subscribed to branch
lp:~widelands-dev/widelands/failed_skipped_10s.
Continuous integration builds have changed state:
Travis build 5093. State: passed. Details:
https://travis-ci.org/widelands/widelands/builds/538931717.
Appveyor build 4873. State: failed. Details:
https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_appveyor_op
56 matches
Mail list logo
