[Commits] [wesnoth/wesnoth] 4ae13d: Refactor calls to CVideo::flip()

GitHub noreply at github.com
Sun Aug 7 09:59:01 UTC 2016


  Branch: refs/heads/renderpath_redo
  Home:   https://github.com/wesnoth/wesnoth
  Commit: 4ae13de2c30b9739ce7e6f6bbc860e073deaa273
      https://github.com/wesnoth/wesnoth/commit/4ae13de2c30b9739ce7e6f6bbc860e073deaa273
  Author: Andreas Löf <andreas at alternating.net>
  Date:   2016-03-20 (Sun, 20 Mar 2016)

  Changed paths:
    M src/about.cpp
    M src/construct_dialog.cpp
    M src/controller_base.cpp
    M src/dialogs.cpp
    M src/editor/controller/editor_controller.cpp
    M src/events.cpp
    M src/events.hpp
    M src/game_initialization/multiplayer.cpp
    M src/generators/default_map_generator.cpp
    M src/gui/auxiliary/event/handler.cpp
    M src/gui/widgets/window.cpp
    M src/help/help.cpp
    M src/hotkey/hotkey_preferences_display.cpp
    M src/intro.cpp
    M src/loadscreen.cpp
    M src/loadscreen.hpp
    M src/play_controller.cpp
    M src/storyscreen/render.cpp
    M src/wesnoth.cpp

  Log Message:
  -----------
  Refactor calls to CVideo::flip()

This adds a timer in the SDL event queue that fires every 20ms in order to add a draw event into the queue. After the draw event has been processed by all listener, a call to CVideo::flip() is made. All other calls to CVideo::flip() have been removed.

This is the first step towards simplifying the rendering path and making sure the screen is in a consistent state when the flip() call is made. Having the screen in a consistent state will resolve flickering.

