diff options
| author | Jessica Tölke <jtoelke@mail.upb.de> | 2013-06-21 22:36:46 +0200 |
|---|---|---|
| committer | Jessica Tölke <jtoelke@mail.upb.de> | 2013-06-21 22:36:46 +0200 |
| commit | 6de854e3b43fedbf7be5c914b6f05812766ccfde (patch) | |
| tree | 9abba21bae5d9a157c8295c56a0034dd0563b9ff /maps/003-2.tmx | |
| parent | 3061d90f72f8e374e457eec9c2b1a32b94b80e0b (diff) | |
| parent | fa86b982fd820a4cf7112719bd721db0dc811b28 (diff) | |
| download | clientdata-6de854e3b43fedbf7be5c914b6f05812766ccfde.tar.gz clientdata-6de854e3b43fedbf7be5c914b6f05812766ccfde.tar.bz2 clientdata-6de854e3b43fedbf7be5c914b6f05812766ccfde.tar.xz clientdata-6de854e3b43fedbf7be5c914b6f05812766ccfde.zip | |
Merge remote-tracking branch 'wushin/tonori-cave-release'
Conflicts:
license.txt: graphics/tiles/Woodland_ground.png was changed in master
added also enchilado here, since that edit was forgotten
npcs.xml: id conflict with trapper and supply chest, moved supply chest down to 378
Diffstat (limited to 'maps/003-2.tmx')
| -rw-r--r-- | maps/003-2.tmx | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/maps/003-2.tmx b/maps/003-2.tmx index dd3e48e7..1cbd05b9 100644 --- a/maps/003-2.tmx +++ b/maps/003-2.tmx @@ -34,7 +34,7 @@ H4sIAAAAAAAAA+3OoREAAAgDMfbfGBQb1CJI7l7VtAoAAAAAAAAAgI86NGG7+gEAAAAAANxbMiernpg6AAA= </data> </layer> - <layer name="Collision" width="75" height="50" visible="0"> + <layer name="Collision" width="75" height="50"> <data encoding="base64" compression="gzip"> H4sIAAAAAAAAA+3SMQrDMBAEwMP/f3SaVCI5Rw4rqRjBgJGLW1Z3VdUFAAAAAADwVsN3DXe7s42n+5fK/m1Geu6KzlbtU3ruvx11OVOZZzKc0NVM7nRXd/e7uxozdSeR45e3OrGrLmci82yG07takfnTnOS8J9me7liio+4dT+hq9uzKsXu3AAAAAACAqhfu4A4BmDoAAA== </data> |