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

2016-01-23 Thread noreply
The proposal to merge lp:~widelands-dev/widelands/cricket_frog_sounds into 
lp:widelands has been updated.

Status: Needs review => Merged

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

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

2016-01-23 Thread kaputtnik
> Have you tested that this doesn't regress 
> https://bugs.launchpad.net/widelands/+bug/1522564? 

This branch regresses that bug. It looks likes the images are in an additional 
row. I attached a screenshot to the bug, look : 
https://bugs.launchpad.net/widelands/+bug/1522564/+attachment/4555267/+files/overlap.png

I am in hurry, want to test further this afternoon.

-- 
https://code.launchpad.net/~widelands-dev/widelands/memory_leak/+merge/283690
Your team Widelands Developers is requested to review the proposed merge of 
lp:~widelands-dev/widelands/memory_leak 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/string-fixes into lp:widelands

2016-01-23 Thread GunChleoc
GunChleoc has proposed merging lp:~widelands-dev/widelands/string-fixes into 
lp:widelands.

Commit message:
- Fixed numbering inconsistency in production program strings.

- Fixed Purpose helptext for Battle Ax.

Requested reviews:
  Widelands Developers (widelands-dev)
Related bugs:
  Bug #1421942 in widelands: "Unified term for "Black" and "Wasteland""
  https://bugs.launchpad.net/widelands/+bug/1421942
  Bug #1487887 in widelands: "Translation missing in editor and in replay 
tooltip"
  https://bugs.launchpad.net/widelands/+bug/1487887
  Bug #1530240 in widelands: "wrong text in the tribal encyclopedia for the 
battle ax"
  https://bugs.launchpad.net/widelands/+bug/1530240
  Bug #1530398 in widelands: "Wrong text above marble mine"
  https://bugs.launchpad.net/widelands/+bug/1530398

For more details, see:
https://code.launchpad.net/~widelands-dev/widelands/string-fixes/+merge/283712

2 string fixes - see commit message.
-- 
Your team Widelands Developers is requested to review the proposed merge of 
lp:~widelands-dev/widelands/string-fixes into lp:widelands.
=== modified file 'src/logic/map_objects/tribes/production_program.cc'
--- src/logic/map_objects/tribes/production_program.cc	2016-01-14 22:09:24 +
+++ src/logic/map_objects/tribes/production_program.cc	2016-01-23 10:26:46 +
@@ -1055,7 +1055,7 @@
 		count += item_pair.second;
 		std::string ware_descname = tribe.get_ware_descr(item_pair.first)->descname();
 		// TODO(GunChleoc): would be nice with pngettext whenever it gets added to xgettext for Lua.
