← Back to branch summary

~widelands-dev/widelands/trunk

~widelands-dev/widelands/trunk

Viewing all changes in revision 6101.

Committer: Nicolai Hähnle
Date: 2011-11-14 20:15:13 UTC
mfrom: (5800.2.30 seafaring)
Revision ID: prefect_@gmx.net-20111114201513-yrov3nkhqj3zjksn

Merge seafaring branch

files added:
pics/menu_ship_destination.png

pics/menu_ship_goto.png

pics/menu_tab_wares_dock.png

pics/menu_tab_workers_dock.png

pics/port.png

src/economy/fleet.cc

src/economy/fleet.h

src/economy/portdock.cc

src/economy/portdock.h

src/economy/shippingitem.cc

src/economy/shippingitem.h

src/logic/findbob.cc

src/logic/findbob.h

src/logic/mapastar.cc

src/logic/mapastar.h

src/logic/wareworker.h

src/wui/itemwaresdisplay.cc

src/wui/itemwaresdisplay.h

src/wui/portdockwaresdisplay.cc

src/wui/portdockwaresdisplay.h

src/wui/shipwindow.cc

tribes/atlanteans/port

tribes/atlanteans/port/conf

tribes/atlanteans/port/menu.png

tribes/atlanteans/port/port_i_00.png

tribes/atlanteans/port/port_i_00_pc.png

files modified:
src/economy/economy.cc

src/economy/economy.h

src/economy/flag.cc

src/economy/flag.h

src/economy/idleworkersupply.cc

src/economy/request.cc

src/economy/request.h

src/economy/road.cc

src/economy/router.cc

src/economy/router.h

src/economy/routing_node.h

src/economy/test/test_routing.cc

src/economy/transfer.cc

src/economy/ware_instance.cc

src/economy/ware_instance.h

src/economy/wares_queue.cc

src/logic/bob.cc

src/logic/building.cc

src/logic/building.h

src/logic/editor_game_base.cc

src/logic/editor_game_base.h

src/logic/field.h

src/logic/immovable.cc

src/logic/immovable.h

src/logic/instances.h

src/logic/map.cc

src/logic/map.h

src/logic/militarysite.cc

src/logic/nodecaps.h

src/logic/partially_finished_building.cc

src/logic/path.h

src/logic/player.cc

src/logic/productionsite.cc

src/logic/ship.cc

src/logic/ship.h

src/logic/soldier.cc

src/logic/trainingsite.cc

src/logic/warehouse.cc

src/logic/warehouse.h

src/logic/widelands.h

src/logic/worker.cc

src/logic/worker.h

src/map_io/widelands_map_building_data_packet.cc

src/map_io/widelands_map_buildingdata_data_packet.cc

src/map_io/widelands_map_flagdata_data_packet.cc

src/map_io/widelands_map_map_object_saver.cc

src/map_io/widelands_map_map_object_saver.h

src/map_io/widelands_map_object_packet.cc

src/map_io/widelands_map_roaddata_data_packet.cc

src/ui_basic/box.cc

src/wui/fieldaction.cc

src/wui/interactive_gamebase.cc

src/wui/interactive_gamebase.h

src/wui/interactive_player.cc

src/wui/interactive_spectator.cc

src/wui/overlay_manager.cc

src/wui/overlay_manager.h

src/wui/stock_menu.cc

src/wui/stock_menu.h

src/wui/transport_ui.cc

src/wui/ware_statistics_menu.cc

src/wui/warehousewindow.cc

src/wui/waresdisplay.cc

src/wui/waresdisplay.h

src/wui/waresqueuedisplay.cc

tribes/atlanteans/conf

tribes/atlanteans/scripting/sc00_headquarters_medium.lua

tribes/atlanteans/scripting/sc01_castle_village.lua

tribes/atlanteans/ship/conf

Show diffs side-by-side

added added

removed removed

pics/menu_ship_destination.png

pics/menu_ship_goto.png

pics/menu_tab_wares_dock.png

pics/menu_tab_workers_dock.png

src/economy/economy.cc

src/economy/economy.h

src/economy/flag.cc

src/economy/flag.h

src/economy/fleet.cc

src/economy/fleet.h

src/economy/idleworkersupply.cc

src/economy/portdock.cc

src/economy/portdock.h

src/economy/request.cc

src/economy/request.h

src/economy/road.cc

src/economy/router.cc

src/economy/router.h

src/economy/routing_node.h

src/economy/shippingitem.cc

src/economy/shippingitem.h

src/economy/test/test_routing.cc

src/economy/transfer.cc

src/economy/ware_instance.cc

src/economy/ware_instance.h

src/economy/wares_queue.cc

src/logic/bob.cc

src/logic/building.cc

src/logic/building.h

src/logic/editor_game_base.cc

src/logic/editor_game_base.h

src/logic/field.h

src/logic/findbob.cc

src/logic/findbob.h

src/logic/immovable.cc

src/logic/immovable.h

src/logic/instances.h

src/logic/map.cc

src/logic/map.h

src/logic/mapastar.cc

src/logic/mapastar.h

src/logic/militarysite.cc

src/logic/nodecaps.h

src/logic/partially_finished_building.cc

src/logic/path.h

src/logic/player.cc

src/logic/productionsite.cc

src/logic/ship.cc

src/logic/ship.h

src/logic/soldier.cc

src/logic/trainingsite.cc

src/logic/warehouse.cc

src/logic/warehouse.h

src/logic/wareworker.h

src/logic/widelands.h

src/logic/worker.cc

src/logic/worker.h

src/map_io/widelands_map_building_data_packet.cc

src/map_io/widelands_map_buildingdata_data_packet.cc

src/map_io/widelands_map_flagdata_data_packet.cc

src/map_io/widelands_map_map_object_saver.cc

src/map_io/widelands_map_map_object_saver.h

src/map_io/widelands_map_object_packet.cc

src/map_io/widelands_map_roaddata_data_packet.cc

src/ui_basic/box.cc

src/wui/fieldaction.cc

src/wui/interactive_gamebase.cc

src/wui/interactive_gamebase.h

src/wui/interactive_player.cc

src/wui/interactive_spectator.cc

src/wui/itemwaresdisplay.cc

src/wui/itemwaresdisplay.h

src/wui/overlay_manager.cc

src/wui/overlay_manager.h

src/wui/portdockwaresdisplay.cc

src/wui/portdockwaresdisplay.h

src/wui/shipwindow.cc

src/wui/stock_menu.cc

src/wui/stock_menu.h

src/wui/transport_ui.cc

src/wui/ware_statistics_menu.cc

src/wui/warehousewindow.cc

src/wui/waresdisplay.cc

src/wui/waresdisplay.h

src/wui/waresqueuedisplay.cc

tribes/atlanteans/conf

tribes/atlanteans/port/

tribes/atlanteans/port/conf

tribes/atlanteans/port/port_i_00.png

tribes/atlanteans/port/port_i_00_pc.png

tribes/atlanteans/scripting/sc00_headquarters_medium.lua

tribes/atlanteans/scripting/sc01_castle_village.lua

tribes/atlanteans/ship/conf

Older »