Kraut.World/server
3
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source 
# Conflicts:
#	back/src/Services/Logger.ts
This commit is contained in:
David Négrier 2021-11-24 17:03:29 +01:00
commit 94959e2e91
37 changed files with 162 additions and 542 deletions
Download patch file Download diff file Expand all files Collapse all files

3
front/src/Connexion/Room.ts
View file

@ -107,7 +107,8 @@ export class Room {
this._mapUrl = data.mapUrl;
this._textures = data.textures;
this._group = data.group;
this._authenticationMandatory = data.authenticationMandatory || DISABLE_ANONYMOUS;
this._authenticationMandatory =
data.authenticationMandatory != null ? data.authenticationMandatory : DISABLE_ANONYMOUS;
this._iframeAuthentication = data.iframeAuthentication || OPID_LOGIN_SCREEN_PROVIDER;
this._contactPage = data.contactPage || CONTACT_URL;
return new MapDetail(data.mapUrl, data.textures);

4
front/src/Phaser/Entity/Character.ts
View file

@ -128,6 +128,10 @@ export abstract class Character extends Container {
}
public addTextures(textures: string[], frame?: string | number): void {
if (textures.length < 1) {
throw new TextureError("no texture given");
}
for (const texture of textures) {
if (this.scene && !this.scene.textures.exists(texture)) {
throw new TextureError("texture not found");

12
front/src/Phaser/Entity/PlayerTexturesLoadingManager.ts
View file

@ -69,13 +69,11 @@ export const lazyLoadPlayerCharacterTextures = (
}
//If the loading fail, we render the default model instead.
return returnPromise
.then((keys) =>
keys.map((key) => {
return typeof key !== "string" ? key.name : key;
})
)
.catch(() => lazyLoadPlayerCharacterTextures(loadPlugin, ["color_22", "eyes_23"]));
return returnPromise.then((keys) =>
keys.map((key) => {
return typeof key !== "string" ? key.name : key;
})
);
};
export const getRessourceDescriptor = (

7
front/src/Phaser/Game/GameMapPropertiesListener.ts
View file

@ -27,7 +27,7 @@ export class GameMapPropertiesListener {
constructor(private scene: GameScene, private gameMap: GameMap) {}
register() {
this.gameMap.onPropertyChange(GameMapProperties.OPEN_TAB, (newValue, oldvalue, allProps) => {
this.gameMap.onPropertyChange(GameMapProperties.OPEN_TAB, (newValue, oldValue, allProps) => {
if (newValue === undefined) {
layoutManagerActionStore.removeAction("openTab");
}
@ -192,11 +192,6 @@ export class GameMapPropertiesListener {
if (coWebsiteOpen.state === OpenCoWebsiteState.LOADING) {
coWebsiteOpen.state = OpenCoWebsiteState.MUST_BE_CLOSE;
return;
}
if (coWebsiteOpen.state !== OpenCoWebsiteState.OPENED) {
return;
}
if (coWebsiteOpen.coWebsite !== undefined) {