Merge branch 'develop' into exitTriggerAction
# Conflicts: # front/src/Phaser/Game/GameScene.ts
This commit is contained in:
commit
83fc7d0cc0
88 changed files with 1382 additions and 1996 deletions
|
@ -298,7 +298,7 @@
|
|||
{
|
||||
"name":"exitUrl",
|
||||
"type":"string",
|
||||
"value":"\/@\/tcm\/workadventure\/floor1"
|
||||
"value":"..\/Floor1\/floor1.json"
|
||||
}],
|
||||
"type":"tilelayer",
|
||||
"visible":true,
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue