diff options
| author | Jessica Tölke <jtoelke@gmx.de> | 2013-08-25 17:21:15 +0200 |
|---|---|---|
| committer | Jessica Tölke <jtoelke@gmx.de> | 2013-08-25 17:21:15 +0200 |
| commit | 9b8362e5767b9b0fb4251c16c80669b288f06648 (patch) | |
| tree | 4b78772e1b17ce69cd877f49edf3d2a31b4d9920 /tilesets | |
| parent | bbed5a765c152fee8a4ed8adc78423d9737c4d46 (diff) | |
| parent | 5409675d5d3cba9f4a55ca6a783d038eb69f9ccc (diff) | |
| download | clientdata-9b8362e5767b9b0fb4251c16c80669b288f06648.tar.gz clientdata-9b8362e5767b9b0fb4251c16c80669b288f06648.tar.bz2 clientdata-9b8362e5767b9b0fb4251c16c80669b288f06648.tar.xz clientdata-9b8362e5767b9b0fb4251c16c80669b288f06648.zip | |
Merge remote-tracking branch 'origin/master' into waric
Conflicts:
monsters.xml
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 | ||||
| -rw-r--r-- | tilesets/desert3.tsx | 2 | ||||
| -rw-r--r-- | tilesets/snow_docks.tsx | 4 |
12 files changed, 45 insertions, 1 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> diff --git a/tilesets/desert3.tsx b/tilesets/desert3.tsx index 138f2dc7..8ae2e2e3 100644 --- a/tilesets/desert3.tsx +++ b/tilesets/desert3.tsx @@ -1,4 +1,4 @@ <?xml version="1.0" encoding="UTF-8"?> <tileset name="desert3" tilewidth="32" tileheight="32"> - <image source="../graphics/tiles/desert3.png" width="512" height="256"/> + <image source="../graphics/tiles/desert3.png" width="320" height="256"/> </tileset> diff --git a/tilesets/snow_docks.tsx b/tilesets/snow_docks.tsx new file mode 100644 index 00000000..40cb822e --- /dev/null +++ b/tilesets/snow_docks.tsx @@ -0,0 +1,4 @@ +<?xml version="1.0" encoding="UTF-8"?> +<tileset name="snow_docks" tilewidth="32" tileheight="32"> + <image source="../graphics/tiles/snow_docks.png" width="512" height="320"/> +</tileset> |