Merge branch 'master' into develop
Signed-off-by: Gregoire Parant <g.parant@thecodingmachine.com> # Conflicts: # front/public/resources/logos/meet.svg
This commit is contained in:
@@ -1220,6 +1220,8 @@ ${escapedMessage}
|
||||
openCoWebsite.closable ?? true
|
||||
);
|
||||
|
||||
coWebsiteManager.addCoWebsiteToStore(coWebsite, openCoWebsite.position);
|
||||
|
||||
if (openCoWebsite.lazy === undefined || !openCoWebsite.lazy) {
|
||||
await coWebsiteManager.loadCoWebsite(coWebsite);
|
||||
}
|
||||
@@ -1715,7 +1717,7 @@ ${escapedMessage}
|
||||
}
|
||||
});
|
||||
this.CurrentPlayer.on(Phaser.Input.Events.POINTER_OVER, (pointer: Phaser.Input.Pointer) => {
|
||||
this.CurrentPlayer.pointerOverOutline(0x00ffff);
|
||||
this.CurrentPlayer.pointerOverOutline(0x365dff);
|
||||
});
|
||||
this.CurrentPlayer.on(Phaser.Input.Events.POINTER_OUT, (pointer: Phaser.Input.Pointer) => {
|
||||
this.CurrentPlayer.pointerOutOutline();
|
||||
|
||||
Reference in New Issue
Block a user