[Widelands-dev] [Merge] lp:~widelands-dev/widelands/atlanteans_cornfield into lp:widelands
The proposal to merge lp:~widelands-dev/widelands/atlanteans_cornfield into lp:widelands has been updated. Status: Needs review => Merged For more details, see: https://code.launchpad.net/~widelands-dev/widelands/atlanteans_cornfield/+merge/371209 -- Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/atlanteans_cornfield. ___ 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/atlanteans_cornfield into lp:widelands
Thanks, for testing :) Updated the media branch with the blend file and fraangs license. -- https://code.launchpad.net/~widelands-dev/widelands/atlanteans_cornfield/+merge/371209 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/atlanteans_cornfield. ___ 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/atlanteans_cornfield into lp:widelands
Review: Resubmit Sorry didn't applied the init.lua files sent by fraang, because they have changed in the meantime. The values are now taken from fraang, but i edited the main init.lua files from trunk. Looks good now imho. fraang had also changed the animate program for cornfield_ripe and applied a value of 45000. The result was that some ripe filed vanished without harvesting. So i leave the value from trunk and it seems to be correct. -- https://code.launchpad.net/~widelands-dev/widelands/atlanteans_cornfield/+merge/371209 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/atlanteans_cornfield. ___ 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/atlanteans_cornfield into lp:widelands
Continuous integration builds have changed state: Travis build 5318. State: passed. Details: https://travis-ci.org/widelands/widelands/builds/570927934. Appveyor build 5090. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_atlanteans_cornfield-5090. -- https://code.launchpad.net/~widelands-dev/widelands/atlanteans_cornfield/+merge/371209 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/atlanteans_cornfield 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/atlanteans_cornfield into lp:widelands
Just a reminder for me: Don't forget to update the media repo in case this get merged. -- https://code.launchpad.net/~widelands-dev/widelands/atlanteans_cornfield/+merge/371209 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/atlanteans_cornfield 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/atlanteans_cornfield into lp:widelands
kaputtnik has proposed merging lp:~widelands-dev/widelands/atlanteans_cornfield into lp:widelands. Commit message: New cornfield images for atlanteans by fraang Requested reviews: Widelands Developers (widelands-dev) For more details, see: https://code.launchpad.net/~widelands-dev/widelands/atlanteans_cornfield/+merge/371209 See: https://www.widelands.org/forum/topic/4406/ I have created the menu.png from idle_00.png by resizing. -- Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/atlanteans_cornfield into lp:widelands. === modified file 'data/tribes/immovables/cornfield/harvested/idle_00.png' Binary files data/tribes/immovables/cornfield/harvested/idle_00.png 2019-03-30 06:46:25 + and data/tribes/immovables/cornfield/harvested/idle_00.png 2019-08-12 15:56:05 + differ === added file 'data/tribes/immovables/cornfield/harvested/idle_01.png' Binary files data/tribes/immovables/cornfield/harvested/idle_01.png 1970-01-01 00:00:00 + and data/tribes/immovables/cornfield/harvested/idle_01.png 2019-08-12 15:56:05 + differ === added file 'data/tribes/immovables/cornfield/harvested/idle_02.png' Binary files data/tribes/immovables/cornfield/harvested/idle_02.png 1970-01-01 00:00:00 + and data/tribes/immovables/cornfield/harvested/idle_02.png 2019-08-12 15:56:05 + differ === added file 'data/tribes/immovables/cornfield/harvested/idle_03.png' Binary files data/tribes/immovables/cornfield/harvested/idle_03.png 1970-01-01 00:00:00 + and data/tribes/immovables/cornfield/harvested/idle_03.png 2019-08-12 15:56:05 + differ === added file 'data/tribes/immovables/cornfield/harvested/idle_04.png' Binary files data/tribes/immovables/cornfield/harvested/idle_04.png 1970-01-01 00:00:00 + and data/tribes/immovables/cornfield/harvested/idle_04.png 2019-08-12 15:56:05 + differ === modified file 'data/tribes/immovables/cornfield/harvested/menu.png' Binary files data/tribes/immovables/cornfield/harvested/menu.png 2019-05-29 09:02:33 + and data/tribes/immovables/cornfield/harvested/menu.png 2019-08-12 15:56:05 + differ === modified file 'data/tribes/immovables/cornfield/medium/idle_00.png' Binary files data/tribes/immovables/cornfield/medium/idle_00.png 2019-03-30 06:46:25 + and data/tribes/immovables/cornfield/medium/idle_00.png 2019-08-12 15:56:05 + differ === added file 'data/tribes/immovables/cornfield/medium/idle_01.png' Binary files data/tribes/immovables/cornfield/medium/idle_01.png 1970-01-01 00:00:00 + and data/tribes/immovables/cornfield/medium/idle_01.png 2019-08-12 15:56:05 + differ === added file 'data/tribes/immovables/cornfield/medium/idle_02.png' Binary files data/tribes/immovables/cornfield/medium/idle_02.png 1970-01-01 00:00:00 + and data/tribes/immovables/cornfield/medium/idle_02.png 2019-08-12 15:56:05 + differ === added file 'data/tribes/immovables/cornfield/medium/idle_03.png' Binary files data/tribes/immovables/cornfield/medium/idle_03.png 1970-01-01 00:00:00 + and data/tribes/immovables/cornfield/medium/idle_03.png 2019-08-12 15:56:05 + differ === added file 'data/tribes/immovables/cornfield/medium/idle_04.png' Binary files data/tribes/immovables/cornfield/medium/idle_04.png 1970-01-01 00:00:00 + and data/tribes/immovables/cornfield/medium/idle_04.png 2019-08-12 15:56:05 + differ === modified file 'data/tribes/immovables/cornfield/medium/menu.png' Binary files data/tribes/immovables/cornfield/medium/menu.png 2019-05-29 09:02:33 + and data/tribes/immovables/cornfield/medium/menu.png 2019-08-12 15:56:05 + differ === modified file 'data/tribes/immovables/cornfield/ripe/idle_00.png' Binary files data/tribes/immovables/cornfield/ripe/idle_00.png 2019-03-30 06:46:25 + and data/tribes/immovables/cornfield/ripe/idle_00.png 2019-08-12 15:56:05 + differ === added file 'data/tribes/immovables/cornfield/ripe/idle_01.png' Binary files data/tribes/immovables/cornfield/ripe/idle_01.png 1970-01-01 00:00:00 + and data/tribes/immovables/cornfield/ripe/idle_01.png 2019-08-12 15:56:05 + differ === added file 'data/tribes/immovables/cornfield/ripe/idle_02.png' Binary files data/tribes/immovables/cornfield/ripe/idle_02.png 1970-01-01 00:00:00 + and data/tribes/immovables/cornfield/ripe/idle_02.png 2019-08-12 15:56:05 + differ === added file 'data/tribes/immovables/cornfield/ripe/idle_03.png' Binary files data/tribes/immovables/cornfield/ripe/idle_03.png 1970-01-01 00:00:00 + and data/tribes/immovables/cornfield/ripe/idle_03.png 2019-08-12 15:56:05 + differ === added file 'data/tribes/immovables/cornfield/ripe/idle_04.png' Binary files data/tribes/immovables/cornfield/ripe/idle_04.png 1970-01-01 00:00:00 + and data/tribes/immovables/cornfield/ripe/idle_04.png 2019-08-12 15:56:05 + differ === modified file 'data/tribes/immovables/cornfield/ripe/menu.png' Binary files data/tribes/immovables/cornfield/ripe/menu.png 2019-05-29 09:02:33 +
