@bunnybot merge
--
https://code.launchpad.net/~widelands-dev/widelands/file_not_found_message/+merge/285442
Your team Widelands Developers is subscribed to branch
lp:~widelands-dev/widelands/file_not_found_message.
___
Mailing list: https://launchpad.n
No change, this is for LayeredFilesystem only.
I can have a look at ZipFilesystem too though in a new branch :)
--
https://code.launchpad.net/~widelands-dev/widelands/file_not_found_message/+merge/285442
Your team Widelands Developers is subscribed to branch
lp:~widelands-dev/widelands/file_not_
I really dont think we need another rule - minimal distance between ports.
I will prepare new branch with my suggestion for your review.
Also we can limit fields for portdock - to 1 is OK, but also 2 would be fine. I
dont think that ports can be that close that there want be enough fields for
2
The proposal to merge lp:~widelands-dev/widelands/ship_and_portspaces into
lp:widelands has been updated.
Status: Needs review => Merged
For more details, see:
https://code.launchpad.net/~widelands-dev/widelands/ship_and_portspaces/+merge/285409
--
Your team Widelands Developers is subscrib
@bunnybot merge
--
https://code.launchpad.net/~widelands-dev/widelands/ship_and_portspaces/+merge/285409
Your team Widelands Developers is subscribed to branch
lp:~widelands-dev/widelands/ship_and_portspaces.
___
Mailing list: https://launchpad.net/~wi
Review: Needs Fixing
I suggest to simplify the code.
Diff comments:
>
> === modified file 'src/logic/map.cc'
> --- src/logic/map.cc 2016-02-07 09:30:20 +
> +++ src/logic/map.cc 2016-02-10 08:20:28 +
> @@ -2121,11 +2121,15 @@
> return false;
> }
>
> -bool Map::has_artifacts(co
Bunnybot encountered an error while working on this merge proposal:
'ascii' codec can't encode character u'\xa0' in position 152: ordinal not in
range(128)
--
https://code.launchpad.net/~widelands-dev/widelands/ship_and_portspaces/+merge/285409
Your team Widelands Developers is subscribed to bra
Review: Approve
lgtm.
What does this print for zip filesystems?
--
https://code.launchpad.net/~widelands-dev/widelands/file_not_found_message/+merge/285442
Your team Widelands Developers is subscribed to branch
lp:~widelands-dev/widelands/file_not_found_message.
__
> I think even portdock consisting one field would be still sufficient for
> port's operation...
I think that is the best solution, make the portdock one field only.
> I dont agree, especially for AI - it can easily 'miss' a portspace so
> multiple port spaces even in a tight line is better for
Gun, this still waits for your testing approval before I can clean it up and
get it in.
--
https://code.launchpad.net/~widelands-dev/widelands/beautiful_correct_lines/+merge/284517
Your team Widelands Developers is subscribed to branch
lp:~widelands-dev/widelands/beautiful_correct_lines.
__
Continuous integration builds have changed state:
Travis build 659. State: passed. Details:
https://travis-ci.org/widelands/widelands/builds/108382709.
Appveyor build 515. State: success. Details:
https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_bug_1543944_
The proposal to merge lp:~widelands-dev/widelands-website/add_hints into
lp:widelands-website has been updated.
Description changed to:
* Add hints filed to show on the website.
* Uploader description could be edited.
* Added exception for KeyError
* Did some style changes.
I ran pyformat over
kaputtnik has proposed merging lp:~widelands-dev/widelands-website/add_hints
into lp:widelands-website.
Commit message:
Add hints-field to the description of the maps.
Requested reviews:
Widelands Developers (widelands-dev)
Related bugs:
Bug #1542449 in Widelands Website: "Display map->hint
GunChleoc has proposed merging
lp:~widelands-dev/widelands/bug-1543944-suggested-teams into lp:widelands.
Commit message:
- Fixed indexing error in SuggestedTeamsBox that would cause a crash
- Added Widelands version to log output
- Added map names to scoped timer for map loading/saving.
Request
> Good idea of adding the map name to the output though; I will look into it.
If possible please also add the current widelands version to the output. I am
always searching for it and have to start widelands (or investigate the VERSION
file) to get it.
--
https://code.launchpad.net/~widelands-d
Review: Approve testing
Testing went OK.
--
https://code.launchpad.net/~widelands-dev/widelands/ship_and_portspaces/+merge/285409
Your team Widelands Developers is subscribed to branch
lp:~widelands-dev/widelands/ship_and_portspaces.
___
Mailing list:
Review: Approve code
I still want to do some testing, but code LGTM - just a few minor nits :)
Diff comments:
>
> === modified file 'src/logic/map_objects/tribes/ship.cc'
> --- src/logic/map_objects/tribes/ship.cc 2016-02-08 08:01:21 +
> +++ src/logic/map_objects/tribes/ship.cc 20
> I would also fix find_portdock function
+1
--
https://code.launchpad.net/~widelands-dev/widelands/ship_and_portspaces/+merge/285409
Your team Widelands Developers is requested to review the proposed merge of
lp:~widelands-dev/widelands/ship_and_portspaces into lp:widelands.
__
Putting this on hold to save Travis some work.
--
https://code.launchpad.net/~widelands-dev/widelands/editor_help/+merge/283900
Your team Widelands Developers is subscribed to branch
lp:~widelands-dev/widelands/editor_help.
___
Mailing list: https://la
The proposal to merge lp:~widelands-dev/widelands/editor_help into lp:widelands
has been updated.
Status: Needs review => Work in progress
For more details, see:
https://code.launchpad.net/~widelands-dev/widelands/editor_help/+merge/283900
--
Your team Widelands Developers is subscribed to
Continuous integration builds have changed state:
Travis build 656. State: passed. Details:
https://travis-ci.org/widelands/widelands/builds/108226507.
Appveyor build 512. State: success. Details:
https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_bug_1525706_
This changed function is only called during saving, and it only adds a tag or
not, so it's not related to the crash. Good idea of adding the map name to the
output though; I will look into it.
--
https://code.launchpad.net/~widelands-dev/widelands/bug-1525706-artifacts/+merge/285566
Your team Wi
Continuous integration builds have changed state:
Travis build 655. State: passed. Details:
https://travis-ci.org/widelands/widelands/builds/108128096.
Appveyor build 511. State: success. Details:
https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_fit_button_t
Seems to work properly now :-)
I got one crash after several load/save actions in the editor, but i don't know
if this is related to this branch or in general to bug 1543944. The crash
happens after loading a map and the output says:
WidelandsMapLoader::load_map_complete() took 356ms
The proposal to merge lp:~widelands-dev/widelands/ai_trainingsites_tweaks into
lp:widelands has been updated.
Status: Needs review => Merged
For more details, see:
https://code.launchpad.net/~widelands-dev/widelands/ai_trainingsites_tweaks/+merge/285459
--
Your team Widelands Developers is
@bunnybot merge
--
https://code.launchpad.net/~widelands-dev/widelands/ai_trainingsites_tweaks/+merge/285459
Your team Widelands Developers is subscribed to branch
lp:~widelands-dev/widelands/ai_trainingsites_tweaks.
___
Mailing list: https://launchpad
GunChleoc has proposed merging
lp:~widelands-dev/widelands/bug-1525706-artifacts into lp:widelands.
Commit message:
Fixed checking for artifacts on a map.
Requested reviews:
Widelands Developers (widelands-dev)
Related bugs:
Bug #1525706 in widelands: "Wincondition artifacts could be choosen
Continuous integration builds have changed state:
Travis build 654. State: passed. Details:
https://travis-ci.org/widelands/widelands/builds/108123026.
Appveyor build 510. State: success. Details:
https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_ai_trainings
28 matches
Mail list logo