widelands-dev team mailing list archive

[GunChleoc <fios@xxxxxxxxxxxxxxxxxxx>]

GunChleoc has proposed merging lp:~widelands-dev/widelands/food_icons into lp:widelands.

Requested reviews:
  Widelands Developers (widelands-dev)

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

New bread/snack/ration/meal icons for Barbarians and Empire by fraang.
License: Creative Commons Attribution - ShareAlike 3.0 Unported License http://creativecommons.org/licenses/by-sa/3.0/.

I don't know where I need to add the license information.
-- 
Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/food_icons into lp:widelands.

=== modified file 'tribes/barbarians/meal/conf'
--- tribes/barbarians/meal/conf	2014-07-28 14:04:36 +0000
+++ tribes/barbarians/meal/conf	2015-05-17 11:03:04 +0000
@@ -5,4 +5,4 @@
 
 [idle]
 pics=idle.png
-hotspot=6 11
+hotspot=6 6

=== modified file 'tribes/barbarians/meal/idle.png'
Binary files tribes/barbarians/meal/idle.png	2013-08-05 03:26:31 +0000 and tribes/barbarians/meal/idle.png	2015-05-17 11:03:04 +0000 differ
=== modified file 'tribes/barbarians/meal/menu.png'
Binary files tribes/barbarians/meal/menu.png	2009-11-11 21:29:34 +0000 and tribes/barbarians/meal/menu.png	2015-05-17 11:03:04 +0000 differ
=== modified file 'tribes/barbarians/pittabread/conf'
--- tribes/barbarians/pittabread/conf	2014-07-28 14:04:36 +0000
+++ tribes/barbarians/pittabread/conf	2015-05-17 11:03:04 +0000
@@ -4,5 +4,5 @@
 preciousness=4
 
 [idle]
-pics=bread_idle.png
-hotspot=5 11
+pics=idle.png
+hotspot=6 6

=== renamed file 'tribes/barbarians/pittabread/bread_idle.png' => 'tribes/barbarians/pittabread/idle.png'
Binary files tribes/barbarians/pittabread/bread_idle.png	2013-08-05 03:26:31 +0000 and tribes/barbarians/pittabread/idle.png	2015-05-17 11:03:04 +0000 differ
=== modified file 'tribes/barbarians/pittabread/menu.png'
Binary files tribes/barbarians/pittabread/menu.png	2009-11-11 21:29:34 +0000 and tribes/barbarians/pittabread/menu.png	2015-05-17 11:03:04 +0000 differ
=== modified file 'tribes/barbarians/ration/conf'
--- tribes/barbarians/ration/conf	2014-07-28 14:04:36 +0000
+++ tribes/barbarians/ration/conf	2015-05-17 11:03:04 +0000
@@ -1,8 +1,8 @@
-help=_A small bite to keep miners strong and working. Also the scout consumes rations on his scouting trips. Rations are produced in a tavern, an inn or a big inn out of fish or meat or pitta bread. 
+help=_A small bite to keep miners strong and working. Also the scout consumes rations on his scouting trips. Rations are produced in a tavern, an inn or a big inn out of fish or meat or pitta bread.
 
 default_target_quantity=20
 preciousness=5
 
 [idle]
 pics=idle.png
-hotspot=5 5
+hotspot=3 5

=== modified file 'tribes/barbarians/ration/idle.png'
Binary files tribes/barbarians/ration/idle.png	2013-08-05 03:26:31 +0000 and tribes/barbarians/ration/idle.png	2015-05-17 11:03:04 +0000 differ
=== modified file 'tribes/barbarians/ration/menu.png'
Binary files tribes/barbarians/ration/menu.png	2008-11-24 17:43:38 +0000 and tribes/barbarians/ration/menu.png	2015-05-17 11:03:04 +0000 differ
=== modified file 'tribes/barbarians/snack/conf'
--- tribes/barbarians/snack/conf	2014-07-28 14:04:36 +0000
+++ tribes/barbarians/snack/conf	2015-05-17 11:03:04 +0000
@@ -5,4 +5,4 @@
 
 [idle]
 pics=idle.png
-hotspot=7 8
+hotspot=5 5

=== modified file 'tribes/barbarians/snack/idle.png'
Binary files tribes/barbarians/snack/idle.png	2013-08-05 03:26:31 +0000 and tribes/barbarians/snack/idle.png	2015-05-17 11:03:04 +0000 differ
=== modified file 'tribes/barbarians/snack/menu.png'
Binary files tribes/barbarians/snack/menu.png	2009-11-12 01:02:38 +0000 and tribes/barbarians/snack/menu.png	2015-05-17 11:03:04 +0000 differ
=== modified file 'tribes/empire/bread/conf'
--- tribes/empire/bread/conf	2015-01-19 20:46:13 +0000
+++ tribes/empire/bread/conf	2015-05-17 11:03:04 +0000
@@ -4,5 +4,5 @@
 preciousness=5
 
 [idle]
-pics=bread_idle.png
-hotspot=5 11
+pics=idle.png
+hotspot=6 6

=== renamed file 'tribes/empire/bread/bread_idle.png' => 'tribes/empire/bread/idle.png'
Binary files tribes/empire/bread/bread_idle.png	2013-08-05 03:26:31 +0000 and tribes/empire/bread/idle.png	2015-05-17 11:03:04 +0000 differ
=== modified file 'tribes/empire/bread/menu.png'
Binary files tribes/empire/bread/menu.png	2009-11-12 11:10:29 +0000 and tribes/empire/bread/menu.png	2015-05-17 11:03:04 +0000 differ
=== modified file 'tribes/empire/meal/conf'
--- tribes/empire/meal/conf	2015-01-19 20:46:13 +0000
+++ tribes/empire/meal/conf	2015-05-17 11:03:04 +0000
@@ -5,4 +5,4 @@
 
 [idle]
 pics=idle.png
-hotspot=6 11
+hotspot=6 6

=== modified file 'tribes/empire/meal/idle.png'
Binary files tribes/empire/meal/idle.png	2013-08-05 03:26:31 +0000 and tribes/empire/meal/idle.png	2015-05-17 11:03:04 +0000 differ
=== modified file 'tribes/empire/meal/menu.png'
Binary files tribes/empire/meal/menu.png	2009-11-12 11:55:09 +0000 and tribes/empire/meal/menu.png	2015-05-17 11:03:04 +0000 differ
=== modified file 'tribes/empire/ration/conf'
--- tribes/empire/ration/conf	2015-01-19 20:46:13 +0000
+++ tribes/empire/ration/conf	2015-05-17 11:03:04 +0000
@@ -5,4 +5,4 @@
 
 [idle]
 pics=idle.png
-hotspot=5 5
+hotspot=3 5

=== modified file 'tribes/empire/ration/idle.png'
Binary files tribes/empire/ration/idle.png	2013-08-05 03:26:31 +0000 and tribes/empire/ration/idle.png	2015-05-17 11:03:04 +0000 differ
=== modified file 'tribes/empire/ration/menu.png'
Binary files tribes/empire/ration/menu.png	2008-11-24 17:59:11 +0000 and tribes/empire/ration/menu.png	2015-05-17 11:03:04 +0000 differ