← Back to branch summary

~widelands-dev/widelands/map-filter-dropdowns

~widelands-dev/widelands/map-filter-dropdowns

Viewing all changes in revision 9153.

Committer: GunChleoc
Date: 2019-09-08 20:22:21 UTC
mfrom: (9134.1.67 _widelands_dev_widelands_trunk)
Revision ID: fios@foramnagaidhlig.net-20190908202221-tt28qxhszkzn9w67

Merged trunk.

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

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

data/campaigns/emp04.wmf/scripting/tribes/trainingcamp1.lua

data/campaigns/emp04.wmf/scripting/tribes/well1.lua

data/i18n/translation_stats.conf

data/world/terrains/init.lua

po/map_the_green_plateau.wmf/map_the_green_plateau.wmf.pot

po/maps/maps.pot

po/mp_scenario_island_hopping.wmf/mp_scenario_island_hopping.wmf.pot

po/mp_scenario_smugglers.wmf/mp_scenario_smugglers.wmf.pot

po/scenario_atl01.wmf/scenario_atl01.wmf.pot

po/scenario_bar01.wmf/scenario_bar01.wmf.pot

po/scenario_bar02.wmf/scenario_bar02.wmf.pot

po/scenario_dummy.wmf/scenario_dummy.wmf.pot

po/scenario_emp01.wmf/scenario_emp01.wmf.pot

po/scenario_emp02.wmf/scenario_emp02.wmf.pot

po/scenario_emp03.wmf/scenario_emp03.wmf.pot

po/scenario_emp04.wmf/scenario_emp04.wmf.pot

po/scenario_fri01.wmf/scenario_fri01.wmf.pot

po/scenario_fri02.wmf/scenario_fri02.wmf.pot

po/scenario_tutorial01_basic_control.wmf/scenario_tutorial01_basic_control.wmf.pot

po/scenario_tutorial02_warfare.wmf/scenario_tutorial02_warfare.wmf.pot

po/scenario_tutorial03_seafaring.wmf/scenario_tutorial03_seafaring.wmf.pot

po/scenario_tutorial04_economy.wmf/scenario_tutorial04_economy.wmf.pot

po/texts/texts.pot

po/tribes/tribes.pot

po/tribes_encyclopedia/tribes_encyclopedia.pot

po/widelands/widelands.pot

po/widelands_console/widelands_console.pot

po/widelands_editor/widelands_editor.pot

po/win_conditions/pt_BR.po

po/win_conditions/win_conditions.pot

po/world/world.pot

src/CMakeLists.txt

src/ai/ai_help_structs.cc

src/ai/ai_help_structs.h

src/ai/defaultai.cc

src/ai/defaultai_seafaring.cc

src/ai/defaultai_warfare.cc

src/ai/test/test_ai.cc

src/economy/economy.cc

src/economy/economy.h

src/economy/test/test_road.cc

src/economy/test/test_routing.cc

src/editor/CMakeLists.txt

src/editor/editorinteractive.cc

src/editor/map_generator.cc

src/editor/tools/decrease_height_tool.cc

src/editor/tools/decrease_height_tool.h

src/editor/tools/decrease_resources_tool.cc

src/editor/tools/decrease_resources_tool.h

src/editor/tools/delete_critter_tool.cc

src/editor/tools/delete_critter_tool.h

src/editor/tools/delete_immovable_tool.cc

src/editor/tools/delete_immovable_tool.h

src/editor/tools/draw_tool.cc

src/editor/tools/draw_tool.h

src/editor/tools/history.cc

src/editor/tools/history.h

src/editor/tools/increase_height_tool.cc

src/editor/tools/increase_height_tool.h

src/editor/tools/increase_resources_tool.cc

src/editor/tools/increase_resources_tool.h

src/editor/tools/info_tool.cc

src/editor/tools/info_tool.h

src/editor/tools/noise_height_tool.cc

src/editor/tools/noise_height_tool.h

src/editor/tools/place_critter_tool.cc

src/editor/tools/place_critter_tool.h

src/editor/tools/place_immovable_tool.cc

src/editor/tools/place_immovable_tool.h

src/editor/tools/resize_tool.cc

src/editor/tools/resize_tool.h

src/editor/tools/set_height_tool.cc

src/editor/tools/set_height_tool.h

src/editor/tools/set_origin_tool.cc

src/editor/tools/set_origin_tool.h

src/editor/tools/set_port_space_tool.cc

src/editor/tools/set_port_space_tool.h

src/editor/tools/set_resources_tool.cc

src/editor/tools/set_resources_tool.h

src/editor/tools/set_starting_pos_tool.cc

src/editor/tools/set_starting_pos_tool.h

src/editor/tools/set_terrain_tool.cc

src/editor/tools/set_terrain_tool.h

src/editor/tools/tool.h

src/editor/ui_menus/main_menu_new_map.cc

src/editor/ui_menus/main_menu_random_map.cc

src/editor/ui_menus/main_menu_save_map.cc

