diff options
| author | WBoerenkamps <wrj.boerenkamps@student.avans.nl> | 2024-10-25 20:59:34 +0200 |
|---|---|---|
| committer | WBoerenkamps <wrj.boerenkamps@student.avans.nl> | 2024-10-25 20:59:34 +0200 |
| commit | 15a4c4a1cf67e13be53ef423c51c56488f332ea9 (patch) | |
| tree | 661084fc8171089ce32bf779f2b3a85d634b38e4 /asset/tiled/images | |
| parent | f472e0ba3bf54fc5055cf9f08925bed3f98a1dbc (diff) | |
| parent | b3b762a34e7ccb4a0dcd041a693ac7180af16002 (diff) | |
merge conficts fixed
Diffstat (limited to 'asset/tiled/images')
| -rw-r--r-- | asset/tiled/images/tilemap/license | 2 | ||||
| -rw-r--r-- | asset/tiled/images/tilemap/platform.tsx | 18 | ||||
| -rw-r--r-- | asset/tiled/images/tilemap/tileset.png | bin | 0 -> 29737 bytes | |||
| -rw-r--r-- | asset/tiled/images/tilemap/tileset02.png | bin | 0 -> 6478 bytes |
4 files changed, 20 insertions, 0 deletions
diff --git a/asset/tiled/images/tilemap/license b/asset/tiled/images/tilemap/license new file mode 100644 index 0000000..1676dad --- /dev/null +++ b/asset/tiled/images/tilemap/license @@ -0,0 +1,2 @@ +tileset by Alucard +http://opengameart.org/content/pixel-art-platformer-complete-pack
\ No newline at end of file diff --git a/asset/tiled/images/tilemap/platform.tsx b/asset/tiled/images/tilemap/platform.tsx new file mode 100644 index 0000000..6a48b12 --- /dev/null +++ b/asset/tiled/images/tilemap/platform.tsx @@ -0,0 +1,18 @@ +<?xml version="1.0" encoding="UTF-8"?> +<tileset name="" tilewidth="64" tileheight="64" tilecount="42" columns="6"> + <properties> + <property name="bool property" type="bool" value="false"/> + <property name="float property" type="float" value="56.770000000000003"/> + <property name="int property" type="int" value="12"/> + <property name="string property" value="shoes"/> + </properties> + <image source="tileset.png" trans="ff00ff" width="384" height="448"/> + <terraintypes> + <terrain name="brown" tile="-1"/> + <terrain name="green" tile="-1"/> + </terraintypes> + <tile id="0" terrain=",0,,0"/> + <tile id="22" terrain="1,1,1,"/> + <tile id="25" terrain=",1,,1"/> + <tile id="26" terrain="0,,0,"/> +</tileset> diff --git a/asset/tiled/images/tilemap/tileset.png b/asset/tiled/images/tilemap/tileset.png Binary files differnew file mode 100644 index 0000000..f13825d --- /dev/null +++ b/asset/tiled/images/tilemap/tileset.png diff --git a/asset/tiled/images/tilemap/tileset02.png b/asset/tiled/images/tilemap/tileset02.png Binary files differnew file mode 100644 index 0000000..9f594e4 --- /dev/null +++ b/asset/tiled/images/tilemap/tileset02.png |
