Compare commits

..

No commits in common. "2334e9d7548faada9f70e9652cca1c0c2430ae10" and "8f37379b2bf030199953af0574d78156de89a2e6" have entirely different histories.

2 changed files with 6 additions and 43 deletions

View File

@ -70,10 +70,10 @@
"y":0
},
{
"data":[0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 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, 25, 25, 25, 25, 25, 0, 0, 0, 0, 0, 0, 0, 0, 25, 25, 25, 25, 25, 25, 0, 0, 0, 0, 25, 25, 25, 25, 25, 0, 0, 0, 0, 0, 0, 0, 0, 0, 25, 25, 25, 25, 25, 0, 0, 0, 0, 0, 0, 0, 0, 0, 25, 25, 25, 25, 25, 0, 0, 0, 0, 0, 0, 0, 0, 0, 25, 25, 25, 25, 25, 0, 0, 0, 0, 0, 0, 0, 0, 0, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 0, 0, 0, 0, 25, 25, 25, 25, 25, 25, 25, 25, 25, 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],
"data":[0, 0, 0, 178, 178, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 178, 178, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 178, 178, 178, 178, 178, 178, 178, 178, 178, 178, 0, 0, 0, 0, 178, 178, 178, 178, 178, 178, 178, 178, 178, 178, 0, 0, 0, 0, 178, 178, 178, 178, 178, 178, 178, 178, 178, 178, 0, 0, 0, 0, 178, 178, 178, 178, 178, 178, 178, 178, 178, 178, 0, 0, 0, 0, 178, 178, 178, 178, 178, 178, 178, 178, 178, 178, 0, 0, 0, 0, 178, 178, 178, 178, 178, 178, 178, 178, 178, 178, 0, 0, 0, 0, 178, 178, 178, 178, 178, 178, 178, 178, 178, 178, 0, 0, 0, 0, 178, 178, 178, 178, 178, 178, 178, 178, 178, 178, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
"height":12,
"id":18,
"name":"jitsi",
"id":7,
"name":"Boden Grund",
"opacity":1,
"properties":[
{
@ -87,18 +87,6 @@
"x":0,
"y":0
},
{
"data":[0, 0, 0, 178, 178, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 178, 178, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 178, 178, 178, 178, 178, 178, 178, 178, 178, 178, 0, 0, 0, 0, 178, 178, 178, 178, 178, 178, 178, 178, 178, 178, 0, 0, 0, 0, 178, 178, 178, 178, 178, 178, 178, 178, 178, 178, 0, 0, 0, 0, 178, 178, 178, 178, 178, 178, 178, 178, 178, 178, 0, 0, 0, 0, 178, 178, 178, 178, 178, 178, 178, 178, 178, 178, 0, 0, 0, 0, 178, 178, 178, 178, 178, 178, 178, 178, 178, 178, 0, 0, 0, 0, 178, 178, 178, 178, 178, 178, 178, 178, 178, 178, 0, 0, 0, 0, 178, 178, 178, 178, 178, 178, 178, 178, 178, 178, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
"height":12,
"id":7,
"name":"Boden Grund",
"opacity":1,
"type":"tilelayer",
"visible":true,
"width":14,
"x":0,
"y":0
},
{
"data":[0, 0, 0, 1073741887, 1073741887, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1073741871, 1073741871, 888, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 904, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 820, 0, 820, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 860, 861, 861, 861, 862, 0, 0, 0, 0, 0, 0, 0, 0, 0, 876, 877, 877, 877, 878, 0, 0, 0, 0, 0, 0, 0, 0, 0, 860, 861, 861, 861, 862, 0, 0, 0, 0, 0, 0, 0, 0, 0, 876, 877, 877, 877, 878, 0, 0, 0, 0, 0, 0, 0, 0, 0, 892, 893, 893, 893, 894, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 821, 0, 821, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
"height":12,
@ -182,7 +170,7 @@
"x":0,
"y":0
}],
"nextlayerid":19,
"nextlayerid":18,
"nextobjectid":1,
"orientation":"orthogonal",
"renderorder":"right-down",

View File

@ -175,24 +175,12 @@
"width":14,
"x":0,
"y":0
},
{
"data":[0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1477, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1483, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1482, 0, 0, 1478, 0, 0, 0, 0, 1073743303, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
"height":10,
"id":20,
"name":"KitchenAdditional1",
"opacity":1,
"type":"tilelayer",
"visible":true,
"width":14,
"x":0,
"y":0
}],
"nextlayerid":21,
"nextlayerid":20,
"nextobjectid":1,
"orientation":"orthogonal",
"renderorder":"right-down",
"tiledversion":"1.4.2",
"tiledversion":"1.4.3",
"tileheight":32,
"tilesets":[
{
@ -647,19 +635,6 @@
"tilecount":512,
"tileheight":32,
"tilewidth":32
},
{
"columns":4,
"firstgid":1476,
"image":"tilesets\/wa-matekiste_matekiste.png",
"imageheight":96,
"imagewidth":128,
"margin":0,
"name":"wa-matekiste_matekiste",
"spacing":0,
"tilecount":12,
"tileheight":32,
"tilewidth":32
}],
"tilewidth":32,
"type":"map",