Merging with develop
This commit is contained in:
parent
3d5c222957
commit
cdd61bdb2c
135 changed files with 4313 additions and 2128 deletions
|
@ -1,11 +1,4 @@
|
|||
{ "compressionlevel":-1,
|
||||
"editorsettings":
|
||||
{
|
||||
"export":
|
||||
{
|
||||
"target":"."
|
||||
}
|
||||
},
|
||||
"height":26,
|
||||
"infinite":false,
|
||||
"layers":[
|
||||
|
@ -101,7 +94,7 @@
|
|||
"opacity":1,
|
||||
"properties":[
|
||||
{
|
||||
"name":"exitSceneUrl",
|
||||
"name":"exitUrl",
|
||||
"type":"string",
|
||||
"value":"\/@\/tcm\/workadventure\/floor2#down-the-stairs"
|
||||
}],
|
||||
|
@ -119,7 +112,7 @@
|
|||
"opacity":1,
|
||||
"properties":[
|
||||
{
|
||||
"name":"exitSceneUrl",
|
||||
"name":"exitUrl",
|
||||
"type":"string",
|
||||
"value":"\/@\/tcm\/workadventure\/floor2#down-the-stairs-secours"
|
||||
}],
|
||||
|
@ -264,7 +257,7 @@
|
|||
"nextobjectid":1,
|
||||
"orientation":"orthogonal",
|
||||
"renderorder":"right-down",
|
||||
"tiledversion":"1.3.3",
|
||||
"tiledversion":"2021.03.23",
|
||||
"tileheight":32,
|
||||
"tilesets":[
|
||||
{
|
||||
|
@ -1959,6 +1952,6 @@
|
|||
}],
|
||||
"tilewidth":32,
|
||||
"type":"map",
|
||||
"version":1.2,
|
||||
"version":1.5,
|
||||
"width":46
|
||||
}
|
Loading…
Add table
Add a link
Reference in a new issue