diff options
author | Jessica Tölke <jtoelke@mail.upb.de> | 2013-06-21 22:36:46 +0200 |
---|---|---|
committer | Jessica Tölke <jtoelke@mail.upb.de> | 2013-06-21 22:36:46 +0200 |
commit | 6de854e3b43fedbf7be5c914b6f05812766ccfde (patch) | |
tree | 9abba21bae5d9a157c8295c56a0034dd0563b9ff /tilesets | |
parent | 3061d90f72f8e374e457eec9c2b1a32b94b80e0b (diff) | |
parent | fa86b982fd820a4cf7112719bd721db0dc811b28 (diff) | |
download | clientdata-6de854e3b43fedbf7be5c914b6f05812766ccfde.tar.gz clientdata-6de854e3b43fedbf7be5c914b6f05812766ccfde.tar.bz2 clientdata-6de854e3b43fedbf7be5c914b6f05812766ccfde.tar.xz clientdata-6de854e3b43fedbf7be5c914b6f05812766ccfde.zip |
Merge remote-tracking branch 'wushin/tonori-cave-release'
Conflicts:
license.txt: graphics/tiles/Woodland_ground.png was changed in master
added also enchilado here, since that edit was forgotten
npcs.xml: id conflict with trapper and supply chest, moved supply chest down to 378
Diffstat (limited to 'tilesets')
-rw-r--r-- | tilesets/cave2.tsx | 4 | ||||
-rw-r--r-- | tilesets/cave2_bilevel.tsx | 4 | ||||
-rw-r--r-- | tilesets/cave2_bilevel_water_lava.tsx | 4 | ||||
-rw-r--r-- | tilesets/cave2_sewer_mine.tsx | 4 | ||||
-rw-r--r-- | tilesets/cave2_sewer_mine_x2.tsx | 4 | ||||
-rw-r--r-- | tilesets/cave2_sewer_mine_x3.tsx | 4 | ||||
-rw-r--r-- | tilesets/cave2_sewer_mine_x4.tsx | 4 | ||||
-rw-r--r-- | tilesets/cave2_sewers.tsx | 4 | ||||
-rw-r--r-- | tilesets/cave2_transistions.tsx | 4 | ||||
-rw-r--r-- | tilesets/cave2_x2.tsx | 4 |
10 files changed, 40 insertions, 0 deletions
diff --git a/tilesets/cave2.tsx b/tilesets/cave2.tsx new file mode 100644 index 00000000..fe0cc03d --- /dev/null +++ b/tilesets/cave2.tsx @@ -0,0 +1,4 @@ +<?xml version="1.0" encoding="UTF-8"?> +<tileset name="cave2" tilewidth="32" tileheight="32"> + <image source="../graphics/tiles/cave2.png" width="512" height="512"/> +</tileset> diff --git a/tilesets/cave2_bilevel.tsx b/tilesets/cave2_bilevel.tsx new file mode 100644 index 00000000..69450c6e --- /dev/null +++ b/tilesets/cave2_bilevel.tsx @@ -0,0 +1,4 @@ +<?xml version="1.0" encoding="UTF-8"?> +<tileset name="cave2_bilevel" tilewidth="32" tileheight="32"> + <image source="../graphics/tiles/cave2_bilevel.png" width="512" height="512"/> +</tileset> diff --git a/tilesets/cave2_bilevel_water_lava.tsx b/tilesets/cave2_bilevel_water_lava.tsx new file mode 100644 index 00000000..3dd333d3 --- /dev/null +++ b/tilesets/cave2_bilevel_water_lava.tsx @@ -0,0 +1,4 @@ +<?xml version="1.0" encoding="UTF-8"?> +<tileset name="cave2_bilevel_water_lava" tilewidth="32" tileheight="32"> + <image source="../graphics/tiles/cave2_bilevel_water_lava.png" width="512" height="512"/> +</tileset> diff --git a/tilesets/cave2_sewer_mine.tsx b/tilesets/cave2_sewer_mine.tsx new file mode 100644 index 00000000..f3012e6d --- /dev/null +++ b/tilesets/cave2_sewer_mine.tsx @@ -0,0 +1,4 @@ +<?xml version="1.0" encoding="UTF-8"?> +<tileset name="cave2_sewer_mine" tilewidth="32" tileheight="32"> + <image source="../graphics/tiles/cave2_sewer_mine.png" width="512" height="512"/> +</tileset> diff --git a/tilesets/cave2_sewer_mine_x2.tsx b/tilesets/cave2_sewer_mine_x2.tsx new file mode 100644 index 00000000..a139ed8f --- /dev/null +++ b/tilesets/cave2_sewer_mine_x2.tsx @@ -0,0 +1,4 @@ +<?xml version="1.0" encoding="UTF-8"?> +<tileset name="cave2_sewer_mine_x2" tilewidth="32" tileheight="64"> + <image source="../graphics/tiles/cave2_sewer_mine_x2.png" width="512" height="512"/> +</tileset> diff --git a/tilesets/cave2_sewer_mine_x3.tsx b/tilesets/cave2_sewer_mine_x3.tsx new file mode 100644 index 00000000..4b2e69e2 --- /dev/null +++ b/tilesets/cave2_sewer_mine_x3.tsx @@ -0,0 +1,4 @@ +<?xml version="1.0" encoding="UTF-8"?> +<tileset name="cave2_sewer_mine_x3" tilewidth="32" tileheight="96"> + <image source="../graphics/tiles/cave2_sewer_mine_x3.png" width="256" height="96"/> +</tileset> diff --git a/tilesets/cave2_sewer_mine_x4.tsx b/tilesets/cave2_sewer_mine_x4.tsx new file mode 100644 index 00000000..97dda7fb --- /dev/null +++ b/tilesets/cave2_sewer_mine_x4.tsx @@ -0,0 +1,4 @@ +<?xml version="1.0" encoding="UTF-8"?> +<tileset name="cave2_sewer_mine_x4" tilewidth="32" tileheight="128"> + <image source="../graphics/tiles/cave2_sewer_mine_x4.png" width="512" height="128"/> +</tileset> diff --git a/tilesets/cave2_sewers.tsx b/tilesets/cave2_sewers.tsx new file mode 100644 index 00000000..96d164a2 --- /dev/null +++ b/tilesets/cave2_sewers.tsx @@ -0,0 +1,4 @@ +<?xml version="1.0" encoding="UTF-8"?> +<tileset name="cave2_sewers" tilewidth="32" tileheight="32"> + <image source="../graphics/tiles/cave2_sewers.png" width="512" height="288"/> +</tileset> diff --git a/tilesets/cave2_transistions.tsx b/tilesets/cave2_transistions.tsx new file mode 100644 index 00000000..c5950b55 --- /dev/null +++ b/tilesets/cave2_transistions.tsx @@ -0,0 +1,4 @@ +<?xml version="1.0" encoding="UTF-8"?> +<tileset name="cave2_transistions" tilewidth="32" tileheight="32"> + <image source="../graphics/tiles/cave2_transistions.png" width="512" height="512"/> +</tileset> diff --git a/tilesets/cave2_x2.tsx b/tilesets/cave2_x2.tsx new file mode 100644 index 00000000..7d82d0ca --- /dev/null +++ b/tilesets/cave2_x2.tsx @@ -0,0 +1,4 @@ +<?xml version="1.0" encoding="UTF-8"?> +<tileset name="cave2_x2" tilewidth="32" tileheight="64"> + <image source="../graphics/tiles/cave2_x2.png" width="512" height="128"/> +</tileset> |