[Commits] [wesnoth/wesnoth] c9247a: fix bug 22646: tooltips broken in replay viewer

[GitHub]

  Branch: refs/heads/master
  Home:   https://github.com/wesnoth/wesnoth
  Commit: c9247a6eb632e51b13e4073793c11f8e34f1d586
      https://github.com/wesnoth/wesnoth/commit/c9247a6eb632e51b13e4073793c11f8e34f1d586
  Author: Chris Beck <render787 at gmail.com>
  Date:   2014-09-16 (Tue, 16 Sep 2014)

  Changed paths:
    M src/theme.cpp

  Log Message:
  -----------
  fix bug 22646: tooltips broken in replay viewer

Fixes a logic error introduced in this commit:

https://github.com/wesnoth/wesnoth/commit/4e17d42679175534a0215a07cfdfad58a9fc6870#diff-89155afc5a0b890787b4bfa962f217d4R846

I'm not sure, it seems it would have most if not all tooltips
except those related to the map editor.


  Commit: 6957a01b30d1cfdbd5cf8449c3a32a6993062f8d
      https://github.com/wesnoth/wesnoth/commit/6957a01b30d1cfdbd5cf8449c3a32a6993062f8d
  Author: Chris Beck <render787 at gmail.com>
  Date:   2014-09-16 (Tue, 16 Sep 2014)

  Changed paths:
    M src/theme.cpp

  Log Message:
  -----------
  fix whitespace

Again from commit https://github.com/wesnoth/wesnoth/commit/4e17d42679175534a0215a07cfdfad58a9fc6870#diff-89155afc5a0b890787b4bfa962f217d4R846


  Commit: e1d07fbb59c35cf13d5feb9b40226594fbf20434
      https://github.com/wesnoth/wesnoth/commit/e1d07fbb59c35cf13d5feb9b40226594fbf20434
  Author: Chris Beck <render787 at gmail.com>
  Date:   2014-09-16 (Tue, 16 Sep 2014)

  Changed paths:
    M changelog

  Log Message:
  -----------
  update changelog


  Commit: 63bb1c4eff17e6992aa26a65dc2804f1701838af
      https://github.com/wesnoth/wesnoth/commit/63bb1c4eff17e6992aa26a65dc2804f1701838af
  Author: Chris Beck <render787 at gmail.com>
  Date:   2014-09-16 (Tue, 16 Sep 2014)

  Changed paths:
    M changelog
    R data/core/images/units/undead-skeletal/revenant-attack-1.png
    R data/core/images/units/undead-skeletal/revenant-attack-10.png
    R data/core/images/units/undead-skeletal/revenant-attack-2.png
    R data/core/images/units/undead-skeletal/revenant-attack-3.png
    R data/core/images/units/undead-skeletal/revenant-attack-4.png
    R data/core/images/units/undead-skeletal/revenant-attack-5.png
    R data/core/images/units/undead-skeletal/revenant-attack-6.png
    R data/core/images/units/undead-skeletal/revenant-attack-7.png
    R data/core/images/units/undead-skeletal/revenant-attack-8.png
    R data/core/images/units/undead-skeletal/revenant-attack-9.png
    R data/core/images/units/undead-skeletal/revenant-defend-1.png
    R data/core/images/units/undead-skeletal/revenant-defend-2.png
    R data/core/images/units/undead-skeletal/revenant-dying-1.png
    R data/core/images/units/undead-skeletal/revenant-dying-2.png
    R data/core/images/units/undead-skeletal/revenant-dying-3.png
    R data/core/images/units/undead-skeletal/revenant-dying-4.png
    R data/core/images/units/undead-skeletal/revenant-dying-5.png
    R data/core/images/units/undead-skeletal/revenant-dying-6.png
    R data/core/images/units/undead-skeletal/revenant-dying-7.png
    R data/core/images/units/undead-skeletal/revenant.png
    A data/core/images/units/undead-skeletal/revenant/revenant-attack-1.png
    A data/core/images/units/undead-skeletal/revenant/revenant-attack-10.png
    A data/core/images/units/undead-skeletal/revenant/revenant-attack-2.png
    A data/core/images/units/undead-skeletal/revenant/revenant-attack-3.png
    A data/core/images/units/undead-skeletal/revenant/revenant-attack-4.png
    A data/core/images/units/undead-skeletal/revenant/revenant-attack-5.png
    A data/core/images/units/undead-skeletal/revenant/revenant-attack-6.png
    A data/core/images/units/undead-skeletal/revenant/revenant-attack-7.png
    A data/core/images/units/undead-skeletal/revenant/revenant-attack-8.png
    A data/core/images/units/undead-skeletal/revenant/revenant-attack-9.png
    A data/core/images/units/undead-skeletal/revenant/revenant-defend-1.png
    A data/core/images/units/undead-skeletal/revenant/revenant-defend-2.png
    A data/core/images/units/undead-skeletal/revenant/revenant-dying-1.png
    A data/core/images/units/undead-skeletal/revenant/revenant-dying-2.png
    A data/core/images/units/undead-skeletal/revenant/revenant-dying-3.png
    A data/core/images/units/undead-skeletal/revenant/revenant-dying-4.png
    A data/core/images/units/undead-skeletal/revenant/revenant-dying-5.png
    A data/core/images/units/undead-skeletal/revenant/revenant-dying-6.png
    A data/core/images/units/undead-skeletal/revenant/revenant-dying-7.png
    A data/core/images/units/undead-skeletal/revenant/revenant-ne-bob1.png
    A data/core/images/units/undead-skeletal/revenant/revenant-ne-bob2.png
    A data/core/images/units/undead-skeletal/revenant/revenant-ne-bob3.png
    A data/core/images/units/undead-skeletal/revenant/revenant-ne-bob4.png
    A data/core/images/units/undead-skeletal/revenant/revenant-ne-bob5.png
    A data/core/images/units/undead-skeletal/revenant/revenant-ne-bob6.png
    A data/core/images/units/undead-skeletal/revenant/revenant-ne-bob7.png
    A data/core/images/units/undead-skeletal/revenant/revenant-ne-bob8.png
    A data/core/images/units/undead-skeletal/revenant/revenant-se-bob1.png
    A data/core/images/units/undead-skeletal/revenant/revenant-se-bob2.png
    A data/core/images/units/undead-skeletal/revenant/revenant-se-bob3.png
    A data/core/images/units/undead-skeletal/revenant/revenant-se-bob4.png
    A data/core/images/units/undead-skeletal/revenant/revenant-se-bob5.png
    A data/core/images/units/undead-skeletal/revenant/revenant-se-bob6.png
    A data/core/images/units/undead-skeletal/revenant/revenant-se-bob7.png
    A data/core/images/units/undead-skeletal/revenant/revenant-se-bob8.png
    A data/core/images/units/undead-skeletal/revenant/revenant.png
    M data/core/units/undead/Skele_Revenant.cfg
    M data/tools/GUI.pyw

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


Compare: https://github.com/wesnoth/wesnoth/compare/971fb0726d74...63bb1c4eff17