src/graphic/styles/font_style.h

src/graphic/styles/text_panel_style.h

src/io/filesystem/test/test_filesystem.cc

src/logic/CMakeLists.txt

src/logic/editor_game_base.cc

src/logic/editor_game_base.h

src/logic/game_settings.h

src/logic/map.cc

src/logic/map.h

src/logic/map_objects/bob.cc

src/logic/map_objects/findnode.cc

src/logic/map_objects/findnode.h

src/logic/map_objects/immovable.cc

src/logic/map_objects/tribes/building.cc

src/logic/map_objects/tribes/building.h

src/logic/map_objects/tribes/constructionsite.cc

src/logic/map_objects/tribes/dismantlesite.cc

src/logic/map_objects/tribes/dismantlesite.h

src/logic/map_objects/tribes/militarysite.cc

src/logic/map_objects/tribes/production_program.cc

src/logic/map_objects/tribes/productionsite.cc

src/logic/map_objects/tribes/ship.cc

src/logic/map_objects/tribes/soldier.cc

src/logic/map_objects/tribes/warehouse.cc

src/logic/map_objects/tribes/worker.cc

src/logic/map_objects/tribes/worker.h

src/logic/map_objects/tribes/worker_program.cc

src/logic/map_objects/tribes/worker_program.h

src/logic/map_objects/world/terrain_description.cc

src/logic/map_objects/world/terrain_description.h

src/logic/map_objects/world/world.cc

src/logic/map_objects/world/world.h

src/logic/player.cc

src/logic/player.h

src/logic/playercommand.cc

src/map_io/map_bob_packet.cc

src/map_io/map_building_packet.cc

src/map_io/map_buildingdata_packet.cc

src/map_io/map_port_spaces_packet.cc

src/map_io/s2map.cc

src/map_io/s2map.h

src/map_io/widelands_map_loader.cc

src/network/CMakeLists.txt

src/network/gameclient.cc

src/network/gamehost.cc

src/notifications/test/notifications_test.cc

src/scripting/CMakeLists.txt

src/scripting/lua_bases.cc

src/scripting/lua_map.cc

src/scripting/test/test_luna.cc

src/sound/CMakeLists.txt

src/ui_basic/CMakeLists.txt

src/ui_fsmenu/CMakeLists.txt

src/ui_fsmenu/options.cc

src/wlapplication.cc

src/wlapplication.h

src/wlapplication_options.cc

src/wlapplication_options.h

src/wui/CMakeLists.txt

src/wui/economy_options_window.cc

src/wui/fieldaction.cc

src/wui/game_debug_ui.cc

src/wui/interactive_gamebase.cc

src/wui/watchwindow.cc

Show diffs side-by-side

added added

removed removed

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

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

data/campaigns/emp04.wmf/scripting/tribes/trainingcamp1.lua

data/campaigns/emp04.wmf/scripting/tribes/well1.lua

data/i18n/translation_stats.conf

data/world/terrains/init.lua

po/map_the_green_plateau.wmf/map_the_green_plateau.wmf.pot

po/maps/maps.pot

po/mp_scenario_island_hopping.wmf/mp_scenario_island_hopping.wmf.pot

po/mp_scenario_smugglers.wmf/mp_scenario_smugglers.wmf.pot

po/scenario_atl01.wmf/scenario_atl01.wmf.pot

po/scenario_bar01.wmf/scenario_bar01.wmf.pot

po/scenario_bar02.wmf/scenario_bar02.wmf.pot

po/scenario_dummy.wmf/scenario_dummy.wmf.pot

po/scenario_emp01.wmf/scenario_emp01.wmf.pot

po/scenario_emp02.wmf/scenario_emp02.wmf.pot

po/scenario_emp03.wmf/scenario_emp03.wmf.pot

po/scenario_emp04.wmf/scenario_emp04.wmf.pot

po/scenario_fri01.wmf/scenario_fri01.wmf.pot

po/scenario_fri02.wmf/scenario_fri02.wmf.pot

po/scenario_tutorial01_basic_control.wmf/scenario_tutorial01_basic_control.wmf.pot

po/scenario_tutorial02_warfare.wmf/scenario_tutorial02_warfare.wmf.pot

po/scenario_tutorial03_seafaring.wmf/scenario_tutorial03_seafaring.wmf.pot

po/scenario_tutorial04_economy.wmf/scenario_tutorial04_economy.wmf.pot

po/texts/texts.pot

po/tribes/tribes.pot

po/tribes_encyclopedia/tribes_encyclopedia.pot

po/widelands/widelands.pot

po/widelands_console/widelands_console.pot

po/widelands_editor/widelands_editor.pot

po/win_conditions/pt_BR.po

po/win_conditions/win_conditions.pot

po/world/world.pot

src/CMakeLists.txt

src/ai/ai_help_structs.cc

src/ai/ai_help_structs.h

src/ai/defaultai.cc

src/ai/defaultai_seafaring.cc