This incidentially also fixes resizing in load screens by always blanking them and doing a full re-render.


  Commit: 70a9845511a6140a321faaae07237e2d184b2c78
      https://github.com/wesnoth/wesnoth/commit/70a9845511a6140a321faaae07237e2d184b2c78
  Author: Andreas Löf <andreas at alternating.net>
  Date:   2016-03-20 (Sun, 20 Mar 2016)

  Changed paths:
    M RELEASE_NOTES
    M changelog
    M data/ai/micro_ais/scenarios/animals.cfg
    M data/ai/micro_ais/scenarios/bottleneck_defense.cfg
    M data/ai/micro_ais/scenarios/protect_unit.cfg
    M data/ai/micro_ais/scenarios/wolves.cfg
    M data/core/images/terrain/sand/shore-concave-bl-br.png
    M data/core/images/terrain/sand/shore-concave-bl-l.png
    M data/core/images/terrain/sand/shore-concave-br-bl.png
    M data/core/images/terrain/sand/shore-concave-br-r.png
    M data/core/images/terrain/sand/shore-concave-l-bl.png
    M data/core/images/terrain/sand/shore-concave-l-tl.png
    M data/core/images/terrain/sand/shore-concave-r-br.png
    M data/core/images/terrain/sand/shore-concave-r-tr.png
    M data/core/images/terrain/sand/shore-concave-tl-l.png
    M data/core/images/terrain/sand/shore-concave-tl-tr.png
    M data/core/images/terrain/sand/shore-concave-tr-r.png
    M data/core/images/terrain/sand/shore-concave-tr-tl.png
    M data/core/images/terrain/sand/shore-convex-bl-br.png
    M data/core/images/terrain/sand/shore-convex-bl-l.png
    M data/core/images/terrain/sand/shore-convex-br-bl.png
    M data/core/images/terrain/sand/shore-convex-br-r.png
    M data/core/images/terrain/sand/shore-convex-l-bl.png
    M data/core/images/terrain/sand/shore-convex-l-tl.png
    M data/core/images/terrain/sand/shore-convex-r-br.png
    M data/core/images/terrain/sand/shore-convex-r-tr.png
    M data/core/images/terrain/sand/shore-convex-tl-l.png
    M data/core/images/terrain/sand/shore-convex-tl-tr.png
    M data/core/images/terrain/sand/shore-convex-tr-r.png
    M data/core/images/terrain/sand/shore-convex-tr-tl.png
    M data/core/terrain-graphics/new-macros.cfg
    M data/gui/default.cfg
    R data/gui/default/macros/_initial.cfg
    R data/gui/default/macros/filler.cfg
    R data/gui/default/macros/horizontal_scrollbar.cfg
    R data/gui/default/macros/vertical_scrollbar.cfg
    R data/gui/default/widget/button_25x25.cfg
    R data/gui/default/widget/button_default.cfg
    R data/gui/default/widget/combobox_default.cfg
    R data/gui/default/widget/drawing_default.cfg
    R data/gui/default/widget/horizontal_scrollbar_default.cfg
    R data/gui/default/widget/image_default.cfg
    R data/gui/default/widget/label_default.cfg
    R data/gui/default/widget/label_title_screen_tip.cfg
    R data/gui/default/widget/listbox_default.cfg
    R data/gui/default/widget/listbox_wml_message.cfg
    R data/gui/default/widget/matrix_default.cfg
    R data/gui/default/widget/minimap_default.cfg
    R data/gui/default/widget/multi_page_default.cfg
    R data/gui/default/widget/panel_default.cfg
    R data/gui/default/widget/panel_title_screen.cfg
    R data/gui/default/widget/panel_wml_message.cfg
    R data/gui/default/widget/progress_bar_default.cfg
    R data/gui/default/widget/repeating_button_default.cfg
    R data/gui/default/widget/scroll_label_default.cfg
    R data/gui/default/widget/scroll_label_description.cfg
    R data/gui/default/widget/scroll_label_verbatim.cfg
    R data/gui/default/widget/scroll_label_wml_message.cfg
    R data/gui/default/widget/scrollbar_panel_default.cfg
    R data/gui/default/widget/slider_default.cfg
    R data/gui/default/widget/slider_minimal.cfg
    R data/gui/default/widget/spacer_default.cfg
    R data/gui/default/widget/stacked_widget_default.cfg
    R data/gui/default/widget/text_box_default.cfg
    R data/gui/default/widget/toggle_button_default.cfg
    R data/gui/default/widget/toggle_button_icon.cfg
    R data/gui/default/widget/toggle_button_listbox_header.cfg
    R data/gui/default/widget/toggle_button_listbox_text.cfg
    R data/gui/default/widget/toggle_button_listbox_text_with_icon.cfg
    R data/gui/default/widget/toggle_button_orb.cfg
    R data/gui/default/widget/toggle_button_radio.cfg
    R data/gui/default/widget/toggle_button_tree_view_node.cfg
    R data/gui/default/widget/toggle_panel_default.cfg
    R data/gui/default/widget/toggle_panel_wml_message.cfg
    R data/gui/default/widget/tree_view_default.cfg
    R data/gui/default/widget/unit_preview_pane.cfg
    R data/gui/default/widget/vertical_scrollbar_default.cfg
    R data/gui/default/widget/window_borderless.cfg
    R data/gui/default/widget/window_default.cfg
    R data/gui/default/widget/window_tooltip_large.cfg
    R data/gui/default/window/addon_connect.cfg
    R data/gui/default/window/addon_description.cfg
    R data/gui/default/window/addon_filter_options.cfg
    R data/gui/default/window/addon_list.cfg
    R data/gui/default/window/addon_uninstall_list.cfg
    R data/gui/default/window/advanced_graphics_options.cfg
    R data/gui/default/window/campaign_dialog.cfg
    R data/gui/default/window/campaign_difficulty.cfg
    R data/gui/default/window/campaign_settings.cfg
    R data/gui/default/window/chat_log.cfg
    R data/gui/default/window/core_dialog.cfg
    R data/gui/default/window/custom_tod.cfg
    R data/gui/default/window/data_manage.cfg
    R data/gui/default/window/debug_clock.cfg
    R data/gui/default/window/depcheck_confirm_change.cfg
    R data/gui/default/window/depcheck_select_new.cfg
    R data/gui/default/window/drop_down_list.cfg
    R data/gui/default/window/edit_label.cfg
    R data/gui/default/window/edit_text.cfg
    R data/gui/default/window/editor_edit_label.cfg
    R data/gui/default/window/editor_edit_scenario.cfg
    R data/gui/default/window/editor_edit_side.cfg
    R data/gui/default/window/editor_generate_map.cfg
    R data/gui/default/window/editor_new_map.cfg
    R data/gui/default/window/editor_resize_map.cfg
    R data/gui/default/window/editor_set_starting_position.cfg
    R data/gui/default/window/folder_create.cfg
    R data/gui/default/window/formula_debugger.cfg
    R data/gui/default/window/game_cache_options.cfg
    R data/gui/default/window/game_delete.cfg
    R data/gui/default/window/game_load.cfg
    R data/gui/default/window/game_save.cfg
    R data/gui/default/window/game_save_message.cfg
    R data/gui/default/window/game_save_oos.cfg
    R data/gui/default/window/game_save_overwrite.cfg
    R data/gui/default/window/game_version.cfg
    R data/gui/default/window/gamestate_inspector.cfg
    R data/gui/default/window/label_settings.cfg
    R data/gui/default/window/language_selection.cfg
    R data/gui/default/window/lobby_main.cfg
    R data/gui/default/window/lobby_player_info.cfg
    R data/gui/default/window/lua_interpreter.cfg
    R data/gui/default/window/message.cfg
    R data/gui/default/window/mp_alerts_options.cfg
    R data/gui/default/window/mp_change_control.cfg
    R data/gui/default/window/mp_cmd_wrapper.cfg
    R data/gui/default/window/mp_connect.cfg
    R data/gui/default/window/mp_create_game.cfg
    R data/gui/default/window/mp_create_game_choose_mods.cfg
    R data/gui/default/window/mp_create_game_set_password.cfg
    R data/gui/default/window/mp_host_game_prompt.cfg
    R data/gui/default/window/mp_join_game_password_prompt.cfg
    R data/gui/default/window/mp_login.cfg
    R data/gui/default/window/mp_method_selection.cfg
    R data/gui/default/window/mp_server_list.cfg
    R data/gui/default/window/network_transmission.cfg
    R data/gui/default/window/preferences.cfg
    R data/gui/default/window/preferences/01_general.cfg
    R data/gui/default/window/preferences/02_hotkeys.cfg
    R data/gui/default/window/preferences/03_display.cfg
    R data/gui/default/window/preferences/04_sound.cfg
    R data/gui/default/window/preferences/05_multiplayer.cfg
    R data/gui/default/window/preferences/06_advanced.cfg
    R data/gui/default/window/preferences/_final.cfg
    R data/gui/default/window/preferences/_initial.cfg
    R data/gui/default/window/screenshot_notification.cfg
    R data/gui/default/window/select_orb_colors.cfg
    R data/gui/default/window/simple_item_selector.cfg
    R data/gui/default/window/synced_choice_wait.cfg
    R data/gui/default/window/theme_list.cfg
    R data/gui/default/window/title_screen.cfg
    R data/gui/default/window/tooltip_large.cfg
    R data/gui/default/window/transient_message.cfg
    R data/gui/default/window/unit_attack.cfg
    R data/gui/default/window/unit_create.cfg
    R data/gui/default/window/unit_recruit.cfg
    R data/gui/default/window/wml_error.cfg
    R data/gui/default/window/wml_message.cfg
    A data/gui/macros/_initial.cfg
    A data/gui/macros/filler.cfg
    A data/gui/macros/horizontal_scrollbar.cfg
    A data/gui/macros/vertical_scrollbar.cfg
    A data/gui/widget/button_25x25.cfg
    A data/gui/widget/button_default.cfg
    A data/gui/widget/combobox_default.cfg
    A data/gui/widget/drawing_default.cfg
    A data/gui/widget/horizontal_scrollbar_default.cfg
    A data/gui/widget/image_default.cfg
    A data/gui/widget/label_default.cfg
    A data/gui/widget/label_title_screen_tip.cfg
    A data/gui/widget/listbox_default.cfg
    A data/gui/widget/listbox_wml_message.cfg
    A data/gui/widget/matrix_default.cfg
    A data/gui/widget/minimap_default.cfg
    A data/gui/widget/multi_page_default.cfg
    A data/gui/widget/panel_default.cfg
    A data/gui/widget/panel_title_screen.cfg
    A data/gui/widget/panel_wml_message.cfg
    A data/gui/widget/progress_bar_default.cfg
    A data/gui/widget/repeating_button_default.cfg
    A data/gui/widget/scroll_label_default.cfg
    A data/gui/widget/scroll_label_description.cfg
    A data/gui/widget/scroll_label_verbatim.cfg
    A data/gui/widget/scroll_label_wml_message.cfg
    A data/gui/widget/scrollbar_panel_default.cfg
    A data/gui/widget/slider_default.cfg
    A data/gui/widget/slider_minimal.cfg
    A data/gui/widget/spacer_default.cfg
    A data/gui/widget/stacked_widget_default.cfg
    A data/gui/widget/text_box_default.cfg
    A data/gui/widget/toggle_button_default.cfg
    A data/gui/widget/toggle_button_icon.cfg
    A data/gui/widget/toggle_button_listbox_header.cfg
    A data/gui/widget/toggle_button_listbox_text.cfg
    A data/gui/widget/toggle_button_listbox_text_with_icon.cfg
    A data/gui/widget/toggle_button_orb.cfg
    A data/gui/widget/toggle_button_radio.cfg
    A data/gui/widget/toggle_button_tree_view_node.cfg
    A data/gui/widget/toggle_panel_default.cfg
    A data/gui/widget/toggle_panel_wml_message.cfg
    A data/gui/widget/tree_view_default.cfg
    A data/gui/widget/unit_preview_pane.cfg
    A data/gui/widget/vertical_scrollbar_default.cfg
    A data/gui/widget/window_borderless.cfg
    A data/gui/widget/window_default.cfg
    A data/gui/widget/window_tooltip_large.cfg
    A data/gui/window/addon_connect.cfg
    A data/gui/window/addon_description.cfg
    A data/gui/window/addon_filter_options.cfg
    A data/gui/window/addon_list.cfg
    A data/gui/window/addon_uninstall_list.cfg
    A data/gui/window/advanced_graphics_options.cfg
    A data/gui/window/campaign_dialog.cfg
    A data/gui/window/campaign_difficulty.cfg
    A data/gui/window/campaign_settings.cfg
    A data/gui/window/chat_log.cfg
    A data/gui/window/core_dialog.cfg
    A data/gui/window/custom_tod.cfg
    A data/gui/window/data_manage.cfg
    A data/gui/window/debug_clock.cfg
    A data/gui/window/depcheck_confirm_change.cfg
    A data/gui/window/depcheck_select_new.cfg
    A data/gui/window/drop_down_list.cfg
    A data/gui/window/edit_label.cfg
    A data/gui/window/edit_text.cfg
    A data/gui/window/editor_edit_label.cfg
    A data/gui/window/editor_edit_scenario.cfg
    A data/gui/window/editor_edit_side.cfg
    A data/gui/window/editor_generate_map.cfg
    A data/gui/window/editor_new_map.cfg
    A data/gui/window/editor_resize_map.cfg
    A data/gui/window/editor_set_starting_position.cfg
    A data/gui/window/folder_create.cfg
    A data/gui/window/formula_debugger.cfg
    A data/gui/window/game_cache_options.cfg
    A data/gui/window/game_delete.cfg
    A data/gui/window/game_load.cfg
    A data/gui/window/game_save.cfg
    A data/gui/window/game_save_message.cfg
    A data/gui/window/game_save_oos.cfg
    A data/gui/window/game_save_overwrite.cfg
    A data/gui/window/game_version.cfg
    A data/gui/window/gamestate_inspector.cfg
    A data/gui/window/label_settings.cfg
    A data/gui/window/language_selection.cfg
    A data/gui/window/lobby_main.cfg
    A data/gui/window/lobby_player_info.cfg
    A data/gui/window/lua_interpreter.cfg
    A data/gui/window/message.cfg
    A data/gui/window/mp_alerts_options.cfg
    A data/gui/window/mp_change_control.cfg
    A data/gui/window/mp_cmd_wrapper.cfg
    A data/gui/window/mp_connect.cfg
    A data/gui/window/mp_create_game.cfg
    A data/gui/window/mp_create_game_choose_mods.cfg
    A data/gui/window/mp_create_game_set_password.cfg
    A data/gui/window/mp_host_game_prompt.cfg
    A data/gui/window/mp_join_game_password_prompt.cfg
    A data/gui/window/mp_login.cfg
    A data/gui/window/mp_method_selection.cfg
    A data/gui/window/mp_server_list.cfg
    A data/gui/window/network_transmission.cfg
    A data/gui/window/preferences.cfg
    A data/gui/window/preferences/01_general.cfg
    A data/gui/window/preferences/02_hotkeys.cfg
    A data/gui/window/preferences/03_display.cfg
    A data/gui/window/preferences/04_sound.cfg
    A data/gui/window/preferences/05_multiplayer.cfg
    A data/gui/window/preferences/06_advanced.cfg
    A data/gui/window/preferences/_final.cfg
    A data/gui/window/preferences/_initial.cfg
    A data/gui/window/screenshot_notification.cfg
    A data/gui/window/select_orb_colors.cfg
    A data/gui/window/simple_item_selector.cfg
    A data/gui/window/synced_choice_wait.cfg
    A data/gui/window/theme_list.cfg
    A data/gui/window/title_screen.cfg
    A data/gui/window/tooltip_large.cfg
    A data/gui/window/transient_message.cfg
    A data/gui/window/unit_attack.cfg
    A data/gui/window/unit_create.cfg
    A data/gui/window/unit_recruit.cfg
    A data/gui/window/wml_error.cfg
    A data/gui/window/wml_message.cfg
    M data/lua/wml/message.lua
    M data/themes/_initial.cfg
    M data/themes/default.cfg
    M po/wesnoth-lib/af.po
    M po/wesnoth-lib/ang.po
    M po/wesnoth-lib/ar.po
    M po/wesnoth-lib/ast.po
    M po/wesnoth-lib/bg.po
    M po/wesnoth-lib/ca.po
    M po/wesnoth-lib/ca_ES at valencia.po
    M po/wesnoth-lib/da.po
    M po/wesnoth-lib/el.po
    M po/wesnoth-lib/eo.po
    M po/wesnoth-lib/et.po
    M po/wesnoth-lib/eu.po
    M po/wesnoth-lib/fur_IT.po
    M po/wesnoth-lib/ga.po
    M po/wesnoth-lib/hr.po
    M po/wesnoth-lib/id.po
    M po/wesnoth-lib/is.po
    M po/wesnoth-lib/ko.po
    M po/wesnoth-lib/lv.po
    M po/wesnoth-lib/mk.po
    M po/wesnoth-lib/mr.po
    M po/wesnoth-lib/nb_NO.po
    M po/wesnoth-lib/racv.po
    M po/wesnoth-lib/ro.po
    M po/wesnoth-lib/tl.po
    M po/wesnoth-lib/tr.po
    M projectfiles/VC9/liblua.vcproj
    M src/actions/attack.cpp
    M src/actions/attack.hpp
    M src/actions/create.cpp
    M src/actions/create.hpp
    M src/actions/heal.cpp
    M src/actions/move.cpp
    M src/actions/move.hpp
    M src/actions/shroud_clearing_action.cpp
    M src/actions/shroud_clearing_action.hpp
    M src/actions/undo.cpp
    M src/actions/undo.hpp
    M src/actions/undo_action.hpp
    M src/actions/undo_dismiss_action.cpp
    M src/actions/undo_dismiss_action.hpp
    M src/actions/undo_move_action.cpp
    M src/actions/undo_move_action.hpp
    M src/actions/undo_recall_action.cpp
    M src/actions/undo_recall_action.hpp
    M src/actions/undo_recruit_action.cpp
    M src/actions/undo_recruit_action.hpp
    M src/actions/undo_update_shroud_action.cpp
    M src/actions/undo_update_shroud_action.hpp
    M src/actions/unit_creator.cpp
    M src/actions/unit_creator.hpp
    M src/actions/vision.cpp
    M src/actions/vision.hpp
    M src/addon/manager.cpp
    M src/ai/actions.cpp
    M src/ai/actions.hpp
    M src/ai/akihara/recruitment.cpp
    M src/ai/akihara/recruitment.hpp
    M src/ai/composite/ai.cpp
    M src/ai/composite/ai.hpp
    M src/ai/composite/aspect.cpp
    M src/ai/composite/aspect.hpp
    M src/ai/composite/component.cpp
    M src/ai/composite/contexts.hpp
    M src/ai/composite/engine.cpp
    M src/ai/composite/engine.hpp
    M src/ai/composite/engine_default.cpp
    M src/ai/composite/engine_fai.cpp
    M src/ai/composite/engine_lua.cpp
    M src/ai/composite/rca.cpp
    M src/ai/composite/stage.cpp
    M src/ai/composite/value_translator.hpp
    M src/ai/configuration.cpp
    M src/ai/configuration.hpp
    M src/ai/contexts.hpp
    M src/ai/default/ai.cpp
    M src/ai/default/ai.hpp
    M src/ai/default/attack.cpp
    M src/ai/default/contexts.cpp
    M src/ai/default/contexts.hpp
    M src/ai/formula/ai.cpp
    M src/ai/formula/callable_objects.cpp
    M src/ai/formula/callable_objects.hpp
    M src/ai/formula/candidates.cpp
    M src/ai/formula/function_table.cpp
    M src/ai/formula/stage_side_formulas.cpp
    M src/ai/formula/stage_side_formulas.hpp
    M src/ai/formula/stage_unit_formulas.cpp
    M src/ai/formula/stage_unit_formulas.hpp
    M src/ai/game_info.hpp
    M src/ai/gamestate_observer.hpp
    M src/ai/interface.hpp
    M src/ai/lua/core.cpp
    M src/ai/lua/lua_object.hpp
    M src/ai/lua/unit_advancements_aspect.cpp
    M src/ai/lua/unit_advancements_aspect.hpp
    M src/ai/manager.cpp
    M src/ai/manager.hpp
    M src/ai/recruitment/recruitment.cpp
    M src/ai/recruitment/recruitment.hpp
    M src/ai/registry.cpp
    M src/ai/simulated_actions.cpp
    M src/ai/testing.cpp
    M src/ai/testing.hpp
    M src/ai/testing/aspect_attacks.cpp
    M src/ai/testing/aspect_attacks.hpp
    M src/ai/testing/ca.cpp
    M src/ai/testing/ca.hpp
    M src/ai/testing/ca_global_fallback.cpp
    M src/ai/testing/ca_global_fallback.hpp
    M src/ai/testing/ca_testing_move_to_targets.cpp
    M src/ai/testing/ca_testing_move_to_targets.hpp
    M src/ai/testing/ca_testing_recruitment.cpp
    M src/ai/testing/ca_testing_recruitment.hpp
    M src/ai/testing/stage_fallback.cpp
    M src/ai/testing/stage_fallback.hpp
    M src/ai/testing/stage_rca.cpp
    M src/ai/testing/stage_rca.hpp
    M src/ai/testing/stage_sf_with_rca.cpp
    M src/ai/testing/stage_sf_with_rca.hpp
    M src/construct_dialog.cpp
    M src/cursor.cpp
    M src/display.cpp
    M src/editor/action/action.hpp
    M src/editor/action/action_base.hpp
    M src/editor/action/action_item.hpp
    M src/editor/action/action_label.hpp
    M src/editor/action/action_unit.cpp
    M src/editor/action/action_unit.hpp
    M src/editor/action/mouse/mouse_action.cpp
    M src/editor/action/mouse/mouse_action_item.cpp
    M src/editor/action/mouse/mouse_action_map_label.cpp
    M src/editor/action/mouse/mouse_action_map_label.hpp
    M src/editor/action/mouse/mouse_action_select.cpp
    M src/editor/action/mouse/mouse_action_unit.cpp
    M src/editor/action/mouse/mouse_action_village.cpp
    M src/editor/controller/editor_controller.cpp
    M src/editor/controller/editor_controller.hpp
    M src/editor/editor_common.hpp
    M src/editor/editor_display.hpp
    M src/editor/editor_main.cpp
    M src/editor/map/editor_map.cpp
    M src/editor/map/editor_map.hpp
    M src/editor/map/map_context.hpp
    M src/editor/palette/editor_palettes.hpp
    M src/editor/palette/item_palette.cpp
    M src/editor/palette/terrain_palettes.cpp
    M src/editor/palette/unit_palette.cpp
    M src/editor/palette/unit_palette.hpp
    M src/editor/toolkit/brush.hpp
    M src/events.cpp
    M src/font.cpp
    M src/game_events/entity_location.cpp
    M src/game_events/entity_location.hpp
    M src/game_events/handlers.cpp
    M src/game_events/handlers.hpp
    M src/game_events/menu_item.cpp
    M src/game_events/menu_item.hpp
    M src/game_events/pump.cpp
    M src/game_events/wmi_container.cpp
    M src/game_events/wmi_container.hpp
    M src/generators/default_map_generator.cpp
    M src/gui/auxiliary/canvas.cpp
    M src/gui/auxiliary/event/dispatcher.hpp
    M src/gui/auxiliary/event/distributor.hpp
    M src/gui/auxiliary/formula.hpp
    M src/gui/auxiliary/log.hpp
    M src/gui/dialogs/chat_log.cpp
    M src/gui/dialogs/chat_log.hpp
    M src/gui/dialogs/editor_generate_map.cpp
    M src/gui/dialogs/formula_debugger.cpp
    M src/gui/dialogs/gamestate_inspector.cpp
    M src/gui/dialogs/gamestate_inspector.hpp
    M src/gui/dialogs/mp_create_game.cpp
    M src/gui/dialogs/synced_choice_wait.cpp
    M src/gui/dialogs/synced_choice_wait.hpp
    M src/gui/dialogs/unit_attack.cpp
    M src/gui/dialogs/unit_attack.hpp
    M src/gui/dialogs/unit_create.cpp
    M src/gui/widgets/control.hpp
    M src/gui/widgets/image.cpp
    M src/gui/widgets/minimap.cpp
    M src/gui/widgets/slider.cpp
    M src/gui/widgets/text.hpp
    M src/hotkey/hotkey_preferences_display.cpp
    M src/lua/ldo.cpp
    M src/reports.cpp
    M src/scripting/game_lua_kernel.cpp
    M src/scripting/game_lua_kernel.hpp
    M src/sdl/shader.cpp
    M src/server/forum_user_handler.cpp
    M src/server/game.cpp
    M src/server/game.hpp
    M src/server/input_stream.cpp
    M src/server/metrics.cpp
    M src/server/player.cpp
    M src/server/player_network.cpp
    M src/server/player_network.hpp
    M src/server/room.cpp
    M src/server/room.hpp
    M src/server/room_manager.cpp
    M src/server/server.cpp
    M src/server/server.hpp
    M src/server/simple_wml.cpp
    M src/server/user_handler.cpp
    M src/server/user_handler.hpp
    M src/show_dialog.cpp
    M src/show_dialog.hpp
    M src/storyscreen/controller.cpp
    M src/storyscreen/controller.hpp
    M src/storyscreen/interface.cpp
    M src/storyscreen/render.cpp
    M src/storyscreen/render.hpp
    M src/team.cpp
    M src/tests/test_lua.cpp
    M src/tests/utils/game_config_manager.cpp
    M src/tools/cutter.cpp
    M src/tools/dummy_video.cpp
    M src/tools/exploder.cpp
    M src/tools/exploder_cutter.hpp
    M src/tools/exploder_utils.hpp
    M src/unit.cpp
    M src/unit.hpp
    M src/unit_attack_type.cpp
    M src/unit_attack_type.hpp
    M src/whiteboard/action.hpp
    M src/whiteboard/manager.hpp
    M src/whiteboard/move.hpp
    M src/whiteboard/typedefs.hpp
    M src/widgets/button.hpp
    M src/widgets/file_menu.hpp
    M src/widgets/label.hpp
    M src/widgets/scrollpane.hpp
    M src/widgets/slider.hpp
    M src/widgets/textbox.hpp
    M src/widgets/widget.hpp

  Log Message:
  -----------
  Merge branch 'master' into renderpath_redo


Compare: https://github.com/wesnoth/wesnoth/compare/4b8e823b0265...70a9845511a6


More information about the Commits mailing list