merge all from the water animation branch...

Browse source

...except for the animated water which is not ready for mainline yet...

...

This commit is contained in:

Jérémy Rosen 2010-03-28 21:09:37 +00:00

parent 5805befe7a cb526b0dae

commit 0357595dc0

213 changed files with 483 additions and 247 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Show stats Download patch file Download diff file Expand all files Collapse all files

BIN

data/core/images/scenery/mausoleum01.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 9.2 KiB

BIN

data/core/images/scenery/mausoleum02.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 9 KiB

BIN

data/core/images/scenery/mausoleum03.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 9 KiB

BIN

data/core/images/scenery/mausoleum04.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 8.8 KiB

BIN

data/core/images/scenery/mausoleum05.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 9 KiB

BIN

data/core/images/scenery/mausoleum06.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 8.8 KiB

BIN

data/core/images/scenery/mausoleum07.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 9 KiB

BIN

data/core/images/scenery/mausoleum08.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 8.8 KiB

BIN

data/core/images/scenery/mausoleum09.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 9 KiB

BIN

data/core/images/scenery/mausoleum10.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 8.7 KiB

BIN

data/core/images/scenery/mausoleum11.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 9 KiB

BIN

data/core/images/scenery/mausoleum12.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 8.7 KiB

BIN

data/core/images/scenery/mausoleum13.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 8.9 KiB

BIN

data/core/images/scenery/mausoleum14.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 8.7 KiB

BIN

data/core/images/scenery/mausoleum15.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 8.9 KiB

BIN

data/core/images/scenery/mausoleum16.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 8.7 KiB

BIN

data/core/images/scenery/mausoleum17.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 8.9 KiB

BIN

data/core/images/scenery/mausoleum18.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 8.7 KiB

BIN

data/core/images/scenery/mausoleum19.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 9 KiB

BIN

data/core/images/scenery/mausoleum20.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 8.7 KiB

BIN

data/core/images/scenery/mausoleum21.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 9 KiB

BIN

data/core/images/scenery/mausoleum22.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 8.8 KiB

BIN

data/core/images/terrain/castle/orcish/dirt-n-ne-se.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 5.5 KiB

BIN

data/core/images/terrain/castle/orcish/dirt-n-ne.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 4 KiB

BIN

data/core/images/terrain/castle/orcish/dirt-n.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 2.8 KiB

BIN

data/core/images/terrain/castle/orcish/dirt-ne-se-s.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 5.5 KiB

BIN

data/core/images/terrain/castle/orcish/dirt-ne-se.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 4.4 KiB

BIN

data/core/images/terrain/castle/orcish/dirt-ne.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 2.9 KiB

BIN

data/core/images/terrain/castle/orcish/dirt-nw-n-ne.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 5.4 KiB

BIN

data/core/images/terrain/castle/orcish/dirt-nw-n.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 4 KiB

BIN

data/core/images/terrain/castle/orcish/dirt-nw.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 3.2 KiB

BIN

data/core/images/terrain/castle/orcish/dirt-s-sw-nw.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 5.5 KiB

BIN

data/core/images/terrain/castle/orcish/dirt-s-sw.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 4.1 KiB

BIN

data/core/images/terrain/castle/orcish/dirt-s.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 2.5 KiB

BIN

data/core/images/terrain/castle/orcish/dirt-se-s-sw.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 5.4 KiB

BIN

data/core/images/terrain/castle/orcish/dirt-se-s.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 4 KiB

BIN

data/core/images/terrain/castle/orcish/dirt-se.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 3 KiB

BIN

data/core/images/terrain/castle/orcish/dirt-sw-nw-n.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 5.5 KiB

BIN

data/core/images/terrain/castle/orcish/dirt-sw-nw.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 4.4 KiB

BIN

data/core/images/terrain/castle/orcish/dirt-sw.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 3.2 KiB

BIN

data/core/images/terrain/castle/snowy/castle-concave-bl.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 4.1 KiB

BIN

data/core/images/terrain/castle/snowy/castle-concave-br.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 3.8 KiB

BIN

data/core/images/terrain/castle/snowy/castle-concave-l.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 5.6 KiB

BIN

data/core/images/terrain/castle/snowy/castle-concave-r.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 5.6 KiB

BIN

data/core/images/terrain/castle/snowy/castle-concave-tl.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 5.5 KiB

BIN

data/core/images/terrain/castle/snowy/castle-concave-tr.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 5.4 KiB

BIN

data/core/images/terrain/castle/snowy/castle-convex-bl.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 3.5 KiB

BIN

data/core/images/terrain/castle/snowy/castle-convex-br.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 3.3 KiB

BIN

data/core/images/terrain/castle/snowy/castle-convex-l.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 5 KiB

BIN

data/core/images/terrain/castle/snowy/castle-convex-r.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 5.1 KiB

BIN

data/core/images/terrain/castle/snowy/castle-convex-tl.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 6.2 KiB

BIN

data/core/images/terrain/castle/snowy/castle-convex-tr.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 5.7 KiB

BIN

