Merge branch 'develop' of github.com:thecodingmachine/workadventure into develop_vite

This commit is contained in:
_Bastler
2022-02-23 16:59:15 +01:00
806 changed files with 543 additions and 4667 deletions
+1 -1
View File
@@ -361,7 +361,7 @@ export class GameMap {
if (!layer.visible) {
continue;
}
if (layer.getTileAt(x, y)?.properties[GameMapProperties.COLLIDES]) {
if (layer.getTileAt(x, y)?.properties?.[GameMapProperties.COLLIDES]) {
return true;
}
}
-1
View File
@@ -346,7 +346,6 @@ export class GameScene extends DirtyScene {
(this.load as any).rexWebFont({
custom: {
families: ["Press Start 2P"],
urls: ["/resources/fonts/fonts.css"],
testString: "abcdefg",
},
});
@@ -61,7 +61,6 @@ export default {
state = initState;
}
// Idée: ESSAYER WebPack? https://paultavares.wordpress.com/2018/07/02/webpack-how-to-generate-an-es-module-bundle/
const computer = new Sprite(scene, object.x, object.y, "computer");
scene.add.existing(computer);
if (state.status === "on") {