← Back to branch summary

~widelands-dev/widelands/economy-target-profiles

~widelands-dev/widelands/economy-target-profiles

Viewing all changes in revision 9103.

Committer: Nordfriese
Date: 2019-05-06 13:50:17 UTC
mfrom: (9092.1.5 _widelands_dev_widelands_trunk)
Revision ID: nordfriese-20190506135017-so8joiegei7aqa4f

Merged trunk

files added:
src/logic/map_objects/CMakeLists.txt

src/logic/map_objects/description_maintainer.cc

files renamed:
src/logic/backtrace.cc => src/logic/map_objects/backtrace.cc

src/logic/backtrace.h => src/logic/map_objects/backtrace.h

src/logic/description_maintainer.h => src/logic/map_objects/description_maintainer.h

src/logic/findbob.cc => src/logic/map_objects/findbob.cc

src/logic/findbob.h => src/logic/map_objects/findbob.h

src/logic/findimmovable.cc => src/logic/map_objects/findimmovable.cc

src/logic/findimmovable.h => src/logic/map_objects/findimmovable.h

src/logic/findnode.cc => src/logic/map_objects/findnode.cc

src/logic/findnode.h => src/logic/map_objects/findnode.h

files modified:
data/campaigns/atl01.wmf/scripting/mission_thread.lua

data/campaigns/atl01.wmf/scripting/texts.lua

data/campaigns/bar01.wmf/scripting/texts.lua

data/scripting/editor/editor_help.lua

data/scripting/editor/terrain_help.lua

data/scripting/editor/tree_help.lua

data/scripting/richtext.lua

data/tribes/immovables/resi/atlanteans/init.lua

data/tribes/immovables/resi/barbarians/init.lua

data/tribes/immovables/resi/empire/init.lua

data/tribes/immovables/resi/frisians/init.lua

data/tribes/immovables/shipconstruction_atlanteans/init.lua

data/tribes/immovables/shipconstruction_barbarians/init.lua

data/tribes/immovables/shipconstruction_empire/init.lua

data/tribes/immovables/shipconstruction_frisians/init.lua

data/tribes/scripting/help/building_help.lua

data/tribes/scripting/help/immovable_help.lua

data/world/immovables/trees/alder/init.lua

data/world/immovables/trees/aspen/init.lua

data/world/immovables/trees/beech/init.lua

data/world/immovables/trees/birch/init.lua

data/world/immovables/trees/cirrus/init.lua

data/world/immovables/trees/larch/init.lua

data/world/immovables/trees/liana/init.lua

data/world/immovables/trees/maple/init.lua

data/world/immovables/trees/mushroom_dark/init.lua

data/world/immovables/trees/mushroom_green/init.lua

data/world/immovables/trees/mushroom_red/init.lua

data/world/immovables/trees/oak/init.lua

data/world/immovables/trees/palm_borassus/init.lua

data/world/immovables/trees/palm_coconut/init.lua

data/world/immovables/trees/palm_date/init.lua

data/world/immovables/trees/palm_oil/init.lua

data/world/immovables/trees/palm_roystonea/init.lua

data/world/immovables/trees/rowan/init.lua

data/world/immovables/trees/spruce/init.lua

data/world/immovables/trees/twine/init.lua

data/world/immovables/trees/umbrella_green/init.lua

data/world/immovables/trees/umbrella_red/init.lua

debian/widelands.appdata.xml

debian/widelands.appdata.xml.stub

doc/sphinx/source/animations.rst

src/CMakeLists.txt

src/ai/CMakeLists.txt

src/ai/ai_help_structs.h

src/ai/defaultai.cc

src/economy/CMakeLists.txt

src/economy/input_queue.h

src/economy/test/CMakeLists.txt

src/economy/ware_instance.h

src/economy/wares_queue.h

src/economy/workers_queue.h

src/editor/CMakeLists.txt

src/editor/map_generator.cc

src/editor/tools/set_origin_tool.h

