Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/frisians into lp:widelands

2018-02-17 Thread TiborB
re: "Add a new hint supporter_required..." - yes, this sound good to me, I can 
do it and should not be that complicated. Just dont forget about possible 
conflicts with basic economy stuff (supported building is a basic, but 
supporter is not)
-- 
https://code.launchpad.net/~widelands-dev/widelands/frisians/+merge/336910
Your team Widelands Developers is subscribed to branch 
lp:~widelands-dev/widelands/frisians.

___
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/fh1-maps-plateau into lp:widelands

2018-02-17 Thread bunnybot
Continuous integration builds have changed state:

Travis build 3189. State: passed. Details: 
https://travis-ci.org/widelands/widelands/builds/342516094.
Appveyor build 2998. State: failed. Details: 
https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_fh1_maps_plateau-2998.
-- 
https://code.launchpad.net/~widelands-dev/widelands/fh1-maps-plateau/+merge/337505
Your team Widelands Developers is requested to review the proposed merge of 
lp:~widelands-dev/widelands/fh1-maps-plateau 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/ai_fisher_identification into lp:widelands

2018-02-17 Thread TiborB
I am afraid that in a next tribe the fishers will have an input - worms or 
something like that and we will be reworking this again :(
-- 
https://code.launchpad.net/~widelands-dev/widelands/ai_fisher_identification/+merge/337914
Your team Widelands Developers is requested to review the proposed merge of 
lp:~widelands-dev/widelands/ai_fisher_identification 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/ai_fisher_identification into lp:widelands

2018-02-17 Thread TiborB
TiborB has proposed merging 
lp:~widelands-dev/widelands/ai_fisher_identification into lp:widelands.

Requested reviews:
  Widelands Developers (widelands-dev)

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

AI tweak - a productionsite to be considered a fisher must not have any inputs.
-- 
Your team Widelands Developers is requested to review the proposed merge of 
lp:~widelands-dev/widelands/ai_fisher_identification into lp:widelands.
=== modified file 'src/ai/defaultai.cc'
--- src/ai/defaultai.cc	2018-02-16 20:42:21 +
+++ src/ai/defaultai.cc	2018-02-17 21:14:33 +
@@ -723,7 +723,8 @@
 			}
 
 			// and fishers
-			if (bo.outputs.size() == 1 && tribe_->safe_ware_index("fish") == bo.outputs.at(0)) {
+			if (bo.outputs.size() == 1 && tribe_->safe_ware_index("fish") == bo.outputs.at(0) &&
+bo.inputs.empty()) {
 bo.set_is(BuildingAttribute::kFisher);
 			}
 

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

2018-02-17 Thread TiborB
TiborB has proposed merging lp:~widelands-dev/widelands/ai_colonization_update 
into lp:widelands.

Requested reviews:
  Widelands Developers (widelands-dev)

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

Changes to AI in regard to colonization (exploration):

- AI nows considers whether possible sea direction leads to unknown territories 
(using Player.vision() = 0) and these are preferred to normal open sea (know 
territories only)
- Logic for building ports and shipyard was tweaked to increase AI's 
willingness to build them

Main problem on confined territories with one portspace are roads (AI does not 
control them fully) and trees.
-- 
Your team Widelands Developers is requested to review the proposed merge of 
lp:~widelands-dev/widelands/ai_colonization_update into lp:widelands.
=== modified file 'src/ai/ai_help_structs.h'
--- src/ai/ai_help_structs.h	2018-02-16 20:42:21 +
+++ src/ai/ai_help_structs.h	2018-02-17 20:56:06 +
@@ -509,6 +509,7 @@
 	Widelands::Ship* ship;
 	bool waiting_for_command_ = false;
 	uint32_t last_command_time = 0;
+	bool escape_mode = false;
 
 	// direction by which the ship circumvents an island
 	// this is the last circle-island command's direction

=== modified file 'src/ai/defaultai.cc'
--- src/ai/defaultai.cc	2018-02-16 20:42:21 +
+++ src/ai/defaultai.cc	2018-02-17 20:56:06 +
@@ -2389,6 +2389,7 @@
 
 			if (bo.is(BuildingAttribute::kShipyard)) {
 assert(bo.new_building == BuildingNecessity::kAllowed ||
+   bo.new_building == BuildingNecessity::kNeeded ||
    bo.new_building == BuildingNecessity::kForbidden);
 			}
 
@@ -2761,7 +2762,6 @@
 		prio += 150;
 		assert(!bo.is(BuildingAttribute::kShipyard));
 	} else if (bo.is(BuildingAttribute::kShipyard)) {
-		assert(bo.new_building == BuildingNecessity::kAllowed);
 		if (!map_allows_seafaring_) {
 			continue;
 		}
@@ -4574,10 +4574,13 @@
 	// So now we know the warehouse here is needed.
 	bo.primary_priority =
 	   1 +
-	   (needed_count - numof_warehouses_) * std::abs(management_data.get_military_number_at(22) * 5);
+	   (needed_count - numof_warehouses_) * std::abs(management_data.get_military_number_at(22) * 20);
 	++bo.new_building_overdue;
 	bo.primary_priority +=
-	   bo.new_building_overdue * std::abs(management_data.get_military_number_at(16)) / 10;
+	   bo.new_building_overdue * std::abs(management_data.get_military_number_at(16));
+	if (bo.is(BuildingAttribute::kPort) && spots_ < kSpotsTooLittle) {
+		bo.primary_priority += std::abs(management_data.get_military_number_at(152)) * 10;
+	}
 	return BuildingNecessity::kAllowed;
 }
 
