Skip to content

Commit dbbf3ce

Browse files
committed
Merge branch 'master' of github.com:ChaiScript/Spiced
2 parents 8d3d47b + 29e6eba commit dbbf3ce

File tree

3 files changed

+5
-2
lines changed

3 files changed

+5
-2
lines changed
5.51 KB
Loading

sample_game/resources/Maps/fairview.tmx

+5-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<map version="1.0" orientation="orthogonal" renderorder="right-down" width="30" height="20" tilewidth="16" tileheight="16" nextobjectid="3">
2+
<map version="1.0" orientation="orthogonal" renderorder="right-down" width="30" height="20" tilewidth="16" tileheight="16" nextobjectid="7">
33
<tileset firstgid="1" name="tilesetformattedupdate1" tilewidth="16" tileheight="16">
44
<image source="../TileSets/tilesetformattedupdate1.png" width="112" height="192"/>
55
</tileset>
@@ -14,6 +14,9 @@
1414
<tileset firstgid="101" name="pinheads_pinhead" tilewidth="26" tileheight="26">
1515
<image source="../pinheads_pinhead.png" width="26" height="26"/>
1616
</tileset>
17+
<tileset firstgid="102" name="Deborah" tilewidth="16" tileheight="24">
18+
<image source="../TileSets/Deborah.png" width="48" height="96"/>
19+
</tileset>
1720
<layer name="Tile Layer 2" width="30" height="20">
1821
<data encoding="base64" compression="zlib">
1922
eJxjYBh4wA7F9LaPEKaVvSxAzArEbGhsWtvLDcQ8QMyLxqa1vQMVziPRXlLkRsEoGAWjYBTQDgAAtd8B7w==
@@ -31,7 +34,7 @@
3134
</layer>
3235
<objectgroup name="Object Layer 1">
3336
<object id="1" name="ExitSquare" gid="7" x="0" y="96" width="16" height="16"/>
34-
<object id="2" name="Deborah" gid="101" x="77" y="88" width="26" height="26"/>
37+
<object id="3" name="Deborah" gid="103" x="96" y="92" width="16" height="24"/>
3538
</objectgroup>
3639
<layer name="Data" width="30" height="20" opacity="0.63">
3740
<properties>
6.29 KB
Loading

0 commit comments

Comments
 (0)