src/editor/tools/set_port_space_tool.h

src/editor/tools/set_resources_tool.h

src/editor/tools/set_starting_pos_tool.h

src/editor/ui_menus/categorized_item_selection_menu.h

src/editor/ui_menus/main_menu_new_map.cc

src/editor/ui_menus/main_menu_new_map.h

src/editor/ui_menus/tool_change_resources_options_menu.cc

src/game_io/CMakeLists.txt

src/game_io/game_interactive_player_packet.cc

src/graphic/CMakeLists.txt

src/graphic/animation.cc

src/graphic/animation.h

src/graphic/gl/dither_program.cc

src/graphic/gl/dither_program.h

src/graphic/gl/fields_to_draw.h

src/graphic/gl/grid_program.h

src/graphic/gl/terrain_program.cc

src/graphic/gl/terrain_program.h

src/graphic/gl/workarea_program.h

src/graphic/render_queue.h

src/graphic/text/rt_parse.cc

src/graphic/text/rt_render.cc

src/logic/CMakeLists.txt

src/logic/editor_game_base.cc

src/logic/game_controller.h

src/logic/map.cc

src/logic/map.h

src/logic/map_objects/bob.cc

src/logic/map_objects/immovable.cc

src/logic/map_objects/map_object.cc

src/logic/map_objects/map_object.h

src/logic/map_objects/terrain_affinity.cc

src/logic/map_objects/terrain_affinity.h

src/logic/map_objects/tribes/building.cc

src/logic/map_objects/tribes/building.h

src/logic/map_objects/tribes/carrier.cc

src/logic/map_objects/tribes/carrier.h

src/logic/map_objects/tribes/constructionsite.cc

src/logic/map_objects/tribes/constructionsite.h

src/logic/map_objects/tribes/dismantlesite.cc

src/logic/map_objects/tribes/dismantlesite.h

src/logic/map_objects/tribes/market.cc

src/logic/map_objects/tribes/market.h

src/logic/map_objects/tribes/militarysite.cc

src/logic/map_objects/tribes/militarysite.h

src/logic/map_objects/tribes/production_program.cc

src/logic/map_objects/tribes/production_program.h

src/logic/map_objects/tribes/productionsite.cc

src/logic/map_objects/tribes/productionsite.h

src/logic/map_objects/tribes/ship.cc

src/logic/map_objects/tribes/soldier.cc

src/logic/map_objects/tribes/soldier.h

src/logic/map_objects/tribes/trainingsite.cc

src/logic/map_objects/tribes/trainingsite.h

src/logic/map_objects/tribes/tribe_descr.cc

src/logic/map_objects/tribes/tribe_descr.h

src/logic/map_objects/tribes/tribes.cc

src/logic/map_objects/tribes/tribes.h

src/logic/map_objects/tribes/warehouse.cc

src/logic/map_objects/tribes/warehouse.h

src/logic/map_objects/tribes/worker.cc

src/logic/map_objects/tribes/worker_descr.cc

src/logic/map_objects/tribes/worker_descr.h

src/logic/map_objects/tribes/worker_program.cc

src/logic/map_objects/world/world.h

src/logic/player.cc

src/logic/player_area.h

src/logic/widelands.h

src/map_io/CMakeLists.txt

src/map_io/map_elemental_packet.cc

src/map_io/map_object_loader.h

src/network/CMakeLists.txt

src/network/gamehost.h

src/network/internet_gaming.cc

src/network/network_player_settings_backend.h

src/scripting/CMakeLists.txt

src/scripting/lua_map.cc

src/scripting/lua_map.h

src/scripting/lua_root.cc

src/ui_basic/panel.h

src/ui_fsmenu/CMakeLists.txt

src/ui_fsmenu/internet_lobby.cc

src/ui_fsmenu/launch_mpg.cc

src/website/CMakeLists.txt

src/website/map_object_info.cc

src/wui/CMakeLists.txt

src/wui/building_statistics_menu.h

