Merge branch 'master' into webrtc

# Conflicts: # front/src/Phaser/Game/GameManager.ts
2020-04-28 20:50:51 +02:00
parent 881bb04eb0 cdd18fd5ac
commit 8c935e8b27
12 changed files with 682 additions and 115 deletions
@@ -58,7 +58,6 @@ export class GameScene extends Phaser.Scene implements GameSceneInterface{
            })
        });
        this.load.tilemapTiledJSON(Textures.Map, mapUrl);
-        this.load.image(Textures.Rock, 'resources/objects/rockSprite.png');
        this.load.spritesheet(Textures.Player,
            'resources/characters/pipoya/Male 01-1.png',
            { frameWidth: 32, frameHeight: 32 }
@@ -99,7 +98,6 @@ export class GameScene extends Phaser.Scene implements GameSceneInterface{

        //add entities
        this.Objects = new Array<Phaser.Physics.Arcade.Sprite>();
-        this.addSpite(this.physics.add.sprite(200, 400, Textures.Rock, 26));

        //init event click
        this.EventToClickOnTile();