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/cave2.tsx | |
| 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/cave2.tsx')
| -rw-r--r-- | tilesets/cave2.tsx | 4 |
1 files changed, 4 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> |