src/wui/debugconsole.cc

src/wui/game_chat_panel.cc

src/wui/game_chat_panel.h

src/wui/gamedetails.h

src/wui/interactive_base.cc

src/wui/interactive_base.h

src/wui/interactive_gamebase.cc

src/wui/interactive_player.cc

src/wui/multiplayersetupgroup.cc

Show diffs side-by-side

added added

removed removed

data/campaigns/atl01.wmf/scripting/mission_thread.lua

data/campaigns/atl01.wmf/scripting/texts.lua

data/campaigns/bar01.wmf/scripting/texts.lua

data/scripting/editor/editor_help.lua

data/scripting/editor/terrain_help.lua

data/scripting/editor/tree_help.lua

data/scripting/richtext.lua

data/tribes/immovables/resi/atlanteans/init.lua

data/tribes/immovables/resi/barbarians/init.lua

data/tribes/immovables/resi/empire/init.lua

data/tribes/immovables/resi/frisians/init.lua

data/tribes/immovables/shipconstruction_atlanteans/init.lua

data/tribes/immovables/shipconstruction_barbarians/init.lua

data/tribes/immovables/shipconstruction_empire/init.lua

data/tribes/immovables/shipconstruction_frisians/init.lua

data/tribes/scripting/help/building_help.lua

data/tribes/scripting/help/immovable_help.lua

data/world/immovables/trees/alder/init.lua

data/world/immovables/trees/aspen/init.lua

data/world/immovables/trees/beech/init.lua

data/world/immovables/trees/birch/init.lua

data/world/immovables/trees/cirrus/init.lua

data/world/immovables/trees/larch/init.lua

data/world/immovables/trees/liana/init.lua

data/world/immovables/trees/maple/init.lua

data/world/immovables/trees/mushroom_dark/init.lua

data/world/immovables/trees/mushroom_green/init.lua

data/world/immovables/trees/mushroom_red/init.lua

data/world/immovables/trees/oak/init.lua

data/world/immovables/trees/palm_borassus/init.lua

data/world/immovables/trees/palm_coconut/init.lua

data/world/immovables/trees/palm_date/init.lua

data/world/immovables/trees/palm_oil/init.lua

data/world/immovables/trees/palm_roystonea/init.lua

data/world/immovables/trees/rowan/init.lua

data/world/immovables/trees/spruce/init.lua

data/world/immovables/trees/twine/init.lua

data/world/immovables/trees/umbrella_green/init.lua

data/world/immovables/trees/umbrella_red/init.lua

debian/widelands.appdata.xml

debian/widelands.appdata.xml.stub

doc/sphinx/source/animations.rst

src/CMakeLists.txt

src/ai/CMakeLists.txt

src/ai/ai_help_structs.h

src/ai/defaultai.cc

src/economy/CMakeLists.txt

src/economy/input_queue.h

src/economy/test/CMakeLists.txt

src/economy/ware_instance.h

src/economy/wares_queue.h

src/economy/workers_queue.h

src/editor/CMakeLists.txt

src/editor/map_generator.cc

src/editor/tools/set_origin_tool.h

src/editor/tools/set_port_space_tool.h

src/editor/tools/set_resources_tool.h

src/editor/tools/set_starting_pos_tool.h

src/editor/ui_menus/categorized_item_selection_menu.h

src/editor/ui_menus/main_menu_new_map.cc

src/editor/ui_menus/main_menu_new_map.h

src/editor/ui_menus/tool_change_resources_options_menu.cc

src/game_io/CMakeLists.txt

src/game_io/game_interactive_player_packet.cc

src/graphic/CMakeLists.txt

src/graphic/animation.cc

src/graphic/animation.h

src/graphic/gl/dither_program.cc

src/graphic/gl/dither_program.h

src/graphic/gl/fields_to_draw.h

src/graphic/gl/grid_program.h

src/graphic/gl/terrain_program.cc

src/graphic/gl/terrain_program.h

