[Commits] [wesnoth/wesnoth] 202408: simplify font::manager object a bit, give better e...

[GitHub]

  Branch: refs/heads/master
  Home:   https://github.com/wesnoth/wesnoth
  Commit: 202408f28e798f3d2a3c7d2014bf66c47512c8fd
      https://github.com/wesnoth/wesnoth/commit/202408f28e798f3d2a3c7d2014bf66c47512c8fd
  Author: Chris Beck <beck.ct at gmail.com>
  Date:   2016-10-16 (Sun, 16 Oct 2016)

  Changed paths:
    M src/font/font_config.cpp
    M src/font/font_config.hpp
    M src/game_launcher.cpp
    M src/game_launcher.hpp
    M src/wesnoth.cpp

  Log Message:
  -----------
  simplify font::manager object a bit, give better error messages for font initialization failure


  Commit: 5c86a1bd762d0ade1d59e08f6f1172904b5d3491
      https://github.com/wesnoth/wesnoth/commit/5c86a1bd762d0ade1d59e08f6f1172904b5d3491
  Author: Chris Beck <beck.ct at gmail.com>
  Date:   2016-10-16 (Sun, 16 Oct 2016)

  Changed paths:
    M CMakeLists.txt
    M projectfiles/CodeBlocks/wesnoth.cbp
    M projectfiles/VC12/wesnoth.vcxproj
    M projectfiles/VC12/wesnoth.vcxproj.filters
    M projectfiles/VC12/wesnothd.vcxproj
    M projectfiles/VC12/wesnothlib.vcxproj
    M projectfiles/VC12/wesnothlib.vcxproj.filters
    M src/SConscript
    M src/actions/undo_action.cpp
    M src/addon/manager_ui.cpp
    A src/boost-patched/bind/arg.hpp
    M src/editor/action/mouse/mouse_action.hpp
    M src/editor/action/mouse/mouse_action_select.hpp
    M src/formula/variant.cpp
    M src/game_initialization/connect_engine.cpp
    M src/game_initialization/multiplayer_configure.cpp
    M src/game_initialization/multiplayer_lobby.cpp
    M src/game_initialization/playcampaign.cpp
    M src/game_launcher.cpp
    M src/gui/core/canvas.cpp
    M src/gui/core/event/handler.cpp
    M src/gui/dialogs/lobby/data.cpp
    M src/gui/dialogs/multiplayer/faction_select.cpp
    M src/help/help_impl.cpp
    M src/help/help_text_area.cpp
    M src/hotkey/hotkey_handler.cpp
    M src/persist_context.cpp
    M src/playturn_network_adapter.cpp
    M src/random_new.cpp
    M src/scripting/lua_common.cpp
    M src/scripting/lua_unit_attacks.cpp
    M src/sdl/utils.cpp
    M src/serialization/string_utils.cpp
    M src/serialization/string_utils.hpp
    M src/show_dialog.cpp
    M src/terrain/filter.cpp
    M src/theme.cpp
    M src/units/attack_type.hpp
    M src/video.cpp
    M src/whiteboard/side_actions.cpp

  Log Message:
  -----------
  Merge branch 'master' of http://github.com/wesnoth/wesnoth


  Commit: 545800f9f84788b07e8dc8ead1cad121ca5e1c95
      https://github.com/wesnoth/wesnoth/commit/545800f9f84788b07e8dc8ead1cad121ca5e1c95
  Author: Chris Beck <beck.ct at gmail.com>
  Date:   2016-10-16 (Sun, 16 Oct 2016)

  Changed paths:
    A src/font/error.hpp
    M src/font/font_config.cpp
    M src/font/font_config.hpp
    M src/font/sdl_ttf.cpp
    M src/wesnoth.cpp

  Log Message:
  -----------
  give better error messages for font initialization failure


Compare: https://github.com/wesnoth/wesnoth/compare/52962540ff00...545800f9f847