[Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1075562-initial-trainers into lp:widelands

2017-10-29 Thread noreply
The proposal to merge lp:~widelands-dev/widelands/bug-1075562-initial-trainers into lp:widelands has been updated. Status: Needs review => Merged For more details, see: https://code.launchpad.net/~widelands-dev/widelands/bug-1075562-initial-trainers/+merge/332959 -- Your team Widela

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1075562-initial-trainers into lp:widelands

2017-10-29 Thread kaputtnik
Why not merging? @bunnybot merge -- https://code.launchpad.net/~widelands-dev/widelands/bug-1075562-initial-trainers/+merge/332959 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/bug-1075562-initial-trainers. ___

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1075562-initial-trainers into lp:widelands

2017-10-28 Thread TiborB
Review: Approve Ok for me as well. -- https://code.launchpad.net/~widelands-dev/widelands/bug-1075562-initial-trainers/+merge/332959 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/bug-1075562-initial-trainers. ___

[Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1075562-initial-trainers into lp:widelands

2017-10-28 Thread Notabilis
The proposal to merge lp:~widelands-dev/widelands/bug-1075562-initial-trainers into lp:widelands has been updated. Commit Message changed to: Adding initial trainers to starting conditions. For more details, see: https://code.launchpad.net/~widelands-dev/widelands/bug-1075562-initial-trainers

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1075562-initial-trainers into lp:widelands

2017-10-28 Thread Notabilis
I added four trainers to the Trading Outpost condition. In this condition there are quite some additional workers available anyway, so why not also a trainer more than normal. The artifacts-error also happens with succeeding builds. The reason for the failure might be the missing

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1075562-initial-trainers into lp:widelands

2017-10-28 Thread Klaus Halfmann
Review: Approve review, compile, test Appveyor faled with > No artifacts found matching > 'Widelands-_widelands_dev_widelands_bug_1075562_initial_trainers-2530-Debug-x86.exe' > path No idea why this happens? But all 4 variants are OK Ichecekd the code and even started every variant. Fine foe

[Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1075562-initial-trainers into lp:widelands

2017-10-28 Thread bunnybot
/_widelands_dev_widelands_bug_1075562_initial_trainers-2530. -- https://code.launchpad.net/~widelands-dev/widelands/bug-1075562-initial-trainers/+merge/332959 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/bug-1075562-initial-trainers into lp:widelands

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1075562-initial-trainers into lp:widelands

2017-10-28 Thread kaputtnik
merge of lp:~widelands-dev/widelands/bug-1075562-initial-trainers 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

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1075562-initial-trainers into lp:widelands

2017-10-28 Thread Klaus Halfmann
/widelands/bug-1075562-initial-trainers 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-1075562-initial-trainers into lp:widelands

2017-10-28 Thread GunChleoc
osed merge of lp:~widelands-dev/widelands/bug-1075562-initial-trainers 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

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1075562-initial-trainers into lp:widelands

2017-10-28 Thread kaputtnik
merge of lp:~widelands-dev/widelands/bug-1075562-initial-trainers 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

[Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1075562-initial-trainers into lp:widelands

2017-10-28 Thread Notabilis
? -- Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/bug-1075562-initial-trainers into lp:widelands. === modified file 'data/tribes/scripting/starting_conditions/atlanteans/fortified_village.lua' --- data/tribes/scripting/starting_conditions/