-		if (1 < count) {
+		if (1 < item_pair.second || 1 < produced_wares_.size()) {
 			/** TRANSLATORS: This is an item in a list of wares, e.g. "Produced 2x Coal": */
 			/** TRANSLATORS:%%1$i = "2" */
 			/** TRANSLATORS:%2$s = "Coal" */
@@ -1151,7 +1151,7 @@
 		count += item_pair.second;
 		std::string worker_descname = tribe.get_worker_descr(item_pair.first)->descname();
 		// TODO(GunChleoc): would be nice with pngettext whenever it gets added to xgettext for Lua.
-		if (1 < count) {
+		if (1 < item_pair.second || 1 < recruited_workers_.size()) {
 			/** TRANSLATORS: This is an item in a list of workers, e.g. "Recruited 2x Ox": */
 			/** TRANSLATORS:%1$i = "2" */
 			/** TRANSLATORS:%2$s = "Ox" */

=== modified file 'tribes/wares/ax_battle/helptexts.lua'
--- tribes/wares/ax_battle/helptexts.lua	2015-11-08 15:47:14 +
+++ tribes/wares/ax_battle/helptexts.lua	2016-01-23 10:26:46 +
@@ -1,7 +1,7 @@
 function ware_helptext(tribe)
local helptext = {
   -- TRANSLATORS: Helptext for a ware: Battle Ax
-  barbarians = pgettext("barbarians_ware", "This is a dangerous weapon the Barbarians are able to produce. It is produced in the ax workshop. Only trained soldiers are able to wield such a weapon. It is used – together with food – in the training camp to train soldiers from attack level 3 to 4.")
+  barbarians = pgettext("barbarians_ware", "This is a dangerous weapon the Barbarians are able to produce. It is produced in the war mill. Only trained soldiers are able to wield such a weapon. It is used – together with food – in the training camp to train soldiers from attack level 3 to 4.")
}
local result = ""
if tribe then

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

2016-01-23 Thread GunChleoc
GunChleoc has proposed merging lp:~widelands-dev/widelands/bug-1530723 into 
lp:widelands.

Commit message:
WordWrap no longer checks the safety margin for empty text. This fixes a crash 
in the Game Results screen.

Requested reviews:
  Widelands Developers (widelands-dev)
Related bugs:
  Bug #1530723 in widelands: "worldwrap - game crash"
  https://bugs.launchpad.net/widelands/+bug/1530723

For more details, see:
https://code.launchpad.net/~widelands-dev/widelands/bug-1530723/+merge/283713

The game results screen for Collectors should no longer crash with an assert 
error.
-- 
Your team Widelands Developers is requested to review the proposed merge of 
lp:~widelands-dev/widelands/bug-1530723 into lp:widelands.
=== modified file 'src/graphic/wordwrap.cc'
--- src/graphic/wordwrap.cc	2015-12-13 18:35:45 +
+++ src/graphic/wordwrap.cc	2016-01-23 10:28:07 +
@@ -148,7 +148,7 @@
 	 uint32_t safety_margin)
 {
 	std::string::size_type minimum_chars = 1; // So we won't get empty lines
-	assert(m_wrapwidth > safety_margin);
+	assert(text.empty() || m_wrapwidth > safety_margin);
 
 	std::string::size_type orig_end = text.find('\n', line_start);
 	if (orig_end == std::string::npos)

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

2016-01-23 Thread bunnybot
Hi, I am bunnybot (https://github.com/widelands/bunnybot).

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

You can give me commands by starting a line with @bunnybot . I 
understand: 
 merge: Merges the source branch into the target branch, closing the merge 
proposal. I will use the proposed commit message if it is set.
-- 
https://code.launchpad.net/~widelands-dev/widelands/bug-1530723/+merge/283713
Your team Widelands Developers is requested to review the proposed merge of 
lp:~widelands-dev/widelands/bug-1530723 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...

2016-01-23 Thread bunnybot
Hi, I am bunnybot (https://github.com/widelands/bunnybot).

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

You can give me commands by starting a line with @bunnybot . I 
understand: 
 merge: Merges the source branch into the target branch, closing the merge 
proposal. I will use the proposed commit message if it is set.
-- 
https://code.launchpad.net/~widelands-dev/widelands/string-fixes/+merge/283712
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


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

2016-01-23 Thread Tino
Review: Approve

Travis and Appveyor build ok, should we merge?
-- 
https://code.launchpad.net/~widelands-dev/widelands/stricter_travis/+merge/282852
Your team Widelands Developers is subscribed to branch 
lp:~widelands-dev/widelands/stricter_travis.

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

2016-01-23 Thread GunChleoc
Review: Approve

LGTM :)

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

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

2016-01-23 Thread GunChleoc
The problem is that blitrect_scale doesn't crop.
-- 
https://code.launchpad.net/~widelands-dev/widelands/memory_leak/+merge/283690
Your team Widelands Developers is requested to review the proposed merge of 
lp:~widelands-dev/widelands/memory_leak 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/fix_editor_transparency_issue into lp:widelands

2016-01-23 Thread noreply
The proposal to merge lp:~widelands-dev/widelands/fix_editor_transparency_issue 
into lp:widelands has been updated.

Status: Needs review => Merged

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

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

2016-01-23 Thread SirVer
Okay.

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

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

2016-01-23 Thread noreply
The proposal to merge lp:~widelands-dev/widelands/stricter_travis into 
lp:widelands has been updated.

Status: Needs review => Merged

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

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

2016-01-23 Thread bunnybot
Travis build 348 has changed state to: passed. Details: 
https://travis-ci.org/widelands/widelands/builds/104266073.
-- 
https://code.launchpad.net/~widelands-dev/widelands/bug-1530723/+merge/283713
Your team Widelands Developers is requested to review the proposed merge of 
lp:~widelands-dev/widelands/bug-1530723 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/memory_leak into lp:widelands

2016-01-23 Thread kaputtnik
I get increasing memory for about 30-100k per second. Opening the message 
window does not increase the memory usage anymore.

All looks good, except the overlapping images in the message menu.

Do not approve, because bug 1522564 is linked here.
-- 
https://code.launchpad.net/~widelands-dev/widelands/memory_leak/+merge/283690
Your team Widelands Developers is requested to review the proposed merge of 
lp:~widelands-dev/widelands/memory_leak 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-1532279 into lp:widelands

2016-01-23 Thread GunChleoc
GunChleoc has proposed merging lp:~widelands-dev/widelands/bug-1532279 into 
lp:widelands.

Commit message:
Increased label height in spinboxes to avoid autogeneration of scrollbar button 
by the MultilineTextarea.

Requested reviews:
  Widelands Developers (widelands-dev)
Related bugs:
  Bug #1532279 in widelands: "Spin box not displayed correct in options menu"
  https://bugs.launchpad.net/widelands/+bug/1532279

For more details, see:
https://code.launchpad.net/~widelands-dev/widelands/bug-1532279/+merge/283720

The extra button belonged to the scrollbar generated by the label, which is a 
Multilinetextarea. So, I gave the label a bit more height.
-- 
Your team Widelands Developers is requested to review the proposed merge of 
lp:~widelands-dev/widelands/bug-1532279 into lp:widelands.
=== modified file 'src/ui_basic/spinbox.cc'
--- src/ui_basic/spinbox.cc	2016-01-01 18:41:20 +
+++ src/ui_basic/spinbox.cc	2016-01-23 14:28:11 +
@@ -108,7 +108,7 @@
 	uint32_t padding = 2;
 	uint32_t actual_w = std::max(w, unit_w);
 	uint32_t no_padding = (is_big ? 6 : 4);
-	uint32_t texth = UI::g_fh1->render(as_uifont("."))->height();
+	uint32_t texth = UI::g_fh1->render(as_uifont("."))->height() + 1;
 	uint32_t buttonh = 20;
 
 	// 40 is an ad hoc width estimate for the MultilineTextarea scrollbar + a bit of text.

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

2016-01-23 Thread GunChleoc
The proposal to merge lp:~widelands-dev/widelands/bug-1532279 into lp:widelands 
has been updated.

Status: Needs review => Work in progress

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

2016-01-23 Thread GunChleoc
GunChleoc has proposed merging lp:~widelands-dev/widelands/bug-1532279 into 
lp:widelands.

Commit message:
Increased label height in spinboxes to avoid autogeneration of scrollbar button 
by the MultilineTextarea.

Requested reviews:
  Widelands Developers (widelands-dev)
Related bugs:
  Bug #1532279 in widelands: "Spin box not displayed correct in options menu"
  https://bugs.launchpad.net/widelands/+bug/1532279

For more details, see:
https://code.launchpad.net/~widelands-dev/widelands/bug-1532279/+merge/283720

The extra button belonged to the scrollbar generated by the label, which is a 
Multilinetextarea. So, I gave the label a bit more height.
-- 
Your team Widelands Developers is requested to review the proposed merge of 
lp:~widelands-dev/widelands/bug-1532279 into lp:widelands.
=== modified file 'i18n/fonts.lua'
--- i18n/fonts.lua	2015-10-31 12:11:44 +
+++ i18n/fonts.lua	2016-01-23 14:51:39 +
@@ -46,7 +46,8 @@
 
devanagari = {
   serif = "Nakula/nakula.ttf",
-  direction = "rtl"
+  direction = "rtl",
+  size_offset = 2
},
 
hebrew = {
@@ -56,11 +57,13 @@
   sans = "Culmus/TaameyFrankCLM-Medium.ttf",
   sans_bold = "TaameyFrankCLM-Bold.ttf",
   sans_italic = "Culmus/TaameyFrankCLM-MediumOblique.ttf",
-  direction = "rtl"
+  direction = "rtl",
+  size_offset = 4
},
 
myanmar = {
   serif = "mmrCensus/mmrCensus.ttf",
+  size_offset = 2
},
 
sinhala = {

=== modified file 'src/ui_basic/spinbox.cc'
--- src/ui_basic/spinbox.cc	2016-01-01 18:41:20 +
+++ src/ui_basic/spinbox.cc	2016-01-23 14:51:39 +
@@ -108,7 +108,7 @@
 	uint32_t padding = 2;
 	uint32_t actual_w = std::max(w, unit_w);
 	uint32_t no_padding = (is_big ? 6 : 4);
-	uint32_t texth = UI::g_fh1->render(as_uifont("."))->height();
+	uint32_t texth = UI::g_fh1->render(as_uifont("."))->height() + 2;
 	uint32_t buttonh = 20;
 
 	// 40 is an ad hoc width estimate for the MultilineTextarea scrollbar + a bit of text.

=== modified file 'src/ui_fsmenu/options.cc'
--- src/ui_fsmenu/options.cc	2016-01-05 09:54:44 +
+++ src/ui_fsmenu/options.cc	2016-01-23 14:51:39 +
@@ -189,7 +189,7 @@
 
 	// Saving options
 	sb_autosave_
-		(&box_saving_, 0, 0, column_width_, 240,
+		(&box_saving_, 0, 0, column_width_, 250,
 		 opt.autosave / 60, 0, 100, _("Save game automatically every"),
 		 /** TRANSLATORS: Options: Save game automatically every: */
 		 /** TRANSLATORS: This will have a number added in front of it */
@@ -197,13 +197,13 @@
 		 g_gr->images().get("pics/but3.png"), UI::SpinBox::Type::kBig),
 
 	sb_rolling_autosave_
-		(&box_saving_, 0, 0, column_width_, 240,
+		(&box_saving_, 0, 0, column_width_, 250,
 		 opt.rolling_autosave, 1, 20, _("Maximum number of autosave files"),
 		 "",
 		 g_gr->images().get("pics/but3.png"), UI::SpinBox::Type::kBig),
 
 	sb_remove_replays_
-		(&box_saving_, 0, 0, column_width_, 240,
+		(&box_saving_, 0, 0, column_width_, 250,
 		 opt.remove_replays, 0, 365, _("Remove replays older than:"),
 		 /** TRANSLATORS: Options: Remove Replays older than: */
 		 /** TRANSLATORS: This will have a number added in front of it */

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

2016-01-23 Thread SirVer
The proposal to merge lp:~widelands-dev/widelands/memory_leak into lp:widelands 
has been updated.

Commit Message changed to:

- Fix big memory leak and extra work in UI::Table::draw.
- Fix a couple of minor memory leaks around the code I found using the Leaks 
tool in Apple's Instruments.
- Correctly crop destination and source rectangle while blitting.

Major leak explanation:
On each frame we created a downscaled texture if the image of a table entry was 
too small and leaked this texture immediately. This extra scaling work we did 
there was even unnecessary since OpenGL can scale down images while blitting 
for free.

Deleted that rescaling code, which makes the texture creation unnecessary, gets 
rid of the memory leak and also buys CPU cycles since a lot of work is now 
never done.

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

2016-01-23 Thread SirVer
> I get increasing memory for about 30-100k per second.

Does this ever stop or grow boundless? 

I just pushed a commit that should fix bug 1522564 too. This is ready for code 
review and another round of testing.
-- 
https://code.launchpad.net/~widelands-dev/widelands/memory_leak/+merge/283690
Your team Widelands Developers is requested to review the proposed merge of 
lp:~widelands-dev/widelands/memory_leak 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...

2016-01-23 Thread bunnybot
Hi, I am bunnybot (https://github.com/widelands/bunnybot).

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

You can give me commands by starting a line with @bunnybot . I 
understand: 
 merge: Merges the source branch into the target branch, closing the merge 
proposal. I will use the proposed commit message if it is set.
-- 
https://code.launchpad.net/~widelands-dev/widelands/bug-1532279/+merge/283720
Your team Widelands Developers is requested to review the proposed merge of 
lp:~widelands-dev/widelands/bug-1532279 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/bug-1530723 into lp:widelands

2016-01-23 Thread kaputtnik
Review: Approve functionality

No crash anymore when winning a game :-)
-- 
https://code.launchpad.net/~widelands-dev/widelands/bug-1530723/+merge/283713
Your team Widelands Developers is subscribed to branch 
lp:~widelands-dev/widelands/bug-1530723.

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

2016-01-23 Thread kaputtnik
It increases boundless. I believe this caused by the wares which are 
produced... but i am not sure.

Today i have no time anymore for testing.
-- 
https://code.launchpad.net/~widelands-dev/widelands/memory_leak/+merge/283690
Your team Widelands Developers is requested to review the proposed merge of 
lp:~widelands-dev/widelands/memory_leak 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/codecheck_compiler_fixes into lp:widelands

2016-01-23 Thread GunChleoc
GunChleoc has proposed merging 
lp:~widelands-dev/widelands/codecheck_compiler_fixes into lp:widelands.

Commit message:
- Fixed some codecheck and compiler warnings
- Fixed crash with assert in launch_mpg when selection of game or map to load 
is cancelled.

Requested reviews:
  Widelands Developers (widelands-dev)

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

- Fixed some codecheck and compiler warnings
- Fixed crash with assert in launch_mpg when selection of game or map to load 
is cancelled.
-- 
Your team Widelands Developers is requested to review the proposed merge of 
lp:~widelands-dev/widelands/codecheck_compiler_fixes into lp:widelands.
=== modified file 'src/graphic/text/sdl_ttf_font.cc'
--- src/graphic/text/sdl_ttf_font.cc	2016-01-19 08:55:16 +
+++ src/graphic/text/sdl_ttf_font.cc	2016-01-23 16:04:34 +
@@ -19,6 +19,8 @@
 
 #include "graphic/text/sdl_ttf_font.h"
 
+#include 
+
 #include 
 #include 
 #include 

=== modified file 'src/graphic/texture_cache.cc'
--- src/graphic/texture_cache.cc	2016-01-19 08:55:16 +
+++ src/graphic/texture_cache.cc	2016-01-23 16:04:34 +
@@ -19,12 +19,12 @@
 
 #include "graphic/texture_cache.h"
 
+#include 
 #include 
 
 #include 
 
 #include "graphic/texture.h"
-#include "base/log.h" // NOCOM(#sirver): remove again
 
 // The implementation took inspiration from
 // http://timday.bitbucket.org/lru.html, but our use case here is a little

=== modified file 'src/ui_fsmenu/launch_mpg.cc'
--- src/ui_fsmenu/launch_mpg.cc	2016-01-17 08:29:59 +
+++ src/ui_fsmenu/launch_mpg.cc	2016-01-23 16:04:34 +
@@ -348,14 +348,12 @@
 		(this, m_ctrl, get_w() / 3, get_h() / 4);
 	auto result = selection_window.run();
 	assert(result == FullscreenMenuBase::MenuTarget::kNormalGame ||
-	   result == FullscreenMenuBase::MenuTarget::kScenarioGame);
-	switch (result) {
-		case FullscreenMenuBase::MenuTarget::kNormalGame:
-			select_map();
-			break;
-		case FullscreenMenuBase::MenuTarget::kScenarioGame:
-			select_saved_game();
-			break;
+	   result == FullscreenMenuBase::MenuTarget::kScenarioGame ||
+	   result == FullscreenMenuBase::MenuTarget::kBack);
+	if (result == FullscreenMenuBase::MenuTarget::kNormalGame) {
+		select_map();
+	} else if (result == FullscreenMenuBase::MenuTarget::kScenarioGame) {
+		select_saved_game();
 	}
 }
 

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

2016-01-23 Thread GunChleoc
The proposal to merge lp:~widelands-dev/widelands/bug-1532279 into lp:widelands 
has been updated.

Commit Message changed to:

- Increased label height in spinboxes to avoid autogeneration of scrollbar 
button by the MultilineTextarea.
- Added size offset to some fonts that were too small.

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

2016-01-23 Thread bunnybot
Hi, I am bunnybot (https://github.com/widelands/bunnybot).

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

You can give me commands by starting a line with @bunnybot . I 
understand: 
 merge: Merges the source branch into the target branch, closing the merge 
proposal. I will use the proposed commit message if it is set.
-- 
https://code.launchpad.net/~widelands-dev/widelands/codecheck_compiler_fixes/+merge/283722
Your team Widelands Developers is requested to review the proposed merge of 
lp:~widelands-dev/widelands/codecheck_compiler_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-1537157 into lp:widelands

2016-01-23 Thread GunChleoc
GunChleoc has proposed merging lp:~widelands-dev/widelands/bug-1537157 into 
lp:widelands.

Commit message:
Changed msgxctxt variable for Productionsites from char* to std::string to fix 
problem with loading descname translations.

Requested reviews:
  Widelands Developers (widelands-dev)
Related bugs:
  Bug #1537157 in widelands: "Translations for some building names  are missing"
  https://bugs.launchpad.net/widelands/+bug/1537157

For more details, see:
https://code.launchpad.net/~widelands-dev/widelands/bug-1537157/+merge/283724

Changed msgxctxt variable for Productionsites from char* to std::string to fix 
problem with loading descname translations.
-- 
Your team Widelands Developers is requested to review the proposed merge of 
lp:~widelands-dev/widelands/bug-1537157 into lp:widelands.
=== modified file 'src/logic/map_objects/tribes/productionsite.cc'
--- src/logic/map_objects/tribes/productionsite.cc	2016-01-17 08:29:59 +
+++ src/logic/map_objects/tribes/productionsite.cc	2016-01-23 16:38:15 +
@@ -55,7 +55,7 @@
 */
 
 ProductionSiteDescr::ProductionSiteDescr
-	(const std::string& init_descname, const char* msgctxt, MapObjectType _type,
+	(const std::string& init_descname, const std::string& msgctxt, MapObjectType _type,
 	 const LuaTable& table, const EditorGameBase& egbase)
 	: BuildingDescr(init_descname, _type, table, egbase),
 	  m_out_of_resource_title(""),
@@ -70,7 +70,7 @@
 		items_table = table.get_table("out_of_resource_notification");
 		m_out_of_resource_title = _(items_table->get_string("title"));
 		m_out_of_resource_heading = _(items_table->get_string("heading"));
-		m_out_of_resource_message = pgettext_expr(msgctxt, items_table->get_string("message").c_str());
+		m_out_of_resource_message = pgettext_expr(msgctxt.c_str(), items_table->get_string("message").c_str());
 		if (items_table->has_key("productivity_threshold")) {
 			out_of_resource_productivity_threshold_ = items_table->get_int("productivity_threshold");
 		}
@@ -192,7 +192,7 @@
 
 ProductionSiteDescr::ProductionSiteDescr
 	(const std::string& init_descname,
-	 const char* msgctxt,
+	 const std::string& msgctxt,
 	 const LuaTable& table,
 	 const EditorGameBase& egbase)
 	: ProductionSiteDescr(init_descname, msgctxt, MapObjectType::PRODUCTIONSITE, table, egbase)

=== modified file 'src/logic/map_objects/tribes/productionsite.h'
--- src/logic/map_objects/tribes/productionsite.h	2015-12-11 19:06:50 +
+++ src/logic/map_objects/tribes/productionsite.h	2016-01-23 16:38:15 +
@@ -58,9 +58,9 @@
 public:
 	friend struct ProductionProgram; // To add animations
 
-	ProductionSiteDescr(const std::string& init_descname, const char* msgctxt, MapObjectType type,
+	ProductionSiteDescr(const std::string& init_descname, const std::string& msgctxt, MapObjectType type,
 			  const LuaTable& t, const EditorGameBase& egbase);
-	ProductionSiteDescr(const std::string& init_descname, const char* msgctxt,
+	ProductionSiteDescr(const std::string& init_descname, const std::string& msgctxt,
 			  const LuaTable& t, const EditorGameBase& egbase);
 
 	Building & create_object() const override;

=== modified file 'src/logic/map_objects/tribes/tribes.cc'
--- src/logic/map_objects/tribes/tribes.cc	2016-01-18 19:35:25 +
+++ src/logic/map_objects/tribes/tribes.cc	2016-01-23 16:38:15 +
@@ -108,10 +108,10 @@
 
 void Tribes::add_productionsite_type(const LuaTable& table, const EditorGameBase& egbase) {
 	i18n::Textdomain td("tribes");
-	const char* msgctxt = table.get_string("msgctxt").c_str();
+	const std::string msgctxt = table.get_string("msgctxt");
 	buildings_->add(
 new ProductionSiteDescr(
-	pgettext_expr(msgctxt, table.get_string("descname").c_str()),
+	pgettext_expr(msgctxt.c_str(), table.get_string("descname").c_str()),
 	msgctxt,
 	table,
 	egbase));

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

2016-01-23 Thread bunnybot
Hi, I am bunnybot (https://github.com/widelands/bunnybot).

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

You can give me commands by starting a line with @bunnybot . I 
understand: 
 merge: Merges the source branch into the target branch, closing the merge 
proposal. I will use the proposed commit message if it is set.
-- 
https://code.launchpad.net/~widelands-dev/widelands/bug-1537157/+merge/283724
Your team Widelands Developers is requested to review the proposed merge of 
lp:~widelands-dev/widelands/bug-1537157 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/bug-1537157 into lp:widelands

2016-01-23 Thread Tino
Review: Approve

LGTM. Compiled and tested, no untranslated strings any longer!
-- 
https://code.launchpad.net/~widelands-dev/widelands/bug-1537157/+merge/283724
Your team Widelands Developers is subscribed to branch 
lp:~widelands-dev/widelands/bug-1537157.

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

2016-01-23 Thread bunnybot
Travis build 352 has changed state to: passed. Details: 
https://travis-ci.org/widelands/widelands/builds/104286335.
-- 
https://code.launchpad.net/~widelands-dev/widelands/string-fixes/+merge/283712
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


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

2016-01-23 Thread Tino
Review: Approve

I do not experience any more memory leaking on windows.
And no overlapping icons in the message menu. 
-- 
https://code.launchpad.net/~widelands-dev/widelands/memory_leak/+merge/283690
Your team Widelands Developers is subscribed to branch 
lp:~widelands-dev/widelands/memory_leak.

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

2016-01-23 Thread bunnybot
Travis build 353 has changed state to: passed. Details: 
https://travis-ci.org/widelands/widelands/builds/104294117.
-- 
https://code.launchpad.net/~widelands-dev/widelands/bug-1532279/+merge/283720
Your team Widelands Developers is requested to review the proposed merge of 
lp:~widelands-dev/widelands/bug-1532279 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...

2016-01-23 Thread bunnybot
Travis build 354 has changed state to: failed. Details: 
https://travis-ci.org/widelands/widelands/builds/104294390.
-- 
https://code.launchpad.net/~widelands-dev/widelands/memory_leak/+merge/283690
Your team Widelands Developers is subscribed to branch 
lp:~widelands-dev/widelands/memory_leak.

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

2016-01-23 Thread TiborB
The proposal to merge lp:~widelands-dev/widelands/ai_ship_tweaks into 
lp:widelands has been updated.

Commit Message changed to:

- Ships now get own names, picked from lists per tribe.
- reworked the way how AI manages expeditions
- Reworked the way how AI stores some date in Player object 
(GamePlayerAiPersistentPacket)
- added LUA interface to ship - RO property shipname
- one regression test added

For more details, see:
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


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

2016-01-23 Thread TiborB
OK, all incorporated. Will we wait for Travis build status? 
-- 
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


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

2016-01-23 Thread TiborB
Review: Approve

Code looks good :)

my first bunnybot merge:)

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

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

2016-01-23 Thread noreply
The proposal to merge lp:~widelands-dev/widelands/bug-1530723 into lp:widelands 
has been updated.

Status: Needs review => Merged

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

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

2016-01-23 Thread SirVer
Naaa, what cam Possibly go wrong :)

Yolo

@bunnybot merge 

> Am 23.01.2016 um 20:42 schrieb TiborB :
> 
> OK, all incorporated. Will we wait for Travis build status? 
> -- 
> https://code.launchpad.net/~widelands-dev/widelands/ai_ship_tweaks/+merge/280192
> You are reviewing the proposed merge of 
> lp:~widelands-dev/widelands/ai_ship_tweaks into lp:widelands.

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


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

2016-01-23 Thread TiborB
OK! I am glad I got rid of this finally :)
-- 
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...

2016-01-23 Thread bunnybot
Bunnybot encountered an error while working on this merge proposal:

Running 'bzr merge ../_widelands_dev_widelands_ai_ship_tweaks' failed. Output:

+N  src/game_io/game_player_ai_persistent_packet.cc
+N  src/game_io/game_player_ai_persistent_packet.h
+N  test/maps/ship_transportation.wmf/scripting/test_many_ships.lua
 M  src/ai/ai_help_structs.h
 M  src/ai/defaultai.cc
 M  src/ai/defaultai.h
 M  src/game_io/CMakeLists.txt
 M  src/game_io/game_data_packet.h
 M  src/game_io/game_loader.cc
 M  src/game_io/game_player_info_packet.cc
 M  src/game_io/game_saver.cc
 M  src/logic/map_objects/tribes/ship.cc
 M  src/logic/map_objects/tribes/ship.h
 M  src/logic/map_objects/tribes/tribe_descr.cc
 M  src/logic/map_objects/tribes/tribe_descr.h
 M  src/logic/player.cc
 M  src/logic/player.h
 M  src/map_io/map_allowed_building_types_packet.cc
 M  src/scripting/lua_map.cc
 M  src/scripting/lua_map.h
 M  src/wui/shipwindow.cc
 M  tribes/atlanteans.lua
 M  tribes/barbarians.lua
 M  tribes/buildings/trainingsites/atlanteans/labyrinth/init.lua
 M  tribes/buildings/trainingsites/empire/colosseum/init.lua
 M  tribes/empire.lua
Text conflict in src/ai/defaultai.cc
1 conflicts encountered.

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

2016-01-23 Thread bunnybot
Travis build 357 has changed state to: failed. Details: 
https://travis-ci.org/widelands/widelands/builds/104304983.
-- 
https://code.launchpad.net/~widelands-dev/widelands/codecheck_compiler_fixes/+merge/283722
Your team Widelands Developers is requested to review the proposed merge of 
lp:~widelands-dev/widelands/codecheck_compiler_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] Bunnybot says...

2016-01-23 Thread bunnybot
Travis build 358 has changed state to: failed. Details: 
https://travis-ci.org/widelands/widelands/builds/104307496.
-- 
https://code.launchpad.net/~widelands-dev/widelands/bug-1537157/+merge/283724
Your team Widelands Developers is subscribed to branch 
lp:~widelands-dev/widelands/bug-1537157.

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

2016-01-23 Thread GunChleoc
Review: Approve

Graphics now look OK on Ubuntu. Code LGTM.

Travis fail is because of Codecheck - I fixed all but 1 Codecheck warning in 
https://code.launchpad.net/~widelands-dev/widelands/codecheck_compiler_fixes/+merge/283722.
-- 
https://code.launchpad.net/~widelands-dev/widelands/memory_leak/+merge/283690
Your team Widelands Developers is subscribed to branch 
lp:~widelands-dev/widelands/memory_leak.

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

2016-01-23 Thread GunChleoc
I'll merge this without bunnybot, because the problem is with codecheck in 
trunk.
-- 
https://code.launchpad.net/~widelands-dev/widelands/bug-1537157/+merge/283724
Your team Widelands Developers is subscribed to branch 
lp:~widelands-dev/widelands/bug-1537157.

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

2016-01-23 Thread SirVer
I am sorry about the codecheck in master :( That's what you get if you think a 
small chance is not worthy of code review :/

You can still use bunnybot if you want, it does not require travis to pass.
-- 
https://code.launchpad.net/~widelands-dev/widelands/bug-1537157/+merge/283724
Your team Widelands Developers is subscribed to branch 
lp:~widelands-dev/widelands/bug-1537157.

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

2016-01-23 Thread SirVer
Review: Approve

code lgtm
-- 
https://code.launchpad.net/~widelands-dev/widelands/bug-1537157/+merge/283724
Your team Widelands Developers is subscribed to branch 
lp:~widelands-dev/widelands/bug-1537157.

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

2016-01-23 Thread GunChleoc
OK, SirVer just fixed, so I'll merge trunk instead.
-- 
https://code.launchpad.net/~widelands-dev/widelands/bug-1537157/+merge/283724
Your team Widelands Developers is subscribed to branch 
lp:~widelands-dev/widelands/bug-1537157.

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

2016-01-23 Thread SirVer
Review: Approve

lgtm. 

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

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

2016-01-23 Thread SirVer
Seems like you need to merge trunk before merging.
-- 
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/codecheck_compiler_fixes into lp:widelands

2016-01-23 Thread GunChleoc
The proposal to merge lp:~widelands-dev/widelands/codecheck_compiler_fixes into 
lp:widelands has been updated.

Commit Message changed to:

- Fixed some compiler warnings
- Fixed crash with assert in launch_mpg when selection of game or map to load 
is cancelled.

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

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

2016-01-23 Thread GunChleoc
@bunnybot merge
-- 
https://code.launchpad.net/~widelands-dev/widelands/bug-1537157/+merge/283724
Your team Widelands Developers is subscribed to branch 
lp:~widelands-dev/widelands/bug-1537157.

___
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