[wesnoth-commits] [wesnoth/wesnoth] 98057e: Dune Raider/Marauder: blit the torch overlay on th...

[Charles Dang]

  Branch: refs/heads/master
  Home:   https://github.com/wesnoth/wesnoth
  Commit: 98057e2eb530e091f7cdbe2eb8e30db53b4746e1
      https://github.com/wesnoth/wesnoth/commit/98057e2eb530e091f7cdbe2eb8e30db53b4746e1
  Author: Charles Dang <exodia339 at gmail.com>
  Date:   2021-01-08 (Fri, 08 Jan 2021)

  Changed paths:
    M data/core/units/dunefolk/Marauder.cfg
    M data/core/units/dunefolk/Raider.cfg

  Log Message:
  -----------
  Dune Raider/Marauder: blit the torch overlay on the baseframe, not the other way around

Fixes a weird issue where the sprite would sometimes not have TC applied.


  Commit: d0cdad55463ec094e3ccc441473667472352f6f5
      https://github.com/wesnoth/wesnoth/commit/d0cdad55463ec094e3ccc441473667472352f6f5
  Author: Charles Dang <exodia339 at gmail.com>
  Date:   2021-01-08 (Fri, 08 Jan 2021)

  Changed paths:
    M src/gui/dialogs/title_screen.cpp

  Log Message:
  -----------
  GUI2/Title Screen: return before reloading

Keeps the same codepath as F5 reloading.


  Commit: 2f6241290042ca0aaa2c85e5bb23c321c9636c71
      https://github.com/wesnoth/wesnoth/commit/2f6241290042ca0aaa2c85e5bb23c321c9636c71
  Author: Charles Dang <exodia339 at gmail.com>
  Date:   2021-01-08 (Fri, 08 Jan 2021)

  Changed paths:
    M .github/workflows/ci-main.yml

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


Compare: https://github.com/wesnoth/wesnoth/compare/1061692215d1...2f6241290042