It was done - had to be, and now it waits for merge approval...
2015-08-04 7:39 GMT+02:00 Holger Rapp :
>
> > On 30.07.2015, at 12:26, Tibor Bamhor wrote:
> >
> > When reworking a ship behaviour a bit I found small problem when testing
> > test_cancel_started_expedition_underway_two_ships.lua.
>
The proposal to merge lp:~widelands-dev/widelands/string-fixes into
lp:widelands has been updated.
Status: Needs review => Merged
For more details, see:
https://code.launchpad.net/~widelands-dev/widelands/string-fixes/+merge/266520
--
Your team Widelands Developers is subscribed to branch
Review: Approve
I reviewed offline and merged right after.
--
https://code.launchpad.net/~widelands-dev/widelands/string-fixes/+merge/266520
Your team Widelands Developers is subscribed to branch
lp:~widelands-dev/widelands/string-fixes.
___
Mailing l
Review: Approve
--
https://code.launchpad.net/~widelands-dev/widelands/bug-1375579/+merge/266060
Your team Widelands Developers is subscribed to branch
lp:~widelands-dev/widelands/bug-1375579.
___
Mailing list: https://launchpad.net/~widelands-dev
Po
> On 30.07.2015, at 12:26, Tibor Bamhor wrote:
>
> When reworking a ship behaviour a bit I found small problem when testing
> test_cancel_started_expedition_underway_two_ships.lua.
>
> Two ships and a port requesting a ship. The old implementation sends to the
> port only first ship in m_ship
I will merge my branch to trunk again...
2015-08-03 23:19 GMT+02:00 GunChleoc :
> Since the branch is already pushed and it's a small change, I'd say you
> can do the change directly on trunk - just make sure that you don't break
> anything.
>
> Or you can do it in this branch and merge it again.
Since the branch is already pushed and it's a small change, I'd say you can do
the change directly on trunk - just make sure that you don't break anything.
Or you can do it in this branch and merge it again.
--
https://code.launchpad.net/~widelands-dev/widelands/attack_fix/+merge/266796
Your tea
I fixed it in my branch in the meantime
--
https://code.launchpad.net/~widelands-dev/widelands/attack_fix/+merge/266796
Your team Widelands Developers is subscribed to branch
lp:~widelands-dev/widelands/attack_fix.
___
Mailing list: https://launchpad.n
no, I had to remember it. How to clean it up? Can we reverse trunk? Or commit
another revision to trunk?
--
https://code.launchpad.net/~widelands-dev/widelands/attack_fix/+merge/266796
Your team Widelands Developers is subscribed to branch
lp:~widelands-dev/widelands/attack_fix.
___
BTW there is another one: Wh->can_attack() && is_visible
Sorry, I was being lazy.
--
https://code.launchpad.net/~widelands-dev/widelands/attack_fix/+merge/266796
Your team Widelands Developers is subscribed to branch
lp:~widelands-dev/widelands/attack_fix.
__
The proposal to merge lp:~widelands-dev/widelands/attack_fix into lp:widelands
has been updated.
Status: Needs review => Merged
For more details, see:
https://code.launchpad.net/~widelands-dev/widelands/attack_fix/+merge/266796
--
Your team Widelands Developers is subscribed to branch
lp:~
I am going to change it - you are right
--
https://code.launchpad.net/~widelands-dev/widelands/attack_fix/+merge/266796
Your team Widelands Developers is subscribed to branch
lp:~widelands-dev/widelands/attack_fix.
___
Mailing list: https://launchpad.n
Review: Approve
Code LGTM - Just one question in the diff comments.
Diff comments:
> === modified file 'src/ai/defaultai.cc'
> --- src/ai/defaultai.cc 2015-07-27 20:25:32 +
> +++ src/ai/defaultai.cc 2015-08-03 20:07:16 +
> @@ -4907,7 +4911,7 @@
>
TiborB has proposed merging lp:~widelands-dev/widelands/attack_fix into
lp:widelands.
Requested reviews:
Widelands Developers (widelands-dev)
For more details, see:
https://code.launchpad.net/~widelands-dev/widelands/attack_fix/+merge/266796
This is purely (a quick) AI fix of attacking logic:
14 matches
Mail list logo
