Viewing all changes in revision 9147.
- Committer: Nordfriese
- Date: 2019-08-11 10:53:14 UTC
- mfrom: (9129.1.47 trunk)
- Revision ID: nordfriese-20190811105314-ex9xogd4cf5uwuy4
Merged trunk
- files added:
- data/i18n/locales/af_ZA.json
- data/images/wui/editor/menus
- data/images/wui/editor/tools
- data/images/wui/toolbar
- src/ai/test
- files removed:
- src/editor/ui_menus/main_menu.cc
- files renamed:
- data/images/wui/editor/editor_redo.png => data/images/wui/editor/menus/redo.png
- data/images/wui/editor/editor_menu_toggle_tool_menu.png => data/images/wui/editor/menus/tools.png
- data/images/wui/editor/editor_menu_set_toolsize_menu.png => data/images/wui/editor/menus/toolsize.png
- data/images/wui/editor/editor_undo.png => data/images/wui/editor/menus/undo.png
- data/images/wui/editor/editor_menu_tool_place_bob.png => data/images/wui/editor/tools/critters.png
- data/images/wui/editor/editor_menu_tool_change_height.png => data/images/wui/editor/tools/height.png
- data/images/wui/editor/editor_menu_tool_place_immovable.png => data/images/wui/editor/tools/immovables.png
- data/images/wui/editor/editor_menu_tool_set_origin.png => data/images/wui/editor/tools/map_origin.png
- data/images/wui/editor/editor_menu_tool_noise_height.png => data/images/wui/editor/tools/noise_height.png
- data/images/wui/editor/editor_menu_player_menu.png => data/images/wui/editor/tools/players.png
- data/images/wui/editor/editor_menu_tool_set_port_space.png => data/images/wui/editor/tools/port_spaces.png
- data/images/wui/editor/editor_menu_tool_resize.png => data/images/wui/editor/tools/resize_map.png
- data/images/wui/editor/editor_menu_tool_change_resources.png => data/images/wui/editor/tools/resources.png
- data/images/wui/editor/editor_menu_tool_set_terrain.png => data/images/wui/editor/tools/terrain.png
- data/images/wui/menus/menu_chat.png => data/images/wui/menus/chat.png
- data/images/wui/menus/menu_exit_game.png => data/images/wui/menus/exit.png
- data/images/wui/menus/menu_goto.png => data/images/wui/menus/goto.png
- data/images/wui/menus/menu_options_menu.png => data/images/wui/menus/main_menu.png
- data/images/wui/menus/menu_toggle_newmessage_menu.png => data/images/wui/menus/message_new.png
- data/images/wui/menus/menu_toggle_oldmessage_menu.png => data/images/wui/menus/message_old.png
- data/images/wui/menus/menu_objectives.png => data/images/wui/menus/objectives.png
- data/images/wui/menus/menu_save_game.png => data/images/wui/menus/save_game.png
- data/images/wui/fieldaction/menu_show_workarea_overlap.png => data/images/wui/menus/show_workarea_overlap.png
- data/images/wui/menus/menu_toggle_menu.png => data/images/wui/menus/statistics.png
- data/images/wui/menus/menu_building_stats.png => data/images/wui/menus/statistics_buildings.png
- data/images/wui/menus/menu_general_stats.png => data/images/wui/menus/statistics_general.png
- data/images/wui/menus/menu_stock.png => data/images/wui/menus/statistics_stock.png
- data/images/wui/menus/menu_ware_stats.png => data/images/wui/menus/statistics_wares.png
- data/images/wui/menus/menu_toggle_bobs.png => data/images/wui/menus/toggle_bobs.png
- data/images/wui/menus/menu_toggle_buildhelp.png => data/images/wui/menus/toggle_buildhelp.png
- data/images/wui/fieldaction/menu_show_census.png => data/images/wui/menus/toggle_census.png
- data/images/wui/menus/menu_toggle_immovables.png => data/images/wui/menus/toggle_immovables.png
- data/images/wui/menus/menu_toggle_minimap.png => data/images/wui/menus/toggle_minimap.png
- data/images/wui/menus/menu_toggle_resources.png => data/images/wui/menus/toggle_resources.png
- data/images/wui/fieldaction/menu_show_statistics.png => data/images/wui/menus/toggle_statistics.png
- data/images/wui/menus/menu_watch_follow.png => data/images/wui/menus/watch_follow.png
- data/images/wui/menus/menu_reset_zoom.png => data/images/wui/menus/zoom_reset.png
- data/world/critters/elk/ => data/world/critters/moose/
- files modified:
- CMakeLists.txt
expand all
collapse all
added
removed
data/images/wui/editor/menus/load_map.png
data/images/wui/editor/menus/main_menu.png
data/images/wui/editor/menus/map_options.png
data/images/wui/editor/menus/new_map.png
data/images/wui/editor/menus/new_random_map.png
data/images/wui/editor/menus/save_map.png
data/images/wui/menus/gamespeed.png
data/images/wui/menus/gamespeed_decrease.png
data/images/wui/menus/gamespeed_increase.png
data/images/wui/menus/gamespeed_pause.png
data/images/wui/menus/gamespeed_resume.png
data/images/wui/menus/lua.png
data/images/wui/menus/menu_toggle_grid.png
data/images/wui/menus/options.png
data/images/wui/menus/showhide.png
data/images/wui/menus/statistics_seafaring.png
data/images/wui/menus/zoom_decrease.png
data/images/wui/menus/zoom_increase.png
data/images/wui/toolbar/center.png
data/images/wui/toolbar/left.png
data/images/wui/toolbar/left_corner.png
data/images/wui/toolbar/right.png
data/images/wui/toolbar/right_corner.png
data/tribes/images/atlanteans/toolbar_center.png
data/tribes/images/atlanteans/toolbar_left.png
data/tribes/images/atlanteans/toolbar_left_corner.png
data/tribes/images/atlanteans/toolbar_right.png
data/tribes/images/atlanteans/toolbar_right_corner.png
