Skip to content

Commit

Permalink
Merge pull request #158 from mekolat/beds
Browse files Browse the repository at this point in the history
make hurnscald beds useable & fringefix
  • Loading branch information
wushin committed Aug 25, 2014
2 parents 8b52197 + 917374b commit 7817ebc
Show file tree
Hide file tree
Showing 8 changed files with 402 additions and 144 deletions.
Binary file modified graphics/tiles/woodland_indoor.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified graphics/tiles/woodland_indoor_x2.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified graphics/tiles/woodland_indoor_x3.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
534 changes: 392 additions & 142 deletions maps/009-2.tmx

Large diffs are not rendered by default.

4 changes: 4 additions & 0 deletions tilesets/woodland_indoor_3x3.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
<tileset name="woodland_indoor_3x3" tilewidth="96" tileheight="96">
<image source="../graphics/tiles/woodland_indoor_x3.png" width="512" height="192"/>
</tileset>
4 changes: 4 additions & 0 deletions tilesets/woodland_indoor_4x3.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
<tileset name="woodland_indoor_4x3" tilewidth="128" tileheight="96">
<image source="../graphics/tiles/woodland_indoor_x3.png" width="512" height="192"/>
</tileset>
2 changes: 1 addition & 1 deletion tilesets/woodland_indoor_x2.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
<tileset name="woodland_indoor_x2" tilewidth="32" tileheight="64">
<image source="../graphics/tiles/woodland_indoor_x2.png" width="512" height="64"/>
<image source="../graphics/tiles/woodland_indoor_x2.png" width="512" height="192"/>
</tileset>
2 changes: 1 addition & 1 deletion tilesets/woodland_indoor_x3.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
<tileset name="woodland_indoor_x3" tilewidth="32" tileheight="96">
<image source="../graphics/tiles/woodland_indoor_x3.png" width="512" height="96"/>
<image source="../graphics/tiles/woodland_indoor_x3.png" width="512" height="192"/>
</tileset>

0 comments on commit 7817ebc

Please sign in to comment.