@@ -5510,10 +5513,20 @@
 			}
 
 		} else if (bo.is(BuildingAttribute::kShipyard)) {
-			if (bo.total_count() > 0 ||
-			site_needed_for_economy == BasicEconomyBuildingStatus::kDiscouraged) {
+			if (bo.total_count() > 0 || (!basic_economy_established &&
+			site_needed_for_economy == BasicEconomyBuildingStatus::kDiscouraged) || !map_allows_seafaring_) {
 return BuildingNecessity::kForbidden;
 			}
+			bo.primary_priority = 0;
+			if (num_ports > 0) {
+bo.primary_priority += std::abs(management_data.get_military_number_at(150) * 3);
+			}
+			if (spots_ < kSpotsTooLittle) {
+bo.primary_priority += std::abs(management_data.get_military_number_at(151) * 3);
+			}
+			if (bo.primary_priority > 0) {
+return BuildingNecessity::kNeeded;
+			}
 			return BuildingNecessity::kAllowed;
 		} else if (bo.max_needed_preciousness == 0) {
 			return BuildingNecessity::kNotNeeded;

=== modified file 'src/ai/defaultai.h'
--- src/ai/defaultai.h	2018-02-16 20:42:21 +
+++ src/ai/defaultai.h	2018-02-17 20:56:06 +
@@ -271,6 +271,7 @@
 	uint8_t spot_scoring(Widelands::Coords candidate_spot);
 	bool marine_main_decisions();
 	bool check_ships(uint32_t);
+	bool attempt_escape(Widelands::ShipObserver& so);
 
 	// finding and owner
 	Widelands::PlayerNumber get_land_owner(const Widelands::Map&, uint32_t);

=== modified file 'src/ai/defaultai_seafaring.cc'
--- src/ai/defaultai_seafaring.cc	2018-01-03 20:24:57 +
+++ src/ai/defaultai_seafaring.cc	2018-02-17 20:56:06 +
@@ -179,8 +179,10 @@
 	FleetStatus enough_ships = FleetStatus::kDoNothing;
 	if (ports_count > 0 && shipyards_count > 0 && idle_shipyard_stocked) {
 
-		// we always need at least one ship in transport mode
-		if (!ship_free) {
+		if (!basic_economy_established) {
+			enough_ships = FleetStatus::kEnoughShips;
+			// we always need at least one ship in transport mode
+		} else if (!ship_free) {
 			enough_ships = FleetStatus::kNeedShip;
 
 			// we want at least as many free ships as we have ports
@@ -223,7 +225,7 @@
 
 	// starting an expedition? if yes, find a port and order it to start an expedition
 	if (ports_count > 0 && expeditions_in_progress == 0 && expeditions_in_prep == 0 &&
-	persistent_data->no_more_expeditions == kFalse && ship_free) {
+	

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1669230-lastbastion-finetune into lp:widelands

2018-02-17 Thread GunChleoc
Codecheck failure is already in trunk, so it needs to be fixed there

@bunnybot merge force
-- 
https://code.launchpad.net/~widelands-dev/widelands/bug-1669230-lastbastion-finetune/+merge/337083
Your team Widelands Developers is subscribed to branch 
lp:~widelands-dev/widelands/bug-1669230-lastbastion-finetune.

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

2018-02-17 Thread GunChleoc
Review: Approve

Code LGTM, not tested.
-- 
https://code.launchpad.net/~widelands-dev/widelands-website/auto_copyr_year/+merge/337911
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/bug-1669230-lastbastion-finetune into lp:widelands

2018-02-17 Thread GunChleoc
Yep, Travis still has some catching up to do, because Bunnybot had indeed 
gotten confused due to problems with Launchpad.
-- 
https://code.launchpad.net/~widelands-dev/widelands/bug-1669230-lastbastion-finetune/+merge/337083
Your team Widelands Developers is subscribed to branch 
lp:~widelands-dev/widelands/bug-1669230-lastbastion-finetune.

___
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/bug-1669230-lastbastion-finetune into lp:widelands

2018-02-17 Thread Teppo Mäenpää
When may I conclude that bunnybot has, once again, decided not to merge. What 
is the problem this time?
-- 
https://code.launchpad.net/~widelands-dev/widelands/bug-1669230-lastbastion-finetune/+merge/337083
Your team Widelands Developers is subscribed to branch 
lp:~widelands-dev/widelands/bug-1669230-lastbastion-finetune.

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

2018-02-17 Thread bunnybot
Continuous integration builds have changed state:

Travis build 3187. State: passed. Details: 
https://travis-ci.org/widelands/widelands/builds/342514546.
Appveyor build 2996. State: success. Details: 
https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_fh1_tutorial3-2996.
-- 
https://code.launchpad.net/~widelands-dev/widelands/fh1-tutorial3/+merge/337543
Your team Widelands Developers is requested to review the proposed merge of 
lp:~widelands-dev/widelands/fh1-tutorial3 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/frisians into lp:widelands

2018-02-17 Thread GunChleoc
I have done some proofreading on the tribe's units. Will do the scenarios some 
other time.

Best look at the diff to see if you agree with my changes - there are also some 
NOCOM comments in there for discussion.

2 more things:

1. I don't like "(Master) Seamstress" as the name of a building. The vocabulary 
that I researched is "sewing room", "sewing shop", or "tailor’s shop". Which 
one(s) do we want?

2. I'm also not happy with "basic sword". "short sword", "simple sword", or 
just "sword"?

-- 
https://code.launchpad.net/~widelands-dev/widelands/frisians/+merge/336910
Your team Widelands Developers is subscribed to branch 
lp:~widelands-dev/widelands/frisians.

___
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/bug-1669230-lastbastion-finetune into lp:widelands

2018-02-17 Thread Teppo Mäenpää
The proposal to merge 
lp:~widelands-dev/widelands/bug-1669230-lastbastion-finetune into lp:widelands 
has been updated.

Commit Message changed to:

Minor fixes to Last Bastion map. See LP bug 1669230 for details.

For more details, see:
https://code.launchpad.net/~widelands-dev/widelands/bug-1669230-lastbastion-finetune/+merge/337083
-- 
Your team Widelands Developers is subscribed to branch 
lp:~widelands-dev/widelands/bug-1669230-lastbastion-finetune.

___
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:~abacabadabacaba/widelands/bug1749586 into lp:widelands

2018-02-17 Thread Evgeny Kapun
Evgeny Kapun has proposed merging lp:~abacabadabacaba/widelands/bug1749586 into 
lp:widelands.

Requested reviews:
  Widelands Developers (widelands-dev)
Related bugs:
  Bug #1749586 in widelands: "Fish breeder can't breed fish if the game is 
loaded after all fish is caught"
  https://bugs.launchpad.net/widelands/+bug/1749586

For more details, see:
https://code.launchpad.net/~abacabadabacaba/widelands/bug1749586/+merge/337912

Fix for bug #1749586
-- 
Your team Widelands Developers is requested to review the proposed merge of 
lp:~abacabadabacaba/widelands/bug1749586 into lp:widelands.
=== modified file 'src/map_io/map_resources_packet.cc'
--- src/map_io/map_resources_packet.cc	2017-08-19 22:22:20 +
+++ src/map_io/map_resources_packet.cc	2018-02-17 13:52:34 +
@@ -66,28 +66,11 @@
 			for (uint16_t y = 0; y < map->get_height(); ++y) {
 for (uint16_t x = 0; x < map->get_width(); ++x) {
 	DescriptionIndex const id = fr.unsigned_8();
-	ResourceAmount const found_amount = fr.unsigned_8();
-	ResourceAmount const amount = found_amount;
+	ResourceAmount const amount = fr.unsigned_8();
 	ResourceAmount const start_amount = fr.unsigned_8();
-
-	DescriptionIndex set_id;
-	ResourceAmount set_amount, set_start_amount;
-	//  if amount is zero, theres nothing here
-	if (!amount) {
-		set_id = 0;
-		set_amount = 0;
-		set_start_amount = 0;
-	} else {
-		set_id = smap[id];
-		set_amount = amount;
-		set_start_amount = start_amount;
-	}
-
-	if (0xa < set_id)
-		throw "Unknown resource in map file. It is not in world!\n";
 	const auto fcoords = map->get_fcoords(Coords(x, y));
-	map->initialize_resources(fcoords, set_id, set_start_amount);
-	map->set_resources(fcoords, set_amount);
+	map->initialize_resources(fcoords, smap[id], start_amount);
+	map->set_resources(fcoords, amount);
 }
 			}
 		} else {

___
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/fh1-maps-multiplayer into lp:widelands

2018-02-17 Thread GunChleoc
I have tested Island Hopping now. Smugglers still needs a full test.
-- 
https://code.launchpad.net/~widelands-dev/widelands/fh1-maps-multiplayer/+merge/337506
Your team Widelands Developers is requested to review the proposed merge of 
lp:~widelands-dev/widelands/fh1-maps-multiplayer 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/auto_copyr_year into lp:widelands-website

2018-02-17 Thread kaputtnik
kaputtnik has proposed merging 
lp:~widelands-dev/widelands-website/auto_copyr_year into lp:widelands-website.

Requested reviews:
  Widelands Developers (widelands-dev)

For more details, see:
https://code.launchpad.net/~widelands-dev/widelands-website/auto_copyr_year/+merge/337911

Set the last year of copyright notice in the footer automatically to current 
year.

Some cleanups.
-- 
Your team Widelands Developers is requested to review the proposed merge of 
lp:~widelands-dev/widelands-website/auto_copyr_year into lp:widelands-website.
=== modified file 'mainpage/context_processors.py'
--- mainpage/context_processors.py	2016-12-15 12:55:44 +
+++ mainpage/context_processors.py	2018-02-17 11:33:36 +
@@ -2,6 +2,5 @@
 
 
 def settings_for_templates(request):
-context = {'USE_GOOGLE_ANALYTICS': settings.USE_GOOGLE_ANALYTICS,
-   'LOGO_FILE': settings.LOGO_FILE}
+context = {'USE_GOOGLE_ANALYTICS': settings.USE_GOOGLE_ANALYTICS,}
 return context

=== removed file 'mainpage/templatetags/all_users.py'
--- mainpage/templatetags/all_users.py	2017-11-06 17:50:17 +
+++ mainpage/templatetags/all_users.py	1970-01-01 00:00:00 +
@@ -1,12 +0,0 @@
-#!/usr/bin/env python -tt
-# encoding: utf-8
-
-from django import template
-from django.contrib.auth.models import User
-
-register = template.Library()
-
-@register.simple_tag
-def all_users():
-"""Provide a list of all users"""
-return [str(u.username) for u in User.objects.all()]

=== removed file 'mainpage/templatetags/forum_navigation.py'
--- mainpage/templatetags/forum_navigation.py	2016-12-15 12:55:44 +
+++ mainpage/templatetags/forum_navigation.py	1970-01-01 00:00:00 +
@@ -1,18 +0,0 @@
-from pybb.models import Category
-from django import template
-
-
-register = template.Library()
-
-@register.inclusion_tag('mainpage/forum_navigation.html')
-def forum_navigation():
-"""Makes the forum list available to the navigation, even
-if it is not loaded directly.
-
-Ordering:
-1.: value of 'Position' in pybb.Category
-2.: value of 'Position' of pybb.Forum.
-
-"""
-categories = Category.objects.all()
-return {'categories': categories}

=== removed file 'mainpage/templatetags/get_model_name.py'
--- mainpage/templatetags/get_model_name.py	2017-08-16 22:18:21 +
+++ mainpage/templatetags/get_model_name.py	1970-01-01 00:00:00 +
@@ -1,8 +0,0 @@
-from django import template
-
-register = template.Library()
-
-@register.filter
-def get_model_name(object):
-"""Returns the name of an objects model"""
-return object.__class__.__name__
\ No newline at end of file

=== added file 'mainpage/templatetags/wl_extras.py'
--- mainpage/templatetags/wl_extras.py	1970-01-01 00:00:00 +
+++ mainpage/templatetags/wl_extras.py	2018-02-17 11:33:36 +
@@ -0,0 +1,52 @@
+#!/usr/bin/env python -tt
+# encoding: utf-8
+
+from django import template
+
+register = template.Library()
+
+
+@register.simple_tag
+def current_year():
+"""Just return the current year."""
+
+from datetime import date
+return date.today().year
+
+
+@register.simple_tag
+def wl_logo():
+"""Just return the name of the logo."""
+
+from django.conf import settings
+return settings.LOGO_FILE
+
+
+@register.simple_tag
+def all_users():
+"""Provide a list of all users."""
+
+from django.contrib.auth.models import User
+return [str(u.username) for u in User.objects.all()]
+
+
+@register.inclusion_tag('mainpage/forum_navigation.html')
+def forum_navigation():
+"""Makes the forum list available to the navigation.
+
+Ordering:
+1.: value of 'Position' in pybb.Category
+2.: value of 'Position' of pybb.Forum.
+
+"""
+
+from pybb.models import Category
+categories = Category.objects.all()
+return {'categories': categories}
+
+
+@register.filter
+def get_model_name(object):
+"""Returns the name of an objects model."""
+
+return object.__class__.__name__

=== modified file 'mainpage/views.py'
--- mainpage/views.py	2017-10-30 11:58:00 +
+++ mainpage/views.py	2018-02-17 11:33:36 +
@@ -1,4 +1,3 @@
-from django.shortcuts import render_to_response
 from django.template import RequestContext
 from settings import WIDELANDS_SVN_DIR, INQUIRY_RECIPIENTS
 from templatetags.wl_markdown import do_wl_markdown
@@ -7,7 +6,6 @@
 from mainpage.forms import ContactForm
 from django.shortcuts import render
 from django.http import HttpResponseRedirect, HttpResponse
-from django.core.urlresolvers import reverse
 import sys
 import json
 import os
@@ -17,8 +15,7 @@
 
 
 def mainpage(request):
-return render_to_response('mainpage.html',
-  context_instance=RequestContext(request))
+return render(request, 'mainpage.html',)
 
 
 def legal_notice(request):
@@ -132,10 +129,9 @@
 
 txt = do_wl_markdown(txt, custom=False)
 
-return render_to_response('mainpage/developers.html',
-  {'developers': txt},
-

Re: [Widelands-dev] [Merge] lp:~trimardio/widelands-website/module_scheduling into lp:widelands-website

2018-02-17 Thread kaputtnik
This merged and deployed now.

Thanks Trimard for this feature and being that patient with my slow answers :-)
-- 
https://code.launchpad.net/~trimardio/widelands-website/module_scheduling/+merge/335570
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] [Merge] lp:~trimardio/widelands-website/module_scheduling into lp:widelands-website

2018-02-17 Thread noreply
The proposal to merge lp:~trimardio/widelands-website/module_scheduling into 
lp:widelands-website has been updated.

Status: Needs review => Merged

For more details, see:
https://code.launchpad.net/~trimardio/widelands-website/module_scheduling/+merge/335570
-- 
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/bug-1669230-lastbastion-finetune into lp:widelands

2018-02-17 Thread GunChleoc
I have left a comment in the bug - I think we need one more small building plot.

If you want to rename the map directory, please use bzr mv.
-- 
https://code.launchpad.net/~widelands-dev/widelands/bug-1669230-lastbastion-finetune/+merge/337083
Your team Widelands Developers is subscribed to branch 
lp:~widelands-dev/widelands/bug-1669230-lastbastion-finetune.

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

2018-02-17 Thread noreply
The proposal to merge lp:~widelands-dev/widelands/ai_militarysites_prohibited 
into lp:widelands has been updated.

Status: Needs review => Merged

For more details, see:
https://code.launchpad.net/~widelands-dev/widelands/ai_militarysites_prohibited/+merge/337822
-- 
Your team Widelands Developers is subscribed to branch 
lp:~widelands-dev/widelands/ai_militarysites_prohibited.

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

2018-02-17 Thread bunnybot
Continuous integration builds have changed state:

Travis build 3184. State: passed. Details: 
https://travis-ci.org/widelands/widelands/builds/342512052.
Appveyor build 2993. State: success. Details: 
https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_ai_militarysites_prohibited-2993.
-- 
https://code.launchpad.net/~widelands-dev/widelands/ai_militarysites_prohibited/+merge/337822
Your team Widelands Developers is subscribed to branch 
lp:~widelands-dev/widelands/ai_militarysites_prohibited.

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

2018-02-17 Thread bunnybot
Continuous integration builds have changed state:

Travis build 3183. State: failed. Details: 
https://travis-ci.org/widelands/widelands/builds/342511097.
Appveyor build 2992. State: success. Details: 
https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_string_fixes-2992.
-- 
https://code.launchpad.net/~widelands-dev/widelands/string-fixes/+merge/337849
Your team Widelands Developers is requested to review the proposed merge of 
lp:~widelands-dev/widelands/string-fixes 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/bug-1740141-map-horizon into lp:widelands

2018-02-17 Thread bunnybot
Continuous integration builds have changed state:

Travis build 3182. State: passed. Details: 
https://travis-ci.org/widelands/widelands/builds/342509354.
Appveyor build 2991. State: success. Details: 
https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_bug_1740141_map_horizon-2991.
-- 
https://code.launchpad.net/~widelands-dev/widelands/bug-1740141-map-horizon/+merge/337855
Your team Widelands Developers is requested to review the proposed merge of 
lp:~widelands-dev/widelands/bug-1740141-map-horizon 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/ai_militarysites_prohibited into lp:widelands

2018-02-17 Thread GunChleoc
@bunnybot merge
-- 
https://code.launchpad.net/~widelands-dev/widelands/ai_militarysites_prohibited/+merge/337822
Your team Widelands Developers is subscribed to branch 
lp:~widelands-dev/widelands/ai_militarysites_prohibited.

___
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