← Back to branch summary

~stdh/widelands/rewrite_wincondition

~stdh/widelands/rewrite_wincondition

Viewing all changes in revision 6698.

Committer: Steven De Herdt
Date: 2013-08-09 15:47:45 UTC
mfrom: (6695.1.16 widelands)
Revision ID: steven.deherdt@gmail.com-20130809154745-fnabls6qn6vxpsjr

Merge trunk. With game end screen!

files added:
pics/menu_ship_cancel_expedition.png

pics/menu_ship_sink.png

src/logic/playersmanager.cc

src/logic/playersmanager.h

src/wui/game_summary.cc

src/wui/game_summary.h

files removed:
test/compatibility/build13-test1.wgf

test/compatibility/build14-battle.wgf

files renamed:
src/wui/buildingconfirm.cc => src/wui/actionconfirm.cc

src/wui/buildingconfirm.h => src/wui/actionconfirm.h

files modified:
CMakeLists.txt

maps/Crossing the horizon.wmf/elemental

po/map_plateau.wmf/map_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/mp_scenario_together_we_re_strong.wmf/mp_scenario_together_we_re_strong.wmf.pot

po/scenario_atl01.wmf/scenario_atl01.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_t01.wmf/scenario_t01.wmf.pot

po/scenario_t02.wmf/scenario_t02.wmf.pot

po/scenario_t03.wmf/scenario_t03.wmf.pot

po/scenario_tutorial01.wmf/scenario_tutorial01.wmf.pot

po/texts/texts.pot

po/tribe_atlanteans/tribe_atlanteans.pot

po/tribe_barbarians/tribe_barbarians.pot

po/tribe_empire/tribe_empire.pot

po/widelands/widelands.pot

po/win_conditions/win_conditions.pot

po/world_blackland/world_blackland.pot

po/world_desert/world_desert.pot

po/world_greenland/world_greenland.pot

po/world_winterland/world_winterland.pot

scripting/win_condition_functions.lua

scripting/win_conditions/01_defeat_all.lua

scripting/win_conditions/02_collectors.lua

scripting/win_conditions/03_territorial_lord.lua

scripting/win_conditions/03_territorial_time.lua

scripting/win_conditions/04_wood_gnome.lua

src/game_io/game_preload_data_packet.cc

src/game_io/game_preload_data_packet.h

src/gamecontroller.cc

src/gamecontroller.h

src/gamesettings.h

src/graphic/in_memory_image.cc

src/graphic/render/gl_surface_screen.cc

src/graphic/render/minimaprenderer.cc

src/graphic/render/minimaprenderer.h

src/logic/battle.cc

src/logic/building.cc

src/logic/building.h

src/logic/editor_game_base.cc

src/logic/editor_game_base.h

src/logic/game.cc

src/logic/game.h

src/logic/immovable.cc

src/logic/message.h

src/logic/militarysite.cc

src/logic/player.cc

src/logic/playercommand.cc

src/logic/playercommand.h

src/logic/production_program.cc

src/logic/queue_cmd_factory.cc

src/logic/queue_cmd_ids.h

src/logic/ship.cc

src/logic/ship.h

src/logic/soldier.cc

src/logic/warehouse.cc

src/logic/warehouse.h

src/logic/worker.cc

src/logic/worker_descr.cc

src/network/internet_gaming.cc

src/network/internet_gaming_messages.cc

src/network/netclient.cc

src/network/netclient.h

src/network/nethost.cc

src/network/nethost.h

src/save_handler.cc

src/scripting/lua_game.cc

src/scripting/lua_ui.h

src/ui_basic/icon.cc

src/ui_basic/icon.h

src/ui_basic/table.cc

src/ui_basic/textarea.h

src/ui_fsmenu/loadgame.cc

src/ui_fsmenu/loadgame.h

src/ui_fsmenu/loadreplay.cc

src/ui_fsmenu/loadreplay.h

src/ui_fsmenu/main.h

src/wlapplication.cc

src/wui/buildingwindow.cc

src/wui/fieldaction.cc

src/wui/game_debug_ui.cc

