← Back to branch summary

~widelands-dev/widelands/render_queue

~widelands-dev/widelands/render_queue

Viewing all changes in revision 7410.

Committer: Holger Rapp
Date: 2016-01-05 09:54:44 UTC
mfrom: (7295.1.393 _widelands_dev_widelands_trunk)
Revision ID: sirver@gmx.de-20160105095444-b3guxrzgyxz43moj

Merged trunk.

files modified:
src/editor/map_generator.cc

src/editor/tools/editor_decrease_height_tool.cc

src/editor/tools/editor_decrease_height_tool.h

src/editor/tools/editor_decrease_resources_tool.cc

src/editor/tools/editor_decrease_resources_tool.h

src/editor/tools/editor_delete_bob_tool.cc

src/editor/tools/editor_delete_bob_tool.h

src/editor/tools/editor_delete_immovable_tool.cc

src/editor/tools/editor_delete_immovable_tool.h

src/editor/tools/editor_draw_tool.cc

src/editor/tools/editor_draw_tool.h

src/editor/tools/editor_history.cc

src/editor/tools/editor_increase_height_tool.cc

src/editor/tools/editor_increase_height_tool.h

src/editor/tools/editor_increase_resources_tool.cc

src/editor/tools/editor_increase_resources_tool.h

src/editor/tools/editor_info_tool.cc

src/editor/tools/editor_info_tool.h

src/editor/tools/editor_make_infrastructure_tool.cc

src/editor/tools/editor_make_infrastructure_tool.h

src/editor/tools/editor_noise_height_tool.cc

src/editor/tools/editor_noise_height_tool.h

src/editor/tools/editor_place_bob_tool.cc

src/editor/tools/editor_place_bob_tool.h

src/editor/tools/editor_place_immovable_tool.cc

src/editor/tools/editor_place_immovable_tool.h

src/editor/tools/editor_set_height_tool.cc

src/editor/tools/editor_set_height_tool.h

src/editor/tools/editor_set_origin_tool.cc

src/editor/tools/editor_set_origin_tool.h

src/editor/tools/editor_set_port_space_tool.cc

src/editor/tools/editor_set_port_space_tool.h

src/editor/tools/editor_set_resources_tool.cc

src/editor/tools/editor_set_resources_tool.h

src/editor/tools/editor_set_starting_pos_tool.cc

src/editor/tools/editor_set_starting_pos_tool.h

src/editor/tools/editor_set_terrain_tool.cc

src/editor/tools/editor_set_terrain_tool.h

src/editor/tools/editor_tool.h

src/editor/ui_menus/editor_tool_change_resources_options_menu.cc

src/logic/bob.h

src/logic/map.cc

src/logic/map.h

src/logic/widelands.h

src/logic/worker.cc

src/logic/world/world.cc

src/map_io/widelands_map_loader.cc

src/scripting/lua_map.cc

src/ui_fsmenu/options.cc

src/wui/overlay_manager.cc

src/wui/overlay_manager.h

test/maps/lua_testsuite.wmf/scripting/efield.lua

Show diffs side-by-side

added added

removed removed

src/editor/map_generator.cc

src/editor/tools/editor_decrease_height_tool.cc

src/editor/tools/editor_decrease_height_tool.h

src/editor/tools/editor_decrease_resources_tool.cc

src/editor/tools/editor_decrease_resources_tool.h

src/editor/tools/editor_delete_bob_tool.cc

src/editor/tools/editor_delete_bob_tool.h

src/editor/tools/editor_delete_immovable_tool.cc

src/editor/tools/editor_delete_immovable_tool.h

src/editor/tools/editor_draw_tool.cc

src/editor/tools/editor_draw_tool.h

src/editor/tools/editor_history.cc

src/editor/tools/editor_increase_height_tool.cc

src/editor/tools/editor_increase_height_tool.h

src/editor/tools/editor_increase_resources_tool.cc

src/editor/tools/editor_increase_resources_tool.h

src/editor/tools/editor_info_tool.cc

src/editor/tools/editor_info_tool.h

src/editor/tools/editor_make_infrastructure_tool.cc

src/editor/tools/editor_make_infrastructure_tool.h

src/editor/tools/editor_noise_height_tool.cc

src/editor/tools/editor_noise_height_tool.h

src/editor/tools/editor_place_bob_tool.cc

src/editor/tools/editor_place_bob_tool.h

src/editor/tools/editor_place_immovable_tool.cc

src/editor/tools/editor_place_immovable_tool.h

src/editor/tools/editor_set_height_tool.cc

src/editor/tools/editor_set_height_tool.h

src/editor/tools/editor_set_origin_tool.cc

src/editor/tools/editor_set_origin_tool.h

src/editor/tools/editor_set_port_space_tool.cc

src/editor/tools/editor_set_port_space_tool.h

src/editor/tools/editor_set_resources_tool.cc

src/editor/tools/editor_set_resources_tool.h

src/editor/tools/editor_set_starting_pos_tool.cc

src/editor/tools/editor_set_starting_pos_tool.h

src/editor/tools/editor_set_terrain_tool.cc

src/editor/tools/editor_set_terrain_tool.h

src/editor/tools/editor_tool.h

src/editor/ui_menus/editor_tool_change_resources_options_menu.cc

src/logic/bob.h

src/logic/map.cc

src/logic/map.h

src/logic/widelands.h

src/logic/worker.cc

src/logic/world/world.cc

src/map_io/widelands_map_loader.cc

src/scripting/lua_map.cc

src/ui_fsmenu/options.cc

src/wui/overlay_manager.cc

src/wui/overlay_manager.h

test/maps/lua_testsuite.wmf/scripting/efield.lua

Older »