summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorReid <reidyaro@gmail.com>2014-06-18 05:47:46 +0200
committerReid <reidyaro@gmail.com>2014-06-18 05:47:46 +0200
commitf0e12b8cee1e71278f17a907b8f51725d593134d (patch)
tree12724d8beed747fc53a6a085fc996abea7bfd0c8
parent33f6c8247548d71078ada5ba133723e298404f96 (diff)
downloadclientdata-f0e12b8cee1e71278f17a907b8f51725d593134d.tar.gz
clientdata-f0e12b8cee1e71278f17a907b8f51725d593134d.tar.bz2
clientdata-f0e12b8cee1e71278f17a907b8f51725d593134d.tar.xz
clientdata-f0e12b8cee1e71278f17a907b8f51725d593134d.zip
Move artis-indoor-fringe into a different tileset (ship-indoor-fringe).
-rw-r--r--LICENSE1
-rw-r--r--graphics/tilesets/artis-indoor-fringe.pngbin43393 -> 40920 bytes
-rw-r--r--graphics/tilesets/ship-indoor-fringe.pngbin0 -> 43393 bytes
-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, 11 insertions, 10 deletions
diff --git a/LICENSE b/LICENSE
index f2e6e45a..fdc3448a 100644
--- a/LICENSE
+++ b/LICENSE
@@ -285,6 +285,7 @@ https://www.gitorious.org/evol/clientdata-beta/blobs/master/LICENSE
graphics/tilesets/shadow.png (Reid) (CC BY-SA 3.0) (Hal9000)
graphics/tilesets/ship-base.png (Lunovox) (GPLv2) (Hal9000, Reid, Saci)
graphics/tilesets/ship-indoor.png (Lunovox) (GPLv2) (Reid, Saci)
+ graphics/tilesets/ship-indoor-fringe.png (Crush) (CC BY-SA 3.0) (Reid, Yosuhara)
graphics/tilesets/ship-indoor-x2x4.png (Reid) (CC BY-SA 3.0) (-)
graphics/tilesets/ship-mast.png (Lunovox) (GPLv2) (Alige, Hal9000, Reid, Saci)
graphics/tilesets/ship-sunlight-x1x5.png (Len) (CC BY-SA 3.0) (Reid)
diff --git a/graphics/tilesets/artis-indoor-fringe.png b/graphics/tilesets/artis-indoor-fringe.png
index 214669d5..f6637bf6 100644
--- a/graphics/tilesets/artis-indoor-fringe.png
+++ b/graphics/tilesets/artis-indoor-fringe.png
Binary files differ
diff --git a/graphics/tilesets/ship-indoor-fringe.png b/graphics/tilesets/ship-indoor-fringe.png
new file mode 100644
index 00000000..37baccac
--- /dev/null
+++ b/graphics/tilesets/ship-indoor-fringe.png
Binary files differ
diff --git a/maps/000-0-0.tmx b/maps/000-0-0.tmx
index 0acf4d3f..ad9d51a1 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="artis Indoor 2" tilewidth="32" tileheight="32">
- <image source="../graphics/tilesets/artis-indoor-fringe.png" width="512" height="512"/>
+ <tileset firstgid="129" name="Ship Fringe" tilewidth="32" tileheight="32">
+ <image source="../graphics/tilesets/ship-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 7dee1605..46bceb5e 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="artis Indoor 2" tilewidth="32" tileheight="32">
- <image source="../graphics/tilesets/artis-indoor-fringe.png" width="512" height="512"/>
+ <tileset firstgid="129" name="Ship Fringe" tilewidth="32" tileheight="32">
+ <image source="../graphics/tilesets/ship-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 6f2cde5f..a6dba4f7 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="artis Indoor 2" tilewidth="32" tileheight="32">
- <image source="../graphics/tilesets/artis-indoor-fringe.png" width="512" height="512"/>
+ <tileset firstgid="129" name="Ship Fringe" tilewidth="32" tileheight="32">
+ <image source="../graphics/tilesets/ship-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 4ba2450c..d447cf93 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="artis Indoor 2" tilewidth="32" tileheight="32">
- <image source="../graphics/tilesets/artis-indoor-fringe.png" width="512" height="512"/>
+ <tileset firstgid="129" name="Ship Fringe" tilewidth="32" tileheight="32">
+ <image source="../graphics/tilesets/ship-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 7b1baf5b..5e6038ce 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="artis Indoor 2" tilewidth="32" tileheight="32">
- <image source="../graphics/tilesets/artis-indoor-fringe.png" width="512" height="512"/>
+ <tileset firstgid="129" name="Ship Fringe" tilewidth="32" tileheight="32">
+ <image source="../graphics/tilesets/ship-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"/>