summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlige <gauvain.dauchy@free.fr>2016-07-11 23:14:59 +0000
committerAlige <gauvain.dauchy@free.fr>2016-07-11 23:14:59 +0000
commit59e4ddf3cec9cd1fef2c747dd4d099b990d0e7dc (patch)
tree8dd58a61b8f7dc01e3443cc865694337dff610d4
parent0e4cf587d00a09d14a2e28207f398ff95db3a270 (diff)
parent36d046d7d6aa1bd561f1b003d74d7dd9fcbb1443 (diff)
downloadclientdata-59e4ddf3cec9cd1fef2c747dd4d099b990d0e7dc.tar.gz
clientdata-59e4ddf3cec9cd1fef2c747dd4d099b990d0e7dc.tar.bz2
clientdata-59e4ddf3cec9cd1fef2c747dd4d099b990d0e7dc.tar.xz
clientdata-59e4ddf3cec9cd1fef2c747dd4d099b990d0e7dc.zip
Merge branch 'adjust_particule_to_warp' into 'master'
adjust fx to warp adjust fx to warp 001-2-28 to 001-2-29 See merge request !7
-rw-r--r--maps/001-2-28.tmx2
1 files changed, 1 insertions, 1 deletions
diff --git a/maps/001-2-28.tmx b/maps/001-2-28.tmx
index 8d3de9b6..363e35c9 100644
--- a/maps/001-2-28.tmx
+++ b/maps/001-2-28.tmx
@@ -570,7 +570,7 @@
<property name="dest_y" value="0"/>
</properties>
</object>
- <object id="14" name="To Second Level" type="warp" x="1024" y="800" width="128" height="32">
+ <object id="14" name="To Second Level" type="warp" x="1024" y="768" width="128" height="32">
<properties>
<property name="dest_map" value="001-1"/>
<property name="dest_x" value="0"/>