No, no there shouldn't be a conflict.
@bunnybot merge
--
https://code.launchpad.net/~widelands-dev/widelands/bug-1538549-dismantle-enemy-buildings/+merge/290895
Your team Widelands Developers is subscribed to branch
lp:~widelands-dev/widelands/bug-1538549-dismantle-enemy-buildings.
GunChleoc has proposed merging
lp:~widelands-dev/widelands/bug-1526911-cursor-positioning into lp:widelands.
Commit message:
Some cursor fixes for edit boxes:
- Fixed cursor y position for empty Editboxes.
- Moved test for empty player names from editor player tool to map saving.
- In a new Multi
The proposal to merge
lp:~widelands-dev/widelands/bug-1538549-dismantle-enemy-buildings into
lp:widelands has been updated.
Status: Needs review => Merged
For more details, see:
https://code.launchpad.net/~widelands-dev/widelands/bug-1538549-dismantle-enemy-buildings/+merge/290895
--
Your
Ready for merge, any objections?
SirVer, can you appove?
--
https://code.launchpad.net/~widelands-dev/widelands/travis-clang-warnings/+merge/290697
Your team Widelands Developers is subscribed to branch
lp:~widelands-dev/widelands/travis-clang-warnings.
_
Thanks for cleaning up after me and for adding the documentation. I don't think
we need SirVer to look at this personally now.
@bunnybot merge
--
https://code.launchpad.net/~widelands-dev/widelands/travis-clang-warnings/+merge/290697
Your team Widelands Developers is subscribed to branch
lp:~wi
The proposal to merge lp:~widelands-dev/widelands/travis-clang-warnings into
lp:widelands has been updated.
Status: Needs review => Merged
For more details, see:
https://code.launchpad.net/~widelands-dev/widelands/travis-clang-warnings/+merge/290697
--
Your team Widelands Developers is subs
Continuous integration builds have changed state:
Travis build 962. State: failed. Details:
https://travis-ci.org/widelands/widelands/builds/120833342.
Appveyor build 795. State: success. Details:
https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_bug_1526911_
Hello Gun, what shall we do with this branch?
the code looks ok, as far as I could check.
As this branch is far away from trunk. we should either merge it
or give it up.
--
https://code.launchpad.net/~widelands-dev/widelands/bug-1548932-editor-save-zip/+merge/287036
Your team Widelands Developers
Continuous integration builds have changed state:
Travis build 967. State: passed. Details:
https://travis-ci.org/widelands/widelands/builds/120912395.
Appveyor build 800. State: success. Details:
https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_bug_1526911_
Lgtm!! Thanks :)
> Am 05.04.2016 um 11:03 schrieb Klaus Halfmann :
>
> Ready for merge, any objections?
>
> SirVer, can you appove?
> --
> https://code.launchpad.net/~widelands-dev/widelands/travis-clang-warnings/+merge/290697
> You are subscribed to branch lp:widelands.
--
https://code.launc
Continuous integration builds have changed state:
Travis build 968. State: failed. Details:
https://travis-ci.org/widelands/widelands/builds/120930924.
Appveyor build 801. State: success. Details:
https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_bug_1395322_
Review: Approve testing
I think this is much better :-)
--
https://code.launchpad.net/~widelands-dev/widelands/bug-1526911-cursor-positioning/+merge/290954
Your team Widelands Developers is subscribed to branch
lp:~widelands-dev/widelands/bug-1526911-cursor-positioning.
Review: Approve testing
Great :-)
--
https://code.launchpad.net/~widelands-dev/widelands/bug-1395322-tool3/+merge/290829
Your team Widelands Developers is subscribed to branch
lp:~widelands-dev/widelands/bug-1395322-tool3.
___
Mailing list: https://la
Continuous integration builds have changed state:
Travis build 969. State: errored. Details:
https://travis-ci.org/widelands/widelands/builds/120978837.
Appveyor build 802. State: success. Details:
https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_bug_1395322
Review: Approve code
Looks good code-wise.
--
https://code.launchpad.net/~widelands-dev/widelands/bug-1526911-cursor-positioning/+merge/290954
Your team Widelands Developers is subscribed to branch
lp:~widelands-dev/widelands/bug-1526911-cursor-positioning.
_
If we're going to be so specific, we should also mention that Shift or Ctrl +
Click removes map elements for Immovables, Animals and Port Space tools. Except
Ctrl + Click with the Port Space tool does placement instead of removal for
some reason. Perhaps we could fix this inconsistency? That wou
Thanks!
@bunnybot merge
--
https://code.launchpad.net/~widelands-dev/widelands/bug-1526911-cursor-positioning/+merge/290954
Your team Widelands Developers is subscribed to branch
lp:~widelands-dev/widelands/bug-1526911-cursor-positioning.
___
Mailing
The proposal to merge
lp:~widelands-dev/widelands/bug-1526911-cursor-positioning into lp:widelands
has been updated.
Status: Needs review => Merged
For more details, see:
https://code.launchpad.net/~widelands-dev/widelands/bug-1526911-cursor-positioning/+merge/290954
--
Your team Widelands
Yes, I think we should fix the inconsistency. Thanks for flagging it up!
I think the help is getting a bit crowded, too much for the user to remember.
So, I'd suggest explaining the general trends in the help function and adding
specific help to each tool as a tooltip.
--
https://code.launchpad
I don't know the reason why Ctrl is used to remove objects at all. In my
opinion there should be only one key for removing objects and use this key for
all objects. So for all objects:
Click: Place Objects or Increase (meaning 'add something')
Shift + Click: Remove Objects or Decrease (meaning '
20 matches
Mail list logo