data/core/images/terrain/castle/snowy/castle-tile.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 8 KiB

BIN

data/core/images/terrain/castle/snowy/castle-to-ice-n.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 3.2 KiB

BIN

data/core/images/terrain/castle/snowy/castle-to-ice-ne.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 2.5 KiB

BIN

data/core/images/terrain/castle/snowy/castle-to-ice-nw.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 2.1 KiB

BIN

data/core/images/terrain/castle/snowy/castle-to-water-n.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 3.5 KiB

BIN

data/core/images/terrain/castle/snowy/castle-to-water-ne.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 1.5 KiB

BIN

data/core/images/terrain/castle/snowy/castle-to-water-nw.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 2.3 KiB

BIN

data/core/images/terrain/castle/snowy/cobbles.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 2.3 KiB

BIN

data/core/images/terrain/castle/snowy/keep-castle-ccw-bl.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 6.2 KiB

BIN

data/core/images/terrain/castle/snowy/keep-castle-ccw-br.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 8.2 KiB

BIN

data/core/images/terrain/castle/snowy/keep-castle-ccw-l.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 5.4 KiB

BIN

data/core/images/terrain/castle/snowy/keep-castle-ccw-r.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 6.2 KiB

BIN

data/core/images/terrain/castle/snowy/keep-castle-ccw-tl.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 4.6 KiB

BIN

data/core/images/terrain/castle/snowy/keep-castle-ccw-tr.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 5.1 KiB

BIN

data/core/images/terrain/castle/snowy/keep-castle-convex-bl.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 4.5 KiB

BIN

data/core/images/terrain/castle/snowy/keep-castle-convex-br.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 6.1 KiB

BIN

data/core/images/terrain/castle/snowy/keep-castle-convex-l.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 5.3 KiB

BIN

data/core/images/terrain/castle/snowy/keep-castle-convex-r.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 5.4 KiB

BIN

data/core/images/terrain/castle/snowy/keep-castle-convex-tl.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 4.6 KiB

BIN

data/core/images/terrain/castle/snowy/keep-castle-convex-tr.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 5.1 KiB

BIN

data/core/images/terrain/castle/snowy/keep-castle-cw-bl.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 6.6 KiB

BIN

data/core/images/terrain/castle/snowy/keep-castle-cw-br.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 7.2 KiB

BIN

data/core/images/terrain/castle/snowy/keep-castle-cw-l.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 5.7 KiB

BIN

data/core/images/terrain/castle/snowy/keep-castle-cw-r.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 5.9 KiB

BIN

data/core/images/terrain/castle/snowy/keep-castle-cw-tl.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 4.6 KiB

BIN

data/core/images/terrain/castle/snowy/keep-castle-cw-tr.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 5.1 KiB

BIN

data/core/images/terrain/castle/snowy/keep-concave-bl.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 3.9 KiB

BIN

data/core/images/terrain/castle/snowy/keep-concave-br.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 3.6 KiB

BIN

data/core/images/terrain/castle/snowy/keep-concave-l.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 5 KiB

BIN

data/core/images/terrain/castle/snowy/keep-concave-r.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 4.2 KiB

BIN

data/core/images/terrain/castle/snowy/keep-concave-tl.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 5.5 KiB

BIN

data/core/images/terrain/castle/snowy/keep-concave-tr.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 6.4 KiB

BIN

data/core/images/terrain/castle/snowy/keep-convex-bl.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 4.5 KiB

BIN

data/core/images/terrain/castle/snowy/keep-convex-br.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 5.5 KiB

BIN

data/core/images/terrain/castle/snowy/keep-convex-l.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 5.3 KiB

BIN

data/core/images/terrain/castle/snowy/keep-convex-r.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 5.5 KiB

BIN

data/core/images/terrain/castle/snowy/keep-convex-tl.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 4.6 KiB

BIN

data/core/images/terrain/castle/snowy/keep-convex-tr.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 5.1 KiB

BIN

data/core/images/terrain/castle/snowy/keep-tile.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 8.7 KiB

BIN

data/core/images/terrain/castle/winter-orcish/dirt-n-ne-se.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 5.9 KiB

BIN

data/core/images/terrain/castle/winter-orcish/dirt-n-ne.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 4.2 KiB

BIN

data/core/images/terrain/castle/winter-orcish/dirt-n.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 2.9 KiB

BIN

data/core/images/terrain/castle/winter-orcish/dirt-ne-se-s.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 5.8 KiB

BIN

data/core/images/terrain/castle/winter-orcish/dirt-ne-se.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 4.6 KiB

BIN

data/core/images/terrain/castle/winter-orcish/dirt-ne.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 3.1 KiB

BIN

data/core/images/terrain/castle/winter-orcish/dirt-nw-n-ne.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 5.7 KiB

BIN

data/core/images/terrain/castle/winter-orcish/dirt-nw-n.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 4.2 KiB

BIN

data/core/images/terrain/castle/winter-orcish/dirt-nw.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 3.3 KiB

Some files were not shown because too many files have changed in this diff Show more