summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorReid <reidyaro@gmail.com>2016-09-05 11:19:57 +0000
committerReid <reidyaro@gmail.com>2016-09-05 11:19:57 +0000
commit1d379caa1bea0479e367b2b4d3779072db261e3d (patch)
tree062590f94e2dd5ad2581aa5a11d1b3a0571c17fe
parent9e621d1e748156be598496e1e4035829127e7de9 (diff)
parente8538b9f946fd8fcf7360cfe7c173aaa7cf52599 (diff)
downloadclientdata-1d379caa1bea0479e367b2b4d3779072db261e3d.tar.gz
clientdata-1d379caa1bea0479e367b2b4d3779072db261e3d.tar.bz2
clientdata-1d379caa1bea0479e367b2b4d3779072db261e3d.tar.xz
clientdata-1d379caa1bea0479e367b2b4d3779072db261e3d.zip
Merge branch 'patch-1' into 'master'
Add red collision 001-2-38 at (24 47) and (36 47) So it's just two collision that was missing, else the character will be on the library which is weird. See merge request !13
-rw-r--r--maps/001-2-38.tmx2
1 files changed, 1 insertions, 1 deletions
diff --git a/maps/001-2-38.tmx b/maps/001-2-38.tmx
index 5bf3b5b3..48a574a1 100644
--- a/maps/001-2-38.tmx
+++ b/maps/001-2-38.tmx
@@ -396,7 +396,7 @@
1038,1038,1038,1038,1038,1038,1038,1038,1038,1038,1038,1038,1038,1038,1038,1038,1038,1038,1038,1038,1038,1038,1038,1038,1038,1038,1038,1038,1038,0,0,0,1038,1038,1038,1038,1038,1038,1038,1038,1038,1038,1038,1038,1038,1038,1038,1038,1038,1038,1038,1038,1038,1038,1038,1038,1038,1038,1038,1038,1038,
1038,1038,1038,1038,1038,1038,1038,1038,1038,1038,1038,1038,1038,1038,1038,1038,1038,1038,1038,1038,1038,1038,1038,1038,0,0,0,1038,1038,1038,0,1038,1038,1038,0,0,0,1038,1038,1038,1038,1038,1038,1038,1038,1038,1038,1038,1038,1038,1038,1038,1038,1038,1038,1038,1038,1038,1038,1038,1038,
1038,1038,1038,1038,1038,1038,1038,1038,1038,1038,1038,1038,1038,1038,1038,1038,1038,1038,1038,1038,1038,1038,1038,1038,0,0,0,1038,1038,1038,0,1038,1038,1038,0,0,0,1038,1038,1038,1038,1038,1038,1038,1038,1038,1038,1038,1038,1038,1038,1038,1038,1038,1038,1038,1038,1038,1038,1038,1038,
-1038,1038,1038,1038,1038,1038,1038,1038,1038,1038,1038,1038,1038,1038,1038,1038,1038,1038,1038,1038,1038,1038,1038,1038,0,0,0,0,0,0,0,0,0,0,0,0,0,1038,1038,1038,1038,1038,1038,1038,1038,1038,1038,1038,1038,1038,1038,1038,1038,1038,1038,1038,1038,1038,1038,1038,1038,
+1038,1038,1038,1038,1038,1038,1038,1038,1038,1038,1038,1038,1038,1038,1038,1038,1038,1038,1038,1038,1038,1038,1038,1038,1038,0,0,0,0,0,0,0,0,0,0,0,1038,1038,1038,1038,1038,1038,1038,1038,1038,1038,1038,1038,1038,1038,1038,1038,1038,1038,1038,1038,1038,1038,1038,1038,1038,
1038,1038,1038,1038,1038,1038,1038,1038,1038,1038,1038,1038,1038,1038,1038,1038,1038,1038,1038,1038,1038,1038,1038,1038,1038,0,0,0,0,0,0,0,0,0,0,0,1038,1038,1038,1038,1038,1038,1038,1038,1038,1038,1038,1038,1038,1038,1038,1038,1038,1038,1038,1038,1038,1038,1038,1038,1038,
1038,1038,1038,1038,1038,1038,1038,1038,1038,1038,1038,1038,1038,1038,1038,1038,1038,1038,1038,1038,1038,1038,1038,1038,1038,0,0,0,1038,0,0,0,1038,0,0,0,1038,1038,1038,1038,1038,1038,1038,1038,1038,1038,1038,1038,1038,1038,1038,1038,1038,1038,1038,1038,1038,1038,1038,1038,1038,
1038,1038,1038,1038,1038,1038,1038,1038,1038,1038,1038,1038,1038,1038,1038,1038,1038,1038,1038,1038,1038,1038,1038,1038,1038,1038,1038,1038,1038,1038,1038,1038,1038,1038,1038,1038,1038,1038,1038,1038,1038,1038,1038,1038,1038,1038,1038,1038,1038,1038,1038,1038,1038,1038,1038,1038,1038,1038,1038,1038,1038,