_Bastler/partey_workadventure
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Piotr 'pwh' Hanusiak 2022-04-04 14:20:48 +02:00
commit 92460eac44
5 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
back/src/Model/PositionNotifier.ts
View File

@ -45,8 +45,8 @@ export class PositionNotifier {
private zones: Zone[][] = []; private zones: Zone[][] = [];
constructor( constructor(
private zoneWidth: number, private readonly zoneWidth: number,
private zoneHeight: number, private readonly zoneHeight: number,
private onUserEnters: EntersCallback, private onUserEnters: EntersCallback,
private onUserMoves: MovesCallback, private onUserMoves: MovesCallback,
private onUserLeaves: LeavesCallback, private onUserLeaves: LeavesCallback,

2
front/package.json
View File

@ -4,7 +4,7 @@
"main": "index.js", "main": "index.js",
"license": "SEE LICENSE IN LICENSE.txt", "license": "SEE LICENSE IN LICENSE.txt",
"devDependencies": { "devDependencies": {
"@geprog/vite-plugin-env-config": "^4.0.0", "@geprog/vite-plugin-env-config": "^4.0.3",
"@home-based-studio/phaser3-utils": "^0.4.2", "@home-based-studio/phaser3-utils": "^0.4.2",
"@sveltejs/vite-plugin-svelte": "^1.0.0-next.36", "@sveltejs/vite-plugin-svelte": "^1.0.0-next.36",
"@tsconfig/svelte": "^1.0.10", "@tsconfig/svelte": "^1.0.10",

1
front/public/resources/logos/report.svg Normal file
View File

File diff suppressed because one or more lines are too long
Side by Side

After

Width:  |  Height:  |  Size: 6.1 KiB

4
front/src/Phaser/Login/EntryScene.ts
View File

@ -9,7 +9,6 @@ import { get } from "svelte/store";
import { localeDetector } from "../../i18n/locales"; import { localeDetector } from "../../i18n/locales";
import { PlayerTextures } from "../Entity/PlayerTextures"; import { PlayerTextures } from "../Entity/PlayerTextures";
import { PUSHER_URL } from "../../Enum/EnvironmentVariable"; import { PUSHER_URL } from "../../Enum/EnvironmentVariable";
import { CustomizeSceneName } from "./CustomizeScene";
export const EntrySceneName = "EntryScene"; export const EntrySceneName = "EntryScene";
@ -47,8 +46,7 @@ export class EntryScene extends Scene {
// Let's rescale before starting the game // Let's rescale before starting the game
// We can do it at this stage. // We can do it at this stage.
waScaleManager.applyNewSize(); waScaleManager.applyNewSize();
// this.scene.start(nextSceneName); this.scene.start(nextSceneName);
this.scene.start(CustomizeSceneName);
}) })
.catch((err) => { .catch((err) => {
const $LL = get(LL); const $LL = get(LL);

8
front/yarn.lock
View File

@ -72,10 +72,10 @@
dependencies: dependencies:
"@fortawesome/fontawesome-common-types" "^0.2.35" "@fortawesome/fontawesome-common-types" "^0.2.35"
"@geprog/vite-plugin-env-config@^4.0.0": "@geprog/vite-plugin-env-config@^4.0.3":
version "4.0.0" version "4.0.3"
resolved "https://registry.yarnpkg.com/@geprog/vite-plugin-env-config/-/vite-plugin-env-config-4.0.0.tgz#989d95f23fbab5eae7c4c96d04a18abdc289b81e" resolved "https://registry.yarnpkg.com/@geprog/vite-plugin-env-config/-/vite-plugin-env-config-4.0.3.tgz#ca04bd9ad9f55fe568917db79266afe8e766e25e"
integrity sha512-25ZMNdpssqkyv1sxfa6gBhmL8yCxCqjRRc1c05GJfhPkqD6Cn9dnG6xnHHHfJaEqrDFCViD0Bcnr+tgs76OZ2Q== integrity sha512-2HDCV+6XXJjSuBAhDWLRr111buMQ3bIZrKo3dymIhEJ4oJCC/3yDqg7HDQIn8Y8KKbsM0AtuHMZW4yz2tPBsYg==
"@home-based-studio/phaser3-utils@^0.4.2": "@home-based-studio/phaser3-utils@^0.4.2":
version "0.4.2" version "0.4.2"