src/graphic/gl/workarea_program.h

src/graphic/render_queue.h

src/graphic/text/rt_parse.cc

src/graphic/text/rt_render.cc

src/logic/CMakeLists.txt

src/logic/editor_game_base.cc

src/logic/game_controller.h

src/logic/map.cc

src/logic/map.h

src/logic/map_objects/CMakeLists.txt

src/logic/map_objects/backtrace.cc

src/logic/map_objects/backtrace.h

src/logic/map_objects/bob.cc

src/logic/map_objects/description_maintainer.cc

src/logic/map_objects/description_maintainer.h

src/logic/map_objects/findbob.cc

src/logic/map_objects/findbob.h

src/logic/map_objects/findimmovable.cc

src/logic/map_objects/findimmovable.h

src/logic/map_objects/findnode.cc

src/logic/map_objects/findnode.h

src/logic/map_objects/immovable.cc

src/logic/map_objects/map_object.cc

src/logic/map_objects/map_object.h

src/logic/map_objects/terrain_affinity.cc

src/logic/map_objects/terrain_affinity.h

src/logic/map_objects/tribes/building.cc

src/logic/map_objects/tribes/building.h

src/logic/map_objects/tribes/carrier.cc

src/logic/map_objects/tribes/carrier.h

src/logic/map_objects/tribes/constructionsite.cc

src/logic/map_objects/tribes/constructionsite.h

src/logic/map_objects/tribes/dismantlesite.cc

src/logic/map_objects/tribes/dismantlesite.h

src/logic/map_objects/tribes/market.cc

src/logic/map_objects/tribes/market.h

src/logic/map_objects/tribes/militarysite.cc

src/logic/map_objects/tribes/militarysite.h

src/logic/map_objects/tribes/production_program.cc

src/logic/map_objects/tribes/production_program.h

src/logic/map_objects/tribes/productionsite.cc

src/logic/map_objects/tribes/productionsite.h

src/logic/map_objects/tribes/ship.cc

src/logic/map_objects/tribes/soldier.cc

src/logic/map_objects/tribes/soldier.h

src/logic/map_objects/tribes/trainingsite.cc

src/logic/map_objects/tribes/trainingsite.h

src/logic/map_objects/tribes/tribe_descr.cc

src/logic/map_objects/tribes/tribe_descr.h

src/logic/map_objects/tribes/tribes.cc

src/logic/map_objects/tribes/tribes.h

src/logic/map_objects/tribes/warehouse.cc

src/logic/map_objects/tribes/warehouse.h

src/logic/map_objects/tribes/worker.cc

src/logic/map_objects/tribes/worker_descr.cc

src/logic/map_objects/tribes/worker_descr.h

src/logic/map_objects/tribes/worker_program.cc

src/logic/map_objects/world/world.h

src/logic/player.cc

src/logic/player_area.h

src/logic/widelands.h

src/map_io/CMakeLists.txt

src/map_io/map_elemental_packet.cc

src/map_io/map_object_loader.h

src/network/CMakeLists.txt

src/network/gamehost.h

src/network/internet_gaming.cc

src/network/network_player_settings_backend.h

src/scripting/CMakeLists.txt

src/scripting/lua_map.cc

src/scripting/lua_map.h

src/scripting/lua_root.cc

src/ui_basic/panel.h

src/ui_fsmenu/CMakeLists.txt

src/ui_fsmenu/internet_lobby.cc

src/ui_fsmenu/launch_mpg.cc

src/website/CMakeLists.txt

src/website/map_object_info.cc

src/wui/CMakeLists.txt

src/wui/building_statistics_menu.h

src/wui/debugconsole.cc

src/wui/game_chat_panel.cc

src/wui/game_chat_panel.h

src/wui/gamedetails.h

src/wui/interactive_base.cc

src/wui/interactive_base.h

src/wui/interactive_gamebase.cc

src/wui/interactive_player.cc

src/wui/multiplayersetupgroup.cc

Older »