src/wui/game_main_menu_save_game.cc

src/wui/interactive_gamebase.cc

src/wui/interactive_gamebase.h

src/wui/minimap.cc

src/wui/shipwindow.cc

src/wui/warehousewindow.cc

src/wui/waresdisplay.cc

Show diffs side-by-side

added added

removed removed

maps/Crossing the horizon.wmf/elemental

pics/menu_ship_cancel_expedition.png

pics/menu_ship_sink.png

po/map_plateau.wmf/map_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/mp_scenario_together_we_re_strong.wmf/mp_scenario_together_we_re_strong.wmf.pot

po/scenario_atl01.wmf/scenario_atl01.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_t01.wmf/scenario_t01.wmf.pot

po/scenario_t02.wmf/scenario_t02.wmf.pot

po/scenario_t03.wmf/scenario_t03.wmf.pot

po/scenario_tutorial01.wmf/scenario_tutorial01.wmf.pot

po/texts/texts.pot

po/tribe_atlanteans/tribe_atlanteans.pot

po/tribe_barbarians/tribe_barbarians.pot

po/tribe_empire/tribe_empire.pot

po/widelands/widelands.pot

po/win_conditions/win_conditions.pot

po/world_blackland/world_blackland.pot

po/world_desert/world_desert.pot

po/world_greenland/world_greenland.pot

po/world_winterland/world_winterland.pot

scripting/win_condition_functions.lua

scripting/win_conditions/01_defeat_all.lua

scripting/win_conditions/02_collectors.lua

scripting/win_conditions/03_territorial_lord.lua

scripting/win_conditions/03_territorial_time.lua

scripting/win_conditions/04_wood_gnome.lua

src/game_io/game_preload_data_packet.cc

src/game_io/game_preload_data_packet.h

src/gamecontroller.cc

src/gamecontroller.h

src/gamesettings.h

src/graphic/in_memory_image.cc

src/graphic/render/gl_surface_screen.cc

src/graphic/render/minimaprenderer.cc

src/graphic/render/minimaprenderer.h

src/logic/battle.cc

src/logic/building.cc

src/logic/building.h

src/logic/editor_game_base.cc

src/logic/editor_game_base.h

src/logic/game.cc

src/logic/game.h

src/logic/immovable.cc

src/logic/message.h

src/logic/militarysite.cc

src/logic/player.cc

src/logic/playercommand.cc

src/logic/playercommand.h

src/logic/playersmanager.cc

src/logic/playersmanager.h

src/logic/production_program.cc

src/logic/queue_cmd_factory.cc

src/logic/queue_cmd_ids.h

src/logic/ship.cc

src/logic/ship.h

src/logic/soldier.cc

src/logic/warehouse.cc

src/logic/warehouse.h

src/logic/worker.cc

src/logic/worker_descr.cc

src/network/internet_gaming.cc

src/network/internet_gaming_messages.cc

src/network/netclient.cc

src/network/netclient.h

src/network/nethost.cc

src/network/nethost.h

src/save_handler.cc

src/scripting/lua_game.cc

src/scripting/lua_ui.h

src/ui_basic/icon.cc

src/ui_basic/icon.h

src/ui_basic/table.cc

src/ui_basic/textarea.h

src/ui_fsmenu/loadgame.cc

src/ui_fsmenu/loadgame.h

src/ui_fsmenu/loadreplay.cc

src/ui_fsmenu/loadreplay.h

src/ui_fsmenu/main.h

src/wlapplication.cc

src/wui/actionconfirm.cc

src/wui/actionconfirm.h

src/wui/buildingwindow.cc

src/wui/fieldaction.cc

src/wui/game_debug_ui.cc

src/wui/game_main_menu_save_game.cc

src/wui/game_summary.cc

src/wui/game_summary.h

src/wui/interactive_gamebase.cc

src/wui/interactive_gamebase.h

src/wui/minimap.cc

src/wui/shipwindow.cc

src/wui/warehousewindow.cc

src/wui/waresdisplay.cc

test/compatibility/build13-test1.wgf

test/compatibility/build14-battle.wgf

Older »