Merge branch 'master' of github.com:ChaosChemnitz/workadventure-map

This commit is contained in:
Thomas 2021-12-27 00:03:01 +01:00
commit 4c11e98811
1 changed files with 26 additions and 26 deletions

View File

@ -1134,7 +1134,7 @@
"id":1129,
"properties":[
{
"name":"collide",
"name":"collides",
"type":"bool",
"value":true
}]
@ -1143,7 +1143,7 @@
"id":1130,
"properties":[
{
"name":"collide",
"name":"collides",
"type":"bool",
"value":true
}]
@ -1152,7 +1152,7 @@
"id":1131,
"properties":[
{
"name":"collide",
"name":"collides",
"type":"bool",
"value":true
}]
@ -1170,7 +1170,7 @@
"id":1175,
"properties":[
{
"name":"collide",
"name":"collides",
"type":"bool",
"value":true
}]
@ -1179,7 +1179,7 @@
"id":1176,
"properties":[
{
"name":"collide",
"name":"collides",
"type":"bool",
"value":true
}]
@ -1323,7 +1323,7 @@
"id":1534,
"properties":[
{
"name":"collide",
"name":"collides",
"type":"bool",
"value":true
}]
@ -1332,7 +1332,7 @@
"id":1535,
"properties":[
{
"name":"collide",
"name":"collides",
"type":"bool",
"value":true
}]
@ -1341,7 +1341,7 @@
"id":1536,
"properties":[
{
"name":"collide",
"name":"collides",
"type":"bool",
"value":true
}]
@ -1350,7 +1350,7 @@
"id":1575,
"properties":[
{
"name":"collide",
"name":"collides",
"type":"bool",
"value":true
}]
@ -1359,7 +1359,7 @@
"id":1576,
"properties":[
{
"name":"collide",
"name":"collides",
"type":"bool",
"value":true
}]
@ -1368,7 +1368,7 @@
"id":1577,
"properties":[
{
"name":"collide",
"name":"collides",
"type":"bool",
"value":true
}]
@ -1377,7 +1377,7 @@
"id":1578,
"properties":[
{
"name":"collide",
"name":"collides",
"type":"bool",
"value":true
}]
@ -1386,7 +1386,7 @@
"id":1579,
"properties":[
{
"name":"collide",
"name":"collides",
"type":"bool",
"value":true
}]
@ -1395,7 +1395,7 @@
"id":1580,
"properties":[
{
"name":"collide",
"name":"collides",
"type":"bool",
"value":true
}]
@ -1404,7 +1404,7 @@
"id":1581,
"properties":[
{
"name":"collide",
"name":"collides",
"type":"bool",
"value":true
}]
@ -1768,7 +1768,7 @@
"id":360,
"properties":[
{
"name":"collide",
"name":"collides",
"type":"bool",
"value":true
}]
@ -1777,7 +1777,7 @@
"id":361,
"properties":[
{
"name":"collide",
"name":"collides",
"type":"bool",
"value":true
}]
@ -1786,7 +1786,7 @@
"id":362,
"properties":[
{
"name":"collide",
"name":"collides",
"type":"bool",
"value":true
}]
@ -1795,7 +1795,7 @@
"id":363,
"properties":[
{
"name":"collide",
"name":"collides",
"type":"bool",
"value":true
}]
@ -1804,7 +1804,7 @@
"id":364,
"properties":[
{
"name":"collide",
"name":"collides",
"type":"bool",
"value":true
}]
@ -1813,7 +1813,7 @@
"id":384,
"properties":[
{
"name":"collide",
"name":"collides",
"type":"bool",
"value":true
}]
@ -1822,7 +1822,7 @@
"id":385,
"properties":[
{
"name":"collide",
"name":"collides",
"type":"bool",
"value":true
}]
@ -1831,7 +1831,7 @@
"id":386,
"properties":[
{
"name":"collide",
"name":"collides",
"type":"bool",
"value":true
}]
@ -1840,7 +1840,7 @@
"id":387,
"properties":[
{
"name":"collide",
"name":"collides",
"type":"bool",
"value":true
}]
@ -1849,7 +1849,7 @@
"id":388,
"properties":[
{
"name":"collide",
"name":"collides",
"type":"bool",
"value":true
}]
@ -1936,4 +1936,4 @@
"type":"map",
"version":1.4,
"width":70
}
}