lp:~widelands-dev/widelands/new-shipping
Created by
Benedikt Straub
and last modified
Branch merges
Propose for merging
No branches
dependent on this one.
On hold
for merging
into
lp:widelands
- Klaus Halfmann: Needs Fixing
-
Diff: 1331 lines (+580/-227)13 files modifiedsrc/economy/fleet.cc (+150/-96)
src/economy/fleet.h (+4/-2)
src/economy/portdock.cc (+106/-65)
src/economy/portdock.h (+6/-3)
src/economy/shippingitem.cc (+13/-3)
src/economy/shippingitem.h (+2/-0)
src/economy/ware_instance.cc (+1/-1)
src/logic/map_objects/tribes/ship.cc (+238/-47)
src/logic/map_objects/tribes/ship.h (+20/-6)
src/scripting/lua_map.cc (+1/-1)
src/wui/seafaring_statistics_menu.cc (+1/-1)
src/wui/shipwindow.cc (+2/-2)
test/maps/expedition.wmf/scripting/test_no_double_colonizing.lua (+36/-0)
Related bugs
Related blueprints
Branch information
Recent revisions
This branch has not been scanned yet.
Branch metadata
- Branch format:
- Branch format 7
- Repository format:
- Bazaar repository format 2a (needs bzr 1.16 or later)
- Stacked on:
- lp:widelands