Merge branch 'master' into feature/dude

2 files changed, 51 insertions, 9 deletions

diff --git a/resources/map.tmx b/resources/map.tmx
index 4716fae..766cd89 100644
--- a/resources/map.tmx
+++ b/resources/map.tmx
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<map version="1.2" tiledversion="1.2.3" orientation="orthogonal" renderorder="right-down" width="20" height="20" tilewidth="16" tileheight="16" infinite="0" nextlayerid="6" nextobjectid="1">
+<map version="1.2" tiledversion="1.2.1" orientation="orthogonal" renderorder="right-down" width="20" height="20" tilewidth="16" tileheight="16" infinite="0" nextlayerid="6" nextobjectid="1">
  <tileset firstgid="1" name="tileset" tilewidth="16" tileheight="16" tilecount="50" columns="10">
   <image source="tileset.png" width="160" height="80"/>
  </tileset>
@@ -14,7 +14,7 @@
 2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,
 1,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,
 1,1,1,1,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,
-1,1,1,1,1,1,2,2,2,2,2,2,2,2,1,1,2,2,2,2,
+1,1,1,1,1,1,2,2,2,2,2,2,2,2,2,2,2,2,2,2,
 1,1,1,1,1,1,1,1,2,2,2,2,1,1,1,1,1,1,2,2,
 1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,2,
 1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,
@@ -51,7 +51,7 @@
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
 </data>
  </layer>
- <layer id="3" name="Ground-Angled" width="20" height="20">
+ <layer id="3" name="Ground-Alpha" width="20" height="20">
   <data encoding="csv">
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
@@ -62,7 +62,7 @@
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 2684354564,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 0,0,0,2684354564,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,2684354564,0,0,0,0,0,0,0,3221225476,2,2,2,0,0,0,
+0,0,0,0,0,2684354564,0,0,0,0,0,0,0,3221225476,0,0,0,0,0,0,
 0,0,0,0,0,0,0,2684354564,0,0,0,0,4,0,0,0,0,2684354564,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2684354564,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
@@ -80,13 +80,13 @@
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,2147483683,0,0,35,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,2147483693,0,0,45,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,35,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,36,0,45,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,46,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
@@ -105,12 +105,12 @@
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,15,25,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,25,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
diff --git a/resources/tileset.tsx b/resources/tileset.tsx
index 3e97f2f..67229a4 100644
--- a/resources/tileset.tsx
+++ b/resources/tileset.tsx
@@ -1,4 +1,46 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<tileset version="1.2" tiledversion="1.2.3" name="tileset" tilewidth="16" tileheight="16" tilecount="50" columns="10">
+<tileset version="1.2" tiledversion="1.2.1" name="tileset" tilewidth="16" tileheight="16" tilecount="50" columns="10">
  <image source="tileset.png" width="160" height="80"/>
+ <tile id="14">
+  <properties>
+   <property name="delay" type="int" value="100"/>
+   <property name="entity" value="flame"/>
+   <property name="keyframe" type="int" value="0"/>
+  </properties>
+ </tile>
+ <tile id="24">
+  <properties>
+   <property name="delay" type="int" value="100"/>
+   <property name="entity" value="flame"/>
+   <property name="keyframe" type="int" value="1"/>
+  </properties>
+ </tile>
+ <tile id="34">
+  <properties>
+   <property name="delay" type="int" value="100"/>
+   <property name="entity" value="player-top"/>
+   <property name="keyframe" type="int" value="0"/>
+  </properties>
+ </tile>
+ <tile id="35">
+  <properties>
+   <property name="delay" type="int" value="100"/>
+   <property name="entity" value="player-top"/>
+   <property name="keyframe" type="int" value="1"/>
+  </properties>
+ </tile>
+ <tile id="44">
+  <properties>
+   <property name="delay" type="int" value="100"/>
+   <property name="entity" value="player-bottom"/>
+   <property name="keyframe" type="int" value="0"/>
+  </properties>
+ </tile>
+ <tile id="45">
+  <properties>
+   <property name="delay" type="int" value="100"/>
+   <property name="entity" value="player-bottom"/>
+   <property name="keyframe" type="int" value="1"/>
+  </properties>
+ </tile>
 </tileset>