Viewing all changes in revision 8422.
- Committer: GunChleoc
- Date: 2018-02-27 19:21:36 UTC
- mfrom: (8420.1.190 _widelands_dev_widelands_trunk)
- Revision ID: fios@foramnagaidhlig.net-20180227192136-gvkn3n3q8iv48174
Merged trunk.
- files added:
- cmake/codecheck/rules/translations_printf
- data/campaigns/emp04.wmf
- data/campaigns/emp04.wmf/binary
- data/campaigns/emp04.wmf/pics
- data/campaigns/emp04.wmf/scripting
- data/campaigns/emp04.wmf/scripting/tribes
- data/tribes/buildings/markets
- data/tribes/buildings/markets/barbarians
- data/tribes/buildings/markets/barbarians/market
- po/scenario_emp04.wmf
- test/maps/market_trading.wmf
- test/maps/market_trading.wmf/binary
- test/maps/market_trading.wmf/scripting
- test/maps/two_ponds.wmf
- test/maps/two_ponds.wmf/binary
- test/maps/two_ponds.wmf/scripting
- test/scripting
- files removed:
- data/campaigns/dummy.wmf/binary/building
- data/campaigns/dummy.wmf/player
- data/campaigns/dummy.wmf/player/1
- data/campaigns/dummy.wmf/player/1/binary
- data/campaigns/dummy.wmf/player/1/view
- files renamed:
- data/images/wui/fieldaction/menu_tab_buildroad.png => data/images/wui/fieldaction/menu_build_way.png
- data/images/wui/fieldaction/menu_build_way.png => data/images/wui/fieldaction/menu_tab_buildroad.png
- data/maps/Crossing_the_Horizon.wmf/ => data/maps/Crossing_the_Horizon_v2.wmf/
- data/scripting/format_scenario.lua => data/scripting/richtext_scenarios.lua
- doc/sphinx/source/images/fancymsg.png => doc/sphinx/source/images/wlrichtext.png
- doc/sphinx/source/lua_world.rst.org => doc/sphinx/source/lua_world.rst
- src/logic/constants.cc => src/logic/filesystem_constants.cc
- src/logic/constants.h => src/logic/filesystem_constants.h
- files modified:
- .travis.sh
expand all
collapse all
added
removed
data/campaigns/dummy.wmf/minimap.png
data/campaigns/emp03.wmf/pics/background.jpg
data/campaigns/emp04.wmf/minimap.png
data/campaigns/emp04.wmf/pics/Amalea.png
data/campaigns/emp04.wmf/pics/Amalea2.png
data/campaigns/emp04.wmf/pics/Amalea3.png
data/campaigns/emp04.wmf/pics/Julia.png
data/campaigns/emp04.wmf/pics/Lutius.png
data/campaigns/emp04.wmf/pics/Markus.png
data/campaigns/emp04.wmf/pics/Saledus2.png
data/campaigns/emp04.wmf/pics/Saledus3.png
data/campaigns/emp04.wmf/pics/background.jpg
data/images/players/no_team.png
data/images/players/team.png
data/images/players/team_pc.png
data/images/ui_basic/fsel.png
data/images/ui_basic/fsel_roadbuilding.png
data/images/wui/editor/fsel_editor_decrease_height.png
data/images/wui/editor/fsel_editor_decrease_resources.png
data/images/wui/editor/fsel_editor_delete.png
data/images/wui/editor/fsel_editor_increase_height.png
data/images/wui/editor/fsel_editor_increase_resources.png
data/images/wui/editor/fsel_editor_info.png
data/images/wui/editor/fsel_editor_noise_height.png
data/images/wui/editor/fsel_editor_place_critter.png
data/images/wui/editor/fsel_editor_place_immovable.png
data/images/wui/editor/fsel_editor_set_height.png
data/images/wui/editor/fsel_editor_set_port_space.png
data/images/wui/editor/fsel_editor_set_resources.png
data/images/wui/editor/fsel_editor_unset_port_space.png
data/images/wui/fieldaction/menu_build_flag.png
data/images/wui/fieldaction/menu_build_way.png
data/images/wui/fieldaction/menu_rem_way.png
data/images/wui/fieldaction/menu_tab_buildroad.png
data/images/wui/menus/menu_toggle_bobs.png
data/images/wui/menus/menu_toggle_immovables.png
data/images/wui/menus/menu_toggle_resources.png
data/maps/Crossing_the_Horizon_v2.wmf/minimap.png
data/maps/Last_Bastion_v2.wmf/minimap.png
data/tribes/buildings/markets/barbarians/market/build_00.png
data/tribes/buildings/markets/barbarians/market/idle_00.png
data/tribes/buildings/markets/barbarians/market/idle_00_pc.png
data/tribes/buildings/markets/barbarians/market/menu.png
doc/sphinx/source/images/wlrichtext.png
test/maps/market_trading.wmf/minimap.png
test/maps/two_ponds.wmf/minimap.png
