← Back to branch summary

~widelands-dev/widelands/trunk

~widelands-dev/widelands/trunk

Viewing all changes in revision 7740.

Committer: Wideland's Bunnybot
Date: 2016-01-25 08:41:09 UTC
mfrom: (7737.1.1 bug-1395278)
Revision ID: bunnybot@widelands.org-20160125084109-l8nbxl59idl0fmf6

Merged lp:~klaus-halfmann/widelands/bug-1395278-wui.

files modified:
src/ai/computer_player.cc

src/ai/computer_player.h

src/logic/map_objects/tribes/tribe_descr.h

src/logic/player.h

src/wlapplication.cc

src/wlapplication.h

src/wui/buildingwindow.cc

src/wui/buildingwindow.h

src/wui/debugconsole.cc

src/wui/debugconsole.h

src/wui/edge_overlay_manager.cc

src/wui/edge_overlay_manager.h

src/wui/field_overlay_manager.cc

src/wui/field_overlay_manager.h

src/wui/game_chat_menu.cc

src/wui/game_chat_menu.h

src/wui/game_main_menu.cc

src/wui/game_main_menu.h

src/wui/game_main_menu_save_game.cc

src/wui/game_main_menu_save_game.h

src/wui/game_message_menu.cc

src/wui/game_message_menu.h

src/wui/game_summary.cc

src/wui/game_summary.h

src/wui/game_tips.cc

src/wui/game_tips.h

src/wui/gamechatpanel.cc

src/wui/gamechatpanel.h

src/wui/general_statistics_menu.cc

src/wui/general_statistics_menu.h

src/wui/interactive_gamebase.cc

src/wui/interactive_gamebase.h

src/wui/interactive_player.cc

src/wui/interactive_player.h

src/wui/interactive_spectator.cc

src/wui/interactive_spectator.h

src/wui/itemwaresdisplay.cc

src/wui/itemwaresdisplay.h

src/wui/mapdata.h

src/wui/mapview.cc

src/wui/mapview.h

src/wui/minimap.cc

src/wui/minimap.h

src/wui/multiplayersetupgroup.cc

src/wui/multiplayersetupgroup.h

src/wui/playerdescrgroup.cc

src/wui/playerdescrgroup.h

src/wui/plot_area.cc

src/wui/plot_area.h

src/wui/productionsitewindow.cc

src/wui/productionsitewindow.h

src/wui/quicknavigation.cc

src/wui/quicknavigation.h

src/wui/soldierlist.cc

src/wui/stock_menu.cc

src/wui/stock_menu.h

src/wui/story_message_box.h

src/wui/suggested_teams_box.cc

src/wui/suggested_teams_box.h

src/wui/transport_draw.cc

src/wui/transport_ui.cc

src/wui/ware_statistics_menu.cc

src/wui/ware_statistics_menu.h

src/wui/warehousewindow.cc

src/wui/waresdisplay.cc

src/wui/waresdisplay.h

src/wui/waresqueuedisplay.cc

src/wui/waresqueuedisplay.h

Show diffs side-by-side

added added

removed removed

src/ai/computer_player.cc

src/ai/computer_player.h

src/logic/map_objects/tribes/tribe_descr.h

src/logic/player.h

src/wlapplication.cc

src/wlapplication.h

src/wui/buildingwindow.cc

src/wui/buildingwindow.h

src/wui/debugconsole.cc

src/wui/debugconsole.h

src/wui/edge_overlay_manager.cc

src/wui/edge_overlay_manager.h

src/wui/field_overlay_manager.cc

src/wui/field_overlay_manager.h

src/wui/game_chat_menu.cc

src/wui/game_chat_menu.h

src/wui/game_main_menu.cc

src/wui/game_main_menu.h

src/wui/game_main_menu_save_game.cc

src/wui/game_main_menu_save_game.h

src/wui/game_message_menu.cc

src/wui/game_message_menu.h

src/wui/game_summary.cc

src/wui/game_summary.h

src/wui/game_tips.cc

src/wui/game_tips.h

src/wui/gamechatpanel.cc

src/wui/gamechatpanel.h

src/wui/general_statistics_menu.cc

src/wui/general_statistics_menu.h

src/wui/interactive_gamebase.cc

src/wui/interactive_gamebase.h

src/wui/interactive_player.cc

src/wui/interactive_player.h

src/wui/interactive_spectator.cc

src/wui/interactive_spectator.h

src/wui/itemwaresdisplay.cc

src/wui/itemwaresdisplay.h

src/wui/mapdata.h

src/wui/mapview.cc

src/wui/mapview.h

src/wui/minimap.cc

src/wui/minimap.h

src/wui/multiplayersetupgroup.cc

src/wui/multiplayersetupgroup.h

src/wui/playerdescrgroup.cc

src/wui/playerdescrgroup.h

src/wui/plot_area.cc

src/wui/plot_area.h

src/wui/productionsitewindow.cc

src/wui/productionsitewindow.h

src/wui/quicknavigation.cc

src/wui/quicknavigation.h

src/wui/soldierlist.cc

src/wui/stock_menu.cc

src/wui/stock_menu.h

src/wui/story_message_box.h

src/wui/suggested_teams_box.cc

src/wui/suggested_teams_box.h

src/wui/transport_draw.cc

src/wui/transport_ui.cc

src/wui/ware_statistics_menu.cc

src/wui/ware_statistics_menu.h

src/wui/warehousewindow.cc

src/wui/waresdisplay.cc

src/wui/waresdisplay.h

src/wui/waresqueuedisplay.cc

src/wui/waresqueuedisplay.h

Older »