src/ai/defaultai_warfare.cc

src/ai/test/test_ai.cc

src/economy/economy.cc

src/economy/economy.h

src/economy/test/test_road.cc

src/economy/test/test_routing.cc

src/editor/CMakeLists.txt

src/editor/editorinteractive.cc

src/editor/map_generator.cc

src/editor/tools/decrease_height_tool.cc

src/editor/tools/decrease_height_tool.h

src/editor/tools/decrease_resources_tool.cc

src/editor/tools/decrease_resources_tool.h

src/editor/tools/delete_critter_tool.cc

src/editor/tools/delete_critter_tool.h

src/editor/tools/delete_immovable_tool.cc

src/editor/tools/delete_immovable_tool.h

src/editor/tools/draw_tool.cc

src/editor/tools/draw_tool.h

src/editor/tools/history.cc

src/editor/tools/history.h

src/editor/tools/increase_height_tool.cc

src/editor/tools/increase_height_tool.h

src/editor/tools/increase_resources_tool.cc

src/editor/tools/increase_resources_tool.h

src/editor/tools/info_tool.cc

src/editor/tools/info_tool.h

src/editor/tools/noise_height_tool.cc

src/editor/tools/noise_height_tool.h

src/editor/tools/place_critter_tool.cc

src/editor/tools/place_critter_tool.h

src/editor/tools/place_immovable_tool.cc

src/editor/tools/place_immovable_tool.h

src/editor/tools/resize_tool.cc

src/editor/tools/resize_tool.h

src/editor/tools/set_height_tool.cc

src/editor/tools/set_height_tool.h

src/editor/tools/set_origin_tool.cc

src/editor/tools/set_origin_tool.h

src/editor/tools/set_port_space_tool.cc

src/editor/tools/set_port_space_tool.h

src/editor/tools/set_resources_tool.cc

src/editor/tools/set_resources_tool.h

src/editor/tools/set_starting_pos_tool.cc

src/editor/tools/set_starting_pos_tool.h

src/editor/tools/set_terrain_tool.cc

src/editor/tools/set_terrain_tool.h

src/editor/tools/tool.h

src/editor/ui_menus/main_menu_new_map.cc

src/editor/ui_menus/main_menu_random_map.cc

src/editor/ui_menus/main_menu_save_map.cc

src/graphic/styles/font_style.h

src/graphic/styles/text_panel_style.h

src/io/filesystem/test/test_filesystem.cc

src/logic/CMakeLists.txt

src/logic/editor_game_base.cc

src/logic/editor_game_base.h

src/logic/game_settings.h

src/logic/map.cc

src/logic/map.h

src/logic/map_objects/bob.cc

src/logic/map_objects/findnode.cc

src/logic/map_objects/findnode.h

src/logic/map_objects/immovable.cc

src/logic/map_objects/tribes/building.cc

src/logic/map_objects/tribes/building.h

src/logic/map_objects/tribes/constructionsite.cc

src/logic/map_objects/tribes/dismantlesite.cc

src/logic/map_objects/tribes/dismantlesite.h

src/logic/map_objects/tribes/militarysite.cc

src/logic/map_objects/tribes/production_program.cc

src/logic/map_objects/tribes/productionsite.cc

src/logic/map_objects/tribes/ship.cc

src/logic/map_objects/tribes/soldier.cc

src/logic/map_objects/tribes/warehouse.cc

src/logic/map_objects/tribes/worker.cc

src/logic/map_objects/tribes/worker.h

src/logic/map_objects/tribes/worker_program.cc

src/logic/map_objects/tribes/worker_program.h

src/logic/map_objects/world/terrain_description.cc

src/logic/map_objects/world/terrain_description.h

src/logic/map_objects/world/world.cc

src/logic/map_objects/world/world.h

src/logic/player.cc

src/logic/player.h

src/logic/playercommand.cc

src/map_io/map_bob_packet.cc

src/map_io/map_building_packet.cc

src/map_io/map_buildingdata_packet.cc

src/map_io/map_port_spaces_packet.cc

src/map_io/s2map.cc

src/map_io/s2map.h

src/map_io/widelands_map_loader.cc

src/network/CMakeLists.txt

src/network/gameclient.cc

src/network/gamehost.cc

src/notifications/test/notifications_test.cc

src/scripting/CMakeLists.txt

src/scripting/lua_bases.cc

src/scripting/lua_map.cc

src/scripting/test/test_luna.cc

src/sound/CMakeLists.txt

src/ui_basic/CMakeLists.txt

src/ui_fsmenu/CMakeLists.txt

src/ui_fsmenu/options.cc

src/wlapplication.cc

src/wlapplication.h

src/wlapplication_options.cc

src/wlapplication_options.h

src/wui/CMakeLists.txt

src/wui/economy_options_window.cc

src/wui/fieldaction.cc

src/wui/game_debug_ui.cc

src/wui/interactive_gamebase.cc

src/wui/watchwindow.cc

Older »