summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorReid <reidyaro@gmail.com>2014-05-22 02:06:30 +0200
committerReid <reidyaro@gmail.com>2014-05-22 02:06:30 +0200
commit2f6d7acbad265e470a1d310282655138a11836f0 (patch)
tree253ae76350a37a0a43111b4c38847f4398f846b2
parente1c11e5708d9f876b3974b2a9859c963025f53c2 (diff)
downloadclientdata-2f6d7acbad265e470a1d310282655138a11836f0.tar.gz
clientdata-2f6d7acbad265e470a1d310282655138a11836f0.tar.bz2
clientdata-2f6d7acbad265e470a1d310282655138a11836f0.tar.xz
clientdata-2f6d7acbad265e470a1d310282655138a11836f0.zip
Rename village-indoor2 tileset into artis-indoor-fringe.
-rw-r--r--LICENSE2
-rw-r--r--graphics/tilesets/artis-indoor-fringe.png (renamed from graphics/tilesets/village-indoor2.png)bin43393 -> 43393 bytes
-rw-r--r--maps.xml2
-rw-r--r--maps/000-0-0.tmx4
-rw-r--r--maps/000-2-0.tmx4
-rw-r--r--maps/000-2-1.tmx4
-rw-r--r--maps/000-2-2.tmx4
-rw-r--r--maps/000-2-3.tmx4
8 files changed, 12 insertions, 12 deletions
diff --git a/LICENSE b/LICENSE
index 00e1afe5..9695097b 100644
--- a/LICENSE
+++ b/LICENSE
@@ -271,6 +271,7 @@ https://www.gitorious.org/evol/clientdata-beta/blobs/master/LICENSE
graphics/tilesets/artis-dock.png (Reid) (CC BY-SA 3.0) (-)
graphics/tilesets/artis-fence.png (Reid) (CC BY-SA 3.0) (Kestrel)
graphics/tilesets/artis-house.png (IvanMorve, Reid) (CC BY-SA 3.0) (-)
+ graphics/tilesets/artis-indoor-fringe.png (Crush) (CC BY-SA 3.0) (Reid, Yosuhara)
graphics/tilesets/artis-pavement.png (IvanMorve, Reid) (CC BY-SA 3.0) (-)
graphics/tilesets/artis-pillar-x2.png (Reid) (CC BY-SA 3.0) (Kestrel)
graphics/tilesets/box.png (Crush, Len, Modanung, Reid, Yosuhara) (CC BY-SA 3.0) (Enchilado)
@@ -288,7 +289,6 @@ https://www.gitorious.org/evol/clientdata-beta/blobs/master/LICENSE
graphics/tilesets/tree-x3x3.png (Hal9000) (CC BY-SA 3.0) (Reid)
graphics/tilesets/tree-x3x4.png (Len, Saphy) (CC BY-SA 3.0) (Modanung, Reid)
graphics/tilesets/tree-x4x5.png (Saphy) (CC BY-SA 3.0) (Reid)
- graphics/tilesets/village-indoor2.png (Crush) (CC BY-SA 3.0) (Reid, Yosuhara)
graphics/tilesets/water.png (Len) (CC BY-SA 3.0) (Reid)
# Maps
diff --git a/graphics/tilesets/village-indoor2.png b/graphics/tilesets/artis-indoor-fringe.png
index 214669d5..214669d5 100644
--- a/graphics/tilesets/village-indoor2.png
+++ b/graphics/tilesets/artis-indoor-fringe.png
Binary files differ
diff --git a/maps.xml b/maps.xml
index d354565f..3720ecc0 100644
--- a/maps.xml
+++ b/maps.xml
@@ -67,6 +67,6 @@ Copyright (C) 2012 Evol Online -->
<file name="graphics/tilesets/ship-indoor.png"/>
<file name="graphics/tilesets/ship-indoor-x2x4.png"/>
<file name="graphics/tilesets/ship-sunlight-x1x5.png"/>
- <file name="graphics/tilesets/village-indoor2.png"/>
+ <file name="graphics/tilesets/artis-indoor-fringe.png"/>
</atlas>
</maps>
diff --git a/maps/000-0-0.tmx b/maps/000-0-0.tmx
index 86bb8bc1..0acf4d3f 100644
--- a/maps/000-0-0.tmx
+++ b/maps/000-0-0.tmx
@@ -11,8 +11,8 @@
<tileset firstgid="1" name="Ship Indoor" tilewidth="32" tileheight="32">
<image source="../graphics/tilesets/ship-indoor.png" width="256" height="512"/>
</tileset>
- <tileset firstgid="129" name="Village Indoor 2" tilewidth="32" tileheight="32">
- <image source="../graphics/tilesets/village-indoor2.png" width="512" height="512"/>
+ <tileset firstgid="129" name="artis Indoor 2" tilewidth="32" tileheight="32">
+ <image source="../graphics/tilesets/artis-indoor-fringe.png" width="512" height="512"/>
</tileset>
<tileset firstgid="385" name="Shadow" tilewidth="32" tileheight="32">
<image source="../graphics/tilesets/shadow.png" width="256" height="256"/>
diff --git a/maps/000-2-0.tmx b/maps/000-2-0.tmx
index cc069bf1..7dee1605 100644
--- a/maps/000-2-0.tmx
+++ b/maps/000-2-0.tmx
@@ -10,8 +10,8 @@
<tileset firstgid="1" name="Ship Indoor" tilewidth="32" tileheight="32">
<image source="../graphics/tilesets/ship-indoor.png" width="256" height="512"/>
</tileset>
- <tileset firstgid="129" name="Village Indoor 2" tilewidth="32" tileheight="32">
- <image source="../graphics/tilesets/village-indoor2.png" width="512" height="512"/>
+ <tileset firstgid="129" name="artis Indoor 2" tilewidth="32" tileheight="32">
+ <image source="../graphics/tilesets/artis-indoor-fringe.png" width="512" height="512"/>
</tileset>
<tileset firstgid="385" source="../graphics/tilesets/candle.tsx"/>
<tileset firstgid="391" name="Box" tilewidth="32" tileheight="32">
diff --git a/maps/000-2-1.tmx b/maps/000-2-1.tmx
index 001d892a..6f2cde5f 100644
--- a/maps/000-2-1.tmx
+++ b/maps/000-2-1.tmx
@@ -11,8 +11,8 @@
<tileset firstgid="1" name="Ship Indoor" tilewidth="32" tileheight="32">
<image source="../graphics/tilesets/ship-indoor.png" width="256" height="512"/>
</tileset>
- <tileset firstgid="129" name="Village Indoor 2" tilewidth="32" tileheight="32">
- <image source="../graphics/tilesets/village-indoor2.png" width="512" height="512"/>
+ <tileset firstgid="129" name="artis Indoor 2" tilewidth="32" tileheight="32">
+ <image source="../graphics/tilesets/artis-indoor-fringe.png" width="512" height="512"/>
</tileset>
<tileset firstgid="385" source="../graphics/tilesets/candle.tsx"/>
<tileset firstgid="391" name="Box" tilewidth="32" tileheight="32">
diff --git a/maps/000-2-2.tmx b/maps/000-2-2.tmx
index 32e0ac3d..4ba2450c 100644
--- a/maps/000-2-2.tmx
+++ b/maps/000-2-2.tmx
@@ -11,8 +11,8 @@
<tileset firstgid="1" name="Ship Indoor" tilewidth="32" tileheight="32">
<image source="../graphics/tilesets/ship-indoor.png" width="256" height="512"/>
</tileset>
- <tileset firstgid="129" name="Village Indoor 2" tilewidth="32" tileheight="32">
- <image source="../graphics/tilesets/village-indoor2.png" width="512" height="512"/>
+ <tileset firstgid="129" name="artis Indoor 2" tilewidth="32" tileheight="32">
+ <image source="../graphics/tilesets/artis-indoor-fringe.png" width="512" height="512"/>
</tileset>
<tileset firstgid="385" name="Box" tilewidth="32" tileheight="32">
<image source="../graphics/tilesets/box.png" width="128" height="192"/>
diff --git a/maps/000-2-3.tmx b/maps/000-2-3.tmx
index 436e19d5..7b1baf5b 100644
--- a/maps/000-2-3.tmx
+++ b/maps/000-2-3.tmx
@@ -10,8 +10,8 @@
<tileset firstgid="1" name="Ship Indoor" tilewidth="32" tileheight="32">
<image source="../graphics/tilesets/ship-indoor.png" width="256" height="512"/>
</tileset>
- <tileset firstgid="129" name="Village Indoor 2" tilewidth="32" tileheight="32">
- <image source="../graphics/tilesets/village-indoor2.png" width="512" height="512"/>
+ <tileset firstgid="129" name="artis Indoor 2" tilewidth="32" tileheight="32">
+ <image source="../graphics/tilesets/artis-indoor-fringe.png" width="512" height="512"/>
</tileset>
<tileset firstgid="385" name="Box" tilewidth="32" tileheight="32">
<image source="../graphics/tilesets/box.png" width="128" height="192"/>