Merge branch 'develop' into exitTriggerAction

# Conflicts: # front/src/Phaser/Game/GameScene.ts
2021-02-17 19:28:41 +01:00
parent beb53df364 ae1d00c828
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,