[Commits] [wesnoth/wesnoth] 75a52b: Three carpet terrains (#2114)

GitHub noreply at github.com
Sun Nov 12 02:15:23 UTC 2017


  Branch: refs/heads/master
  Home:   https://github.com/wesnoth/wesnoth
  Commit: 75a52bd9c60c0e65ac3a52e8fe6f79280242cbb0
      https://github.com/wesnoth/wesnoth/commit/75a52bd9c60c0e65ac3a52e8fe6f79280242cbb0
  Author: doofus-01 <doofus-01 at users.noreply.github.com>
  Date:   2017-11-11 (Sat, 11 Nov 2017)

  Changed paths:
    A data/core/images/terrain/interior/cave-rug/rug-corner-n-ne-se-s.png
    A data/core/images/terrain/interior/cave-rug/rug-corner-nw-n-ne.png
    A data/core/images/terrain/interior/cave-rug/rug-corner-s-sw-nw-n.png
    A data/core/images/terrain/interior/cave-rug/rug-corner-se-s-sw.png
    A data/core/images/terrain/interior/cave-rug/rug-hex-full.png
    A data/core/images/terrain/interior/cave-rug/rug-hex-left.png
    A data/core/images/terrain/interior/cave-rug/rug-hex-lower.png
    A data/core/images/terrain/interior/cave-rug/rug-hex-ne.png
    A data/core/images/terrain/interior/cave-rug/rug-hex-nw.png
    A data/core/images/terrain/interior/cave-rug/rug-hex-right.png
    A data/core/images/terrain/interior/cave-rug/rug-hex-se.png
    A data/core/images/terrain/interior/cave-rug/rug-hex-sw.png
    A data/core/images/terrain/interior/cave-rug/rug-hex-upper.png
    A data/core/images/terrain/interior/cave-rug/rug-hex.png
    A data/core/images/terrain/interior/cave-rug/rug-n-ne-se-s-sw-nw.png
    A data/core/images/terrain/interior/cave-rug/rug-n-ne-se-s-sw.png
    A data/core/images/terrain/interior/cave-rug/rug-n-ne-se-s.png
    A data/core/images/terrain/interior/cave-rug/rug-n-ne-se.png
    A data/core/images/terrain/interior/cave-rug/rug-n-ne.png
    A data/core/images/terrain/interior/cave-rug/rug-ne-se-s-sw-nw.png
    A data/core/images/terrain/interior/cave-rug/rug-ne-se-s-sw.png
    A data/core/images/terrain/interior/cave-rug/rug-ne-se-s.png
    A data/core/images/terrain/interior/cave-rug/rug-ne-se.png
    A data/core/images/terrain/interior/cave-rug/rug-ne.png
    A data/core/images/terrain/interior/cave-rug/rug-nw-n-ne-se-s.png
    A data/core/images/terrain/interior/cave-rug/rug-nw-n-ne-se.png
    A data/core/images/terrain/interior/cave-rug/rug-nw-n-ne.png
    A data/core/images/terrain/interior/cave-rug/rug-nw-n.png
    A data/core/images/terrain/interior/cave-rug/rug-nw.png
    A data/core/images/terrain/interior/cave-rug/rug-s-sw-nw-n-ne.png
    A data/core/images/terrain/interior/cave-rug/rug-s-sw-nw-n.png
    A data/core/images/terrain/interior/cave-rug/rug-s-sw-nw.png
    A data/core/images/terrain/interior/cave-rug/rug-s-sw.png
    A data/core/images/terrain/interior/cave-rug/rug-se-s-sw-nw-n.png
    A data/core/images/terrain/interior/cave-rug/rug-se-s-sw-nw.png
    A data/core/images/terrain/interior/cave-rug/rug-se-s-sw.png
    A data/core/images/terrain/interior/cave-rug/rug-se-s.png
    A data/core/images/terrain/interior/cave-rug/rug-se.png
    A data/core/images/terrain/interior/cave-rug/rug-smallcorner-ne.png
    A data/core/images/terrain/interior/cave-rug/rug-smallcorner-nw.png
    A data/core/images/terrain/interior/cave-rug/rug-smallcorner-se.png
    A data/core/images/terrain/interior/cave-rug/rug-smallcorner-sw.png
    A data/core/images/terrain/interior/cave-rug/rug-sw-nw-n-ne-se.png
    A data/core/images/terrain/interior/cave-rug/rug-sw-nw-n-ne.png
    A data/core/images/terrain/interior/cave-rug/rug-sw-nw-n.png
    A data/core/images/terrain/interior/cave-rug/rug-sw-nw.png
    A data/core/images/terrain/interior/cave-rug/rug-sw.png
    A data/core/images/terrain/interior/cave-rug/rug-tile.png
    A data/core/images/terrain/interior/regular-rug/rug-corner-n-ne-se-s.png
    A data/core/images/terrain/interior/regular-rug/rug-corner-nw-n-ne.png
    A data/core/images/terrain/interior/regular-rug/rug-corner-s-sw-nw-n.png
    A data/core/images/terrain/interior/regular-rug/rug-corner-se-s-sw.png
    A data/core/images/terrain/interior/regular-rug/rug-hex-full.png
    A data/core/images/terrain/interior/regular-rug/rug-hex-left.png
    A data/core/images/terrain/interior/regular-rug/rug-hex-lower.png
    A data/core/images/terrain/interior/regular-rug/rug-hex-ne.png
    A data/core/images/terrain/interior/regular-rug/rug-hex-nw.png
    A data/core/images/terrain/interior/regular-rug/rug-hex-right.png
    A data/core/images/terrain/interior/regular-rug/rug-hex-se.png
    A data/core/images/terrain/interior/regular-rug/rug-hex-sw.png
    A data/core/images/terrain/interior/regular-rug/rug-hex-upper.png
    A data/core/images/terrain/interior/regular-rug/rug-hex.png
    A data/core/images/terrain/interior/regular-rug/rug-n-ne-se-s-sw-nw.png
    A data/core/images/terrain/interior/regular-rug/rug-n-ne-se-s-sw.png
    A data/core/images/terrain/interior/regular-rug/rug-n-ne-se-s.png
    A data/core/images/terrain/interior/regular-rug/rug-n-ne-se.png
    A data/core/images/terrain/interior/regular-rug/rug-n-ne.png
    A data/core/images/terrain/interior/regular-rug/rug-ne-se-s-sw-nw.png
    A data/core/images/terrain/interior/regular-rug/rug-ne-se-s-sw.png
    A data/core/images/terrain/interior/regular-rug/rug-ne-se-s.png
    A data/core/images/terrain/interior/regular-rug/rug-ne-se.png
    A data/core/images/terrain/interior/regular-rug/rug-ne.png
    A data/core/images/terrain/interior/regular-rug/rug-nw-n-ne-se-s.png
    A data/core/images/terrain/interior/regular-rug/rug-nw-n-ne-se.png
    A data/core/images/terrain/interior/regular-rug/rug-nw-n-ne.png
    A data/core/images/terrain/interior/regular-rug/rug-nw-n.png
    A data/core/images/terrain/interior/regular-rug/rug-nw.png
    A data/core/images/terrain/interior/regular-rug/rug-s-sw-nw-n-ne.png
    A data/core/images/terrain/interior/regular-rug/rug-s-sw-nw-n.png
    A data/core/images/terrain/interior/regular-rug/rug-s-sw-nw.png
    A data/core/images/terrain/interior/regular-rug/rug-s-sw.png
    A data/core/images/terrain/interior/regular-rug/rug-se-s-sw-nw-n.png
    A data/core/images/terrain/interior/regular-rug/rug-se-s-sw-nw.png
    A data/core/images/terrain/interior/regular-rug/rug-se-s-sw.png
    A data/core/images/terrain/interior/regular-rug/rug-se-s.png
    A data/core/images/terrain/interior/regular-rug/rug-se.png
    A data/core/images/terrain/interior/regular-rug/rug-smallcorner-ne.png
    A data/core/images/terrain/interior/regular-rug/rug-smallcorner-nw.png
    A data/core/images/terrain/interior/regular-rug/rug-smallcorner-se.png
    A data/core/images/terrain/interior/regular-rug/rug-smallcorner-sw.png
    A data/core/images/terrain/interior/regular-rug/rug-sw-nw-n-ne-se.png
    A data/core/images/terrain/interior/regular-rug/rug-sw-nw-n-ne.png
    A data/core/images/terrain/interior/regular-rug/rug-sw-nw-n.png
    A data/core/images/terrain/interior/regular-rug/rug-sw-nw.png
    A data/core/images/terrain/interior/regular-rug/rug-sw.png
    A data/core/images/terrain/interior/regular-rug/rug-tile.png
    A data/core/images/terrain/interior/royal-rug/rug-corner-n-ne-se-s.png
    A data/core/images/terrain/interior/royal-rug/rug-corner-nw-n-ne.png
    A data/core/images/terrain/interior/royal-rug/rug-corner-s-sw-nw-n.png
    A data/core/images/terrain/interior/royal-rug/rug-corner-se-s-sw.png
    A data/core/images/terrain/interior/royal-rug/rug-hex-full.png
    A data/core/images/terrain/interior/royal-rug/rug-hex-left.png
    A data/core/images/terrain/interior/royal-rug/rug-hex-lower.png
    A data/core/images/terrain/interior/royal-rug/rug-hex-ne.png
    A data/core/images/terrain/interior/royal-rug/rug-hex-nw.png
    A data/core/images/terrain/interior/royal-rug/rug-hex-right.png
    A data/core/images/terrain/interior/royal-rug/rug-hex-se.png
    A data/core/images/terrain/interior/royal-rug/rug-hex-sw.png
    A data/core/images/terrain/interior/royal-rug/rug-hex-upper.png
    A data/core/images/terrain/interior/royal-rug/rug-hex.png
    A data/core/images/terrain/interior/royal-rug/rug-n-ne-se-s-sw-nw.png
    A data/core/images/terrain/interior/royal-rug/rug-n-ne-se-s-sw.png
    A data/core/images/terrain/interior/royal-rug/rug-n-ne-se-s.png
    A data/core/images/terrain/interior/royal-rug/rug-n-ne-se.png
    A data/core/images/terrain/interior/royal-rug/rug-n-ne.png
    A data/core/images/terrain/interior/royal-rug/rug-ne-se-s-sw-nw.png
    A data/core/images/terrain/interior/royal-rug/rug-ne-se-s-sw.png
    A data/core/images/terrain/interior/royal-rug/rug-ne-se-s.png
    A data/core/images/terrain/interior/royal-rug/rug-ne-se.png
    A data/core/images/terrain/interior/royal-rug/rug-ne.png
    A data/core/images/terrain/interior/royal-rug/rug-nw-n-ne-se-s.png
    A data/core/images/terrain/interior/royal-rug/rug-nw-n-ne-se.png
    A data/core/images/terrain/interior/royal-rug/rug-nw-n-ne.png
    A data/core/images/terrain/interior/royal-rug/rug-nw-n.png
    A data/core/images/terrain/interior/royal-rug/rug-nw.png
    A data/core/images/terrain/interior/royal-rug/rug-s-sw-nw-n-ne.png
    A data/core/images/terrain/interior/royal-rug/rug-s-sw-nw-n.png
    A data/core/images/terrain/interior/royal-rug/rug-s-sw-nw.png
    A data/core/images/terrain/interior/royal-rug/rug-s-sw.png
    A data/core/images/terrain/interior/royal-rug/rug-se-s-sw-nw-n.png
    A data/core/images/terrain/interior/royal-rug/rug-se-s-sw-nw.png
    A data/core/images/terrain/interior/royal-rug/rug-se-s-sw.png
    A data/core/images/terrain/interior/royal-rug/rug-se-s.png
    A data/core/images/terrain/interior/royal-rug/rug-se.png
    A data/core/images/terrain/interior/royal-rug/rug-smallcorner-ne.png
    A data/core/images/terrain/interior/royal-rug/rug-smallcorner-nw.png
    A data/core/images/terrain/interior/royal-rug/rug-smallcorner-se.png
    A data/core/images/terrain/interior/royal-rug/rug-smallcorner-sw.png
    A data/core/images/terrain/interior/royal-rug/rug-sw-nw-n-ne-se.png
    A data/core/images/terrain/interior/royal-rug/rug-sw-nw-n-ne.png
    A data/core/images/terrain/interior/royal-rug/rug-sw-nw-n.png
    A data/core/images/terrain/interior/royal-rug/rug-sw-nw.png
    A data/core/images/terrain/interior/royal-rug/rug-sw.png
    A data/core/images/terrain/interior/royal-rug/rug-tile.png
    M data/core/terrain-graphics.cfg
    M data/core/terrain-graphics/new-macros.cfg
    M data/core/terrain.cfg

  Log Message:
  -----------
  Three carpet terrains  (#2114)

Squash and merge for three carpets terrain PR.

* Initial commit for carpets.  WML, alignment, and demo only, images are unshaded place-holders.

* adding basic shading and better corner images

* completed shading for existing images

* refined large corner carpet rules

* got rid of some commented out leftovers

* initial commit for cave rug, Iwd

* regular carpet files, incomplete for now

* completed regular rug

* changed cave-rug underlayer to cave path instead of dark flagstones, and changed all rug terrain codes

* fixing some transition WML filtering for Urc (cave carpet)





More information about the Commits mailing list