From: David Négrier <d.negrier@thecodingmachine.com>
Date: Thu, 16 Apr 2020 20:44:31 +0000 (+0200)
Subject: Merge
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=db605d100ec0564ef93248ca3b23b3dff14ce891;p=libreadventure.git

Merge
---

db605d100ec0564ef93248ca3b23b3dff14ce891
diff --cc front/src/Phaser/Game/GameScene.ts
index 70467c7,a08c8fd..b615106
--- a/front/src/Phaser/Game/GameScene.ts
+++ b/front/src/Phaser/Game/GameScene.ts
@@@ -42,7 -43,8 +43,8 @@@ export class GameScene extends Phaser.S
  
      //hook preload scene
      preload(): void {
+         cypressAsserter.preloadStarted();
 -        let mapUrl = 'maps/map2.json';
 +        let mapUrl = 'maps/map.json';
          this.load.on('filecomplete-tilemapJSON-'+Textures.Map, (key: string, type: string, data: any) => {
              // Triggered when the map is loaded
              // Load tiles attached to the map recursively