[Widelands-dev] Bunnybot says...

[bunnybot]

Hi, I am bunnybot (https://github.com/widelands/bunnybot).

I am keeping the source branch lp:~widelands-dev/widelands/find_attack_soldiers 
mirrored to 
  
https://github.com/widelands/widelands/tree/_widelands_dev_widelands_find_attack_soldiers

The latest continuous integration build can always be found here:
  https://travis-ci.org/widelands/widelands/branches
Please do not merge without making sure that it passes.

You can give me commands by starting a line with @bunnybot . I 
understand: 
 merge: Merges the source branch into the target branch, closing the pull 
request.
-- 
https://code.launchpad.net/~widelands-dev/widelands/find_attack_soldiers/+merge/245276
Your team Widelands Developers is subscribed to branch 
lp:~widelands-dev/widelands/find_attack_soldiers.

___
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

[kaputtnik]

Review: Resubmit

I shifted duplicate code into the new template "templates/pybb/post_form.html",
did some cleanups,
added some comments.
-- 
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

[Widelands-dev] Bunnybot says...

[bunnybot]

Hi, I am bunnybot (https://github.com/widelands/bunnybot).

I am keeping the source branch lp:~widelands-dev/widelands/bug-1397500 mirrored 
to 
  
https://github.com/widelands/widelands/tree/_widelands_dev_widelands_bug_1397500

The latest continuous integration build can always be found here:
  https://travis-ci.org/widelands/widelands/branches
Please do not merge without making sure that it passes.

You can give me commands by starting a line with @bunnybot . I 
understand: 
 merge: Merges the source branch into the target branch, closing the pull 
request.
-- 
https://code.launchpad.net/~widelands-dev/widelands/bug-1397500/+merge/243860
Your team Widelands Developers is subscribed to branch 
lp:~widelands-dev/widelands/bug-1397500.

___
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/editor-remove-invalid-resources_fix into lp:~janosch-peters/widelands/editor-remove-invalid-resources

[Tino]

Tino has proposed merging 
lp:~widelands-dev/widelands/editor-remove-invalid-resources_fix into 
lp:~janosch-peters/widelands/editor-remove-invalid-resources.

Requested reviews:
  Janosch Peters (janosch-peters)

For more details, see:
https://code.launchpad.net/~widelands-dev/widelands/editor-remove-invalid-resources_fix/+merge/281467

avoid crash when setting resource amount to 0 on empty field
-- 
Your team Widelands Developers is subscribed to branch 
lp:~widelands-dev/widelands/editor-remove-invalid-resources_fix.
=== modified file 'src/editor/tools/editor_set_resources_tool.cc'
--- src/editor/tools/editor_set_resources_tool.cc	2016-01-01 17:35:01 +
+++ src/editor/tools/editor_set_resources_tool.cc	2016-01-02 14:34:02 +
@@ -57,10 +57,11 @@
 
 		if (editor_change_resource_tool_callback(mr.location(), map, world, args.cur_res)) {
 			//  Ok, we're doing something. First remove the current overlays.
-			const Image* pic = g_gr->images().get
-(world.get_resource(res)->get_editor_pic (mr.location().field->get_resources_amount()));
-			overlay_manager.remove_overlay(mr.location(), pic);
-
+			if (res != Widelands::kNoResource) {
+const Image* pic = g_gr->images().get
+	(world.get_resource(res)->get_editor_pic (mr.location().field->get_resources_amount()));
+overlay_manager.remove_overlay(mr.location(), pic);
+			}
 			if (!amount) {
 mr.location().field->set_resources(Widelands::kNoResource, 0);
 mr.location().field->set_initial_res_amount(0);
@@ -68,7 +69,7 @@
 mr.location().field->set_resources(args.cur_res, amount);
 mr.location().field->set_initial_res_amount(amount);
 //  set new overlay
-pic =
+const Image* pic =
 g_gr->images().get(world.get_resource(args.cur_res)->get_editor_pic(amount));
 overlay_manager.register_overlay(mr.location(), pic, 4);
 map.recalc_for_field_area(world, Widelands::Area(mr.location(), 0));

___
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...

[bunnybot]

Travis build 125 has changed state to: failed. Details: 
https://travis-ci.org/widelands/widelands/builds/99791501.
-- 
https://code.launchpad.net/~widelands-dev/widelands/render_queue/+merge/250524
Your team Widelands Developers is subscribed to branch 
lp:~widelands-dev/widelands/render_queue.

___
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...

[bunnybot]

Travis build 121 has changed state to: failed. Details: 
https://travis-ci.org/widelands/widelands/builds/99770120.
-- 
https://code.launchpad.net/~widelands-dev/widelands/table_align/+merge/279685
Your team Widelands Developers is requested to review the proposed merge of 
lp:~widelands-dev/widelands/table_align 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...

[bunnybot]

Travis build 122 has changed state to: failed. Details: 
https://travis-ci.org/widelands/widelands/builds/99778652.
-- 
https://code.launchpad.net/~widelands-dev/widelands/map_compatibility/+merge/276088
Your team Widelands Developers is requested to review the proposed merge of 
lp:~widelands-dev/widelands/map_compatibility 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...

[bunnybot]

Travis build 124 has changed state to: failed. Details: 
https://travis-ci.org/widelands/widelands/builds/99784765.
-- 
https://code.launchpad.net/~hjd/widelands/tests-poc/+merge/250533
Your team Widelands Developers is requested to review the proposed merge of 
lp:~hjd/widelands/tests-poc into lp:~widelands-dev/widelands/debian.

___
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...

[bunnybot]

Travis build 123 has changed state to: failed. Details: 
https://travis-ci.org/widelands/widelands/builds/99784763.
-- 
https://code.launchpad.net/~widelands-dev/widelands/split_overlay_manager/+merge/254496
Your team Widelands Developers is requested to review the proposed merge of 
lp:~widelands-dev/widelands/split_overlay_manager into 
lp:~widelands-dev/widelands/render_queue.

___
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/options_window into lp:widelands

[Tino]

Review: Approve

Looks good to me and bunnybot ;).

@bunnybot merge
-- 
https://code.launchpad.net/~widelands-dev/widelands/options_window/+merge/280355
Your team Widelands Developers is subscribed to branch 
lp:~widelands-dev/widelands/options_window.

___
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...

[bunnybot]

Hi, I am bunnybot (https://github.com/widelands/bunnybot).

I am keeping the source branch 
lp:~widelands-dev/widelands/editor-remove-invalid-resources_fix mirrored to 
https://github.com/widelands/widelands/tree/_widelands_dev_widelands_editor_remove_invalid_resources_fix

You can give me commands by starting a line with @bunnybot . I 
understand: 
 merge: Merges the source branch into the target branch, closing the pull 
request.
-- 
https://code.launchpad.net/~widelands-dev/widelands/editor-remove-invalid-resources_fix/+merge/281467
Your team Widelands Developers is subscribed to branch 
lp:~widelands-dev/widelands/editor-remove-invalid-resources_fix.

___
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 into lp:widelands

[SirVer]

The proposal to merge lp:~widelands-dev/widelands/appveyor into lp:widelands 
has been updated.

Status: Needs review => Rejected

For more details, see:
https://code.launchpad.net/~widelands-dev/widelands/appveyor/+merge/281473
-- 
Your team Widelands Developers is requested to review the proposed merge of 
lp:~widelands-dev/widelands/appveyor 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/appveyor into lp:widelands

[SirVer]

Review: Disapprove

As discussed in chat, pushing a branch onto github for experimenting is a 
faster way to success,
-- 
https://code.launchpad.net/~widelands-dev/widelands/appveyor/+merge/281473
Your team Widelands Developers is subscribed to branch 
lp:~widelands-dev/widelands/appveyor.

___
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...

[bunnybot]

Travis build 130 has changed state to: passed. Details: 
https://travis-ci.org/widelands/widelands/builds/99817066.
-- 
https://code.launchpad.net/~widelands-dev/widelands/options_window/+merge/280355
Your team Widelands Developers is subscribed to branch 
lp:~widelands-dev/widelands/options_window.

___
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...

[bunnybot]

Travis build 101 has changed state to: passed. Details: 
https://travis-ci.org/widelands/widelands/builds/99640935.
-- 
https://code.launchpad.net/~widelands-dev/widelands/bug-1526903/+merge/281410
Your team Widelands Developers is subscribed to branch 
lp:~widelands-dev/widelands/bug-1526903.

___
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...

[bunnybot]

Travis build 118 has changed state to: failed. Details: 
https://travis-ci.org/widelands/widelands/builds/99729706.
-- 
https://code.launchpad.net/~widelands-dev/widelands/logic_directory_layout/+merge/280354
Your team Widelands Developers is requested to review the proposed merge of 
lp:~widelands-dev/widelands/logic_directory_layout 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...

[bunnybot]

Travis build 119 has changed state to: failed. Details: 
https://travis-ci.org/widelands/widelands/builds/99743957.
-- 
https://code.launchpad.net/~widelands-dev/widelands/request_supply_opt/+merge/280193
Your team Widelands Developers is requested to review the proposed merge of 
lp:~widelands-dev/widelands/request_supply_opt 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...

[bunnybot]

Travis build 120 has changed state to: passed. Details: 
https://travis-ci.org/widelands/widelands/builds/99757802.
-- 
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] [Merge] lp:~widelands-dev/widelands/appveyor into lp:widelands

[Tino]

Tino has proposed merging lp:~widelands-dev/widelands/appveyor into 
lp:widelands.

Requested reviews:
  Widelands Developers (widelands-dev)

For more details, see:
https://code.launchpad.net/~widelands-dev/widelands/appveyor/+merge/281473

Please do not merge as for now.
I want only bunnybot to clone the branch to github. 
-- 
Your team Widelands Developers is requested to review the proposed merge of 
lp:~widelands-dev/widelands/appveyor into lp:widelands.
=== added file 'appveyor.yml'
--- appveyor.yml	1970-01-01 00:00:00 +
+++ appveyor.yml	2016-01-02 19:30:04 +
@@ -0,0 +1,15 @@
+platform:
+- x64
+
+environment:
+  matrix:
+# VS 2013
+  - BUILD_TYPE: cmake
+VS_VERSION: Visual Studio 12
+
+version: '{branch}-{build}'
+branches:
+  only:
+  - appveyor
+build:
+  verbosity: detailed
\ No newline at end of file

___
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...

[bunnybot]

Travis build 167 has changed state to: created. Details: 
https://travis-ci.org/widelands/widelands/builds/99877641.
-- 
https://code.launchpad.net/~widelands-dev/widelands/render_queue/+merge/250524
Your team Widelands Developers is subscribed to branch 
lp:~widelands-dev/widelands/render_queue.

___
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...

[bunnybot]

Travis build 166 has changed state to: created. Details: 
https://travis-ci.org/widelands/widelands/builds/99877556.
-- 
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] Bunnybot says...

[bunnybot]

Travis build 162 has changed state to: errored. Details: 
https://travis-ci.org/widelands/widelands/builds/99874912.
-- 
https://code.launchpad.net/~widelands-dev/widelands/request_supply_opt/+merge/280193
Your team Widelands Developers is requested to review the proposed merge of 
lp:~widelands-dev/widelands/request_supply_opt 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...

[bunnybot]

Travis build 166 has changed state to: started. Details: 
https://travis-ci.org/widelands/widelands/builds/99877556.
-- 
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] Bunnybot says...

[bunnybot]

Travis build 167 has changed state to: started. Details: 
https://travis-ci.org/widelands/widelands/builds/99877641.
-- 
https://code.launchpad.net/~widelands-dev/widelands/render_queue/+merge/250524
Your team Widelands Developers is subscribed to branch 
lp:~widelands-dev/widelands/render_queue.

___
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...

[bunnybot]

Travis build 162 has changed state to: started. Details: 
https://travis-ci.org/widelands/widelands/builds/99874912.
-- 
https://code.launchpad.net/~widelands-dev/widelands/request_supply_opt/+merge/280193
Your team Widelands Developers is requested to review the proposed merge of 
lp:~widelands-dev/widelands/request_supply_opt 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...

[bunnybot]

Travis build 167 has changed state to: passed. Details: 
https://travis-ci.org/widelands/widelands/builds/99877641.
-- 
https://code.launchpad.net/~widelands-dev/widelands/render_queue/+merge/250524
Your team Widelands Developers is subscribed to branch 
lp:~widelands-dev/widelands/render_queue.

___
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