diff --git a/CHANGELOG.md b/CHANGELOG.md index 50c09ca4..11435ad5 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -28,7 +28,7 @@ - Use `WA.state.[any variable]: unknown` to access directly any variable (this is a shortcut to using `WA.state.loadVariable` and `WA.state.saveVariable`) - Users blocking now relies on UUID rather than ID. A blocked user that leaves a room and comes back will stay blocked. - The text chat was redesigned to be prettier and to use more features : - - The chat is now persistent bewteen discussions and always accesible + - The chat is now persistent between discussions and always accessible - The chat now tracks incoming and outcoming users in your conversation - The chat allows your to see the visit card of users - You can close the chat window with the escape key diff --git a/back/src/Model/PositionNotifier.ts b/back/src/Model/PositionNotifier.ts index c34c1ef1..4f911637 100644 --- a/back/src/Model/PositionNotifier.ts +++ b/back/src/Model/PositionNotifier.ts @@ -21,7 +21,7 @@ interface ZoneDescriptor { } export class PositionNotifier { - // TODO: we need a way to clean the zones if noone is in the zone and noone listening (to free memory!) + // TODO: we need a way to clean the zones if no one is in the zone and no one listening (to free memory!) private zones: Zone[][] = []; diff --git a/back/src/RoomManager.ts b/back/src/RoomManager.ts index 0465ade6..3369eef9 100644 --- a/back/src/RoomManager.ts +++ b/back/src/RoomManager.ts @@ -57,7 +57,7 @@ const roomManager: IRoomManagerServer = { room = gameRoom; user = myUser; } else { - //Connexion may have been closed before the init was finished, so we have to manually disconnect the user. + //Connection may have been closed before the init was finished, so we have to manually disconnect the user. socketManager.leaveRoom(gameRoom, myUser); } }) diff --git a/docs/maps/wa-maps.md b/docs/maps/wa-maps.md index d7a349c5..0eb94dbf 100644 --- a/docs/maps/wa-maps.md +++ b/docs/maps/wa-maps.md @@ -56,7 +56,7 @@ A few things to notice: ## Building walls and "collidable" areas -By default, the characters can traverse any tiles. If you want to prevent your characeter from going through a tile (like a wall or a desktop), you must make this tile "collidable". You can do this by settings the `collides` property on a given tile. +By default, the characters can traverse any tiles. If you want to prevent your character from going through a tile (like a wall or a desktop), you must make this tile "collidable". You can do this by settings the `collides` property on a given tile. To make a tile "collidable", you should: diff --git a/front/src/Phaser/Entity/PlayerTexturesLoadingManager.ts b/front/src/Phaser/Entity/PlayerTexturesLoadingManager.ts index 3c47c9d9..92954bfb 100644 --- a/front/src/Phaser/Entity/PlayerTexturesLoadingManager.ts +++ b/front/src/Phaser/Entity/PlayerTexturesLoadingManager.ts @@ -107,7 +107,7 @@ export const createLoadingPromise = ( loadPlugin.spritesheet(playerResourceDescriptor.name, playerResourceDescriptor.img, frameConfig); const errorCallback = (file: { src: string }) => { if (file.src !== playerResourceDescriptor.img) return; - console.error("failed loading player ressource: ", playerResourceDescriptor); + console.error("failed loading player resource: ", playerResourceDescriptor); rej(playerResourceDescriptor); loadPlugin.off("filecomplete-spritesheet-" + playerResourceDescriptor.name, successCallback); loadPlugin.off("loaderror", errorCallback); diff --git a/front/src/Phaser/Game/GameScene.ts b/front/src/Phaser/Game/GameScene.ts index c5deaba5..e7738265 100644 --- a/front/src/Phaser/Game/GameScene.ts +++ b/front/src/Phaser/Game/GameScene.ts @@ -194,7 +194,7 @@ export class GameScene extends DirtyScene { private popUpElements: Map = new Map(); private originalMapUrl: string | undefined; private pinchManager: PinchManager | undefined; - private mapTransitioning: boolean = false; //used to prevent transitions happenning at the same time. + private mapTransitioning: boolean = false; //used to prevent transitions happening at the same time. private emoteManager!: EmoteManager; private preloading: boolean = true; private startPositionCalculator!: StartPositionCalculator; @@ -436,7 +436,7 @@ export class GameScene extends DirtyScene { this.characterLayers = gameManager.getCharacterLayers(); this.companion = gameManager.getCompanion(); - //initalise map + //initialise map this.Map = this.add.tilemap(this.MapUrlFile); const mapDirUrl = this.MapUrlFile.substr(0, this.MapUrlFile.lastIndexOf("/")); this.mapFile.tilesets.forEach((tileset: ITiledTileSet) => { diff --git a/front/src/Phaser/Game/StartPositionCalculator.ts b/front/src/Phaser/Game/StartPositionCalculator.ts index a0184d2b..0827b623 100644 --- a/front/src/Phaser/Game/StartPositionCalculator.ts +++ b/front/src/Phaser/Game/StartPositionCalculator.ts @@ -45,7 +45,7 @@ export class StartPositionCalculator { /** * * @param selectedLayer this is always the layer that is selected with the hash in the url - * @param selectedOrDefaultLayer this can also be the {defaultStartLayerName} if the {selectedLayer} didnt yield any start points + * @param selectedOrDefaultLayer this can also be the {defaultStartLayerName} if the {selectedLayer} did not yield any start points */ public initPositionFromLayerName(selectedOrDefaultLayer: string | null, selectedLayer: string | null) { if (!selectedOrDefaultLayer) { @@ -73,7 +73,7 @@ export class StartPositionCalculator { /** * * @param selectedLayer this is always the layer that is selected with the hash in the url - * @param selectedOrDefaultLayer this can also be the default layer if the {selectedLayer} didnt yield any start points + * @param selectedOrDefaultLayer this can also be the default layer if the {selectedLayer} did not yield any start points */ private startUser(selectedOrDefaultLayer: ITiledMapTileLayer, selectedLayer: string | null): PositionInterface { const tiles = selectedOrDefaultLayer.data; diff --git a/front/src/Phaser/UserInput/UserInputManager.ts b/front/src/Phaser/UserInput/UserInputManager.ts index 068e84a2..edfcdd25 100644 --- a/front/src/Phaser/UserInput/UserInputManager.ts +++ b/front/src/Phaser/UserInput/UserInputManager.ts @@ -21,7 +21,7 @@ export enum UserInputEvent { } -//we cannot use a map structure so we have to create a replacment +//we cannot use a map structure so we have to create a replacement export class ActiveEventList { private eventMap : Map = new Map(); diff --git a/front/src/Stores/MediaStore.ts b/front/src/Stores/MediaStore.ts index 9144a6ee..10e4523d 100644 --- a/front/src/Stores/MediaStore.ts +++ b/front/src/Stores/MediaStore.ts @@ -274,12 +274,12 @@ export const mediaStreamConstraintsStore = derived( currentAudioConstraint = false; } - // Disable webcam for privacy reasons (the game is not visible and we were talking to noone) + // Disable webcam for privacy reasons (the game is not visible and we were talking to no one) if ($privacyShutdownStore === true) { currentVideoConstraint = false; } - // Disable webcam for energy reasons (the user is not moving and we are talking to noone) + // Disable webcam for energy reasons (the user is not moving and we are talking to no one) if ($cameraEnergySavingStore === true) { currentVideoConstraint = false; currentAudioConstraint = false; diff --git a/front/src/WebRtc/SimplePeer.ts b/front/src/WebRtc/SimplePeer.ts index e30f1b1f..510918a2 100644 --- a/front/src/WebRtc/SimplePeer.ts +++ b/front/src/WebRtc/SimplePeer.ts @@ -295,7 +295,7 @@ export class SimplePeer { // I do understand the method closeConnection is called twice, but I don't understand how they manage to run in parallel. peer.destroy(); - //Comment this peer connexion because if we delete and try to reshare screen, the RTCPeerConnection send renegociate event. This array will be remove when user left circle discussion + //Comment this peer connection because if we delete and try to reshare screen, the RTCPeerConnection send renegotiate event. This array will be remove when user left circle discussion /*if(!this.PeerScreenSharingConnectionArray.delete(userId)){ throw 'Couln\'t delete peer screen sharing connexion'; }*/ @@ -370,14 +370,14 @@ export class SimplePeer { console.error( 'Could not find peer whose ID is "' + data.userId + '" in receiveWebrtcScreenSharingSignal' ); - console.info("Attempt to create new peer connexion"); + console.info("Attempt to create new peer connection"); if (stream) { this.sendLocalScreenSharingStreamToUser(data.userId, stream); } } } catch (e) { console.error(`receiveWebrtcSignal => ${data.userId}`, e); - //Comment this peer connexion because if we delete and try to reshare screen, the RTCPeerConnection send renegociate event. This array will be remove when user left circle discussion + //Comment this peer connection because if we delete and try to reshare screen, the RTCPeerConnection send renegotiate event. This array will be remove when user left circle discussion //this.PeerScreenSharingConnectionArray.delete(data.userId); this.receiveWebrtcScreenSharingSignal(data); } @@ -485,7 +485,7 @@ export class SimplePeer { if (!PeerConnectionScreenSharing.isReceivingScreenSharingStream()) { PeerConnectionScreenSharing.destroy(); - //Comment this peer connexion because if we delete and try to reshare screen, the RTCPeerConnection send renegociate event. This array will be remove when user left circle discussion + //Comment this peer connection because if we delete and try to reshare screen, the RTCPeerConnection send renegotiate event. This array will be remove when user left circle discussion //this.PeerScreenSharingConnectionArray.delete(userId); } } diff --git a/front/tests/Phaser/Game/PlayerTexturesLoadingTest.ts b/front/tests/Phaser/Game/PlayerTexturesLoadingTest.ts index d58d55db..44502725 100644 --- a/front/tests/Phaser/Game/PlayerTexturesLoadingTest.ts +++ b/front/tests/Phaser/Game/PlayerTexturesLoadingTest.ts @@ -8,19 +8,19 @@ describe("getRessourceDescriptor()", () => { expect(desc.img).toEqual('url'); }); - it(", if given a string as parameter, should search trough hardcoded values", () => { + it(", if given a string as parameter, should search through hardcoded values", () => { const desc = getRessourceDescriptor('male1'); expect(desc.name).toEqual('male1'); expect(desc.img).toEqual("resources/characters/pipoya/Male 01-1.png"); }); - it(", if given a string as parameter, should search trough hardcoded values (bis)", () => { + it(", if given a string as parameter, should search through hardcoded values (bis)", () => { const desc = getRessourceDescriptor('color_2'); expect(desc.name).toEqual('color_2'); expect(desc.img).toEqual("resources/customisation/character_color/character_color1.png"); }); - it(", if given a descriptor without url as parameter, should search trough hardcoded values", () => { + it(", if given a descriptor without url as parameter, should search through hardcoded values", () => { const desc = getRessourceDescriptor({name: 'male1', img: ''}); expect(desc.name).toEqual('male1'); expect(desc.img).toEqual("resources/characters/pipoya/Male 01-1.png"); diff --git a/maps/Tuto/tilesets/LPc-submissions-Final Attribution.txt b/maps/Tuto/tilesets/LPc-submissions-Final Attribution.txt index d04221dc..aec5b1b1 100644 --- a/maps/Tuto/tilesets/LPc-submissions-Final Attribution.txt +++ b/maps/Tuto/tilesets/LPc-submissions-Final Attribution.txt @@ -176,7 +176,7 @@ Tuomo Untinen CC-BY-3.0 Casper Nilsson ~~~~~~~~~~~~~~~~~~~~~~~~~~~ - - Asain themed shrine including red lantern + - Asian themed shrine including red lantern - foodog statue - Toro - Cherry blossom tree diff --git a/pusher/src/Model/PositionDispatcher.ts b/pusher/src/Model/PositionDispatcher.ts index 594328e3..f868cd2c 100644 --- a/pusher/src/Model/PositionDispatcher.ts +++ b/pusher/src/Model/PositionDispatcher.ts @@ -21,7 +21,7 @@ interface ZoneDescriptor { } export class PositionDispatcher { - // TODO: we need a way to clean the zones if noone is in the zone and noone listening (to free memory!) + // TODO: we need a way to clean the zones if no one is in the zone and no one listening (to free memory!) private zones: Zone[][] = []; diff --git a/pusher/src/Services/SocketManager.ts b/pusher/src/Services/SocketManager.ts index bd3e2cad..741eaa42 100644 --- a/pusher/src/Services/SocketManager.ts +++ b/pusher/src/Services/SocketManager.ts @@ -463,7 +463,7 @@ export class SocketManager implements ZoneEventListener { client.send(serverToClientMessage.serializeBinary().buffer, true); } catch (e) { - console.error("An error occured while generating the Jitsi JWT token: ", e); + console.error("An error occurred while generating the Jitsi JWT token: ", e); } }