Merge branch 'master' into develop

Signed-off-by: Gregoire Parant <g.parant@thecodingmachine.com>
2021-09-21 02:37:56 +02:00 · 2021-09-21 02:37:56 +02:00 · 3f954d273c
parent 2fbf8f0a10 e77d4dda84
commit 3f954d273c
57 changed files with 3 additions and 3 deletions
--- a/front/dist/resources/logos/logo.png
+++ b/front/dist/resources/logos/logo.png
--- a/front/dist/resources/logos/tcm_full.png
+++ b/front/dist/resources/logos/tcm_full.png
--- a/front/dist/resources/logos/tcm_short.png
+++ b/front/dist/resources/logos/tcm_short.png
--- a/front/dist/static/images/Logo
+++ b/front/dist/static/images/Logo
--- a/front/dist/static/images/favicons/android-icon-144x144-white.png
+++ b/front/dist/static/images/favicons/android-icon-144x144-white.png
--- a/front/dist/static/images/favicons/android-icon-144x144.png
+++ b/front/dist/static/images/favicons/android-icon-144x144.png
--- a/front/dist/static/images/favicons/android-icon-192x192-white.png
+++ b/front/dist/static/images/favicons/android-icon-192x192-white.png
--- a/front/dist/static/images/favicons/android-icon-192x192.png
+++ b/front/dist/static/images/favicons/android-icon-192x192.png
--- a/front/dist/static/images/favicons/android-icon-36x36.-white.png
+++ b/front/dist/static/images/favicons/android-icon-36x36.-white.png
--- a/front/dist/static/images/favicons/android-icon-36x36.png
+++ b/front/dist/static/images/favicons/android-icon-36x36.png
--- a/front/dist/static/images/favicons/android-icon-48x48-white.png
+++ b/front/dist/static/images/favicons/android-icon-48x48-white.png
--- a/front/dist/static/images/favicons/android-icon-48x48.png
+++ b/front/dist/static/images/favicons/android-icon-48x48.png
--- a/front/dist/static/images/favicons/android-icon-72x72-white.png
+++ b/front/dist/static/images/favicons/android-icon-72x72-white.png
--- a/front/dist/static/images/favicons/android-icon-72x72.png
+++ b/front/dist/static/images/favicons/android-icon-72x72.png
--- a/front/dist/static/images/favicons/android-icon-96x96-white.png
+++ b/front/dist/static/images/favicons/android-icon-96x96-white.png
--- a/front/dist/static/images/favicons/android-icon-96x96.png
+++ b/front/dist/static/images/favicons/android-icon-96x96.png
--- a/front/dist/static/images/favicons/apple-icon-114x114-white.png
+++ b/front/dist/static/images/favicons/apple-icon-114x114-white.png
--- a/front/dist/static/images/favicons/apple-icon-114x114.png
+++ b/front/dist/static/images/favicons/apple-icon-114x114.png
--- a/front/dist/static/images/favicons/apple-icon-120x120-white.png
+++ b/front/dist/static/images/favicons/apple-icon-120x120-white.png
--- a/front/dist/static/images/favicons/apple-icon-120x120.png
+++ b/front/dist/static/images/favicons/apple-icon-120x120.png
--- a/front/dist/static/images/favicons/apple-icon-144x144-white.png
+++ b/front/dist/static/images/favicons/apple-icon-144x144-white.png
--- a/front/dist/static/images/favicons/apple-icon-144x144.png
+++ b/front/dist/static/images/favicons/apple-icon-144x144.png
--- a/front/dist/static/images/favicons/apple-icon-152x152-white.png
+++ b/front/dist/static/images/favicons/apple-icon-152x152-white.png
--- a/front/dist/static/images/favicons/apple-icon-152x152.png
+++ b/front/dist/static/images/favicons/apple-icon-152x152.png
--- a/front/dist/static/images/favicons/apple-icon-180x180-white.png
+++ b/front/dist/static/images/favicons/apple-icon-180x180-white.png
--- a/front/dist/static/images/favicons/apple-icon-180x180.png
+++ b/front/dist/static/images/favicons/apple-icon-180x180.png
--- a/front/dist/static/images/favicons/apple-icon-57x57-white.png
+++ b/front/dist/static/images/favicons/apple-icon-57x57-white.png
--- a/front/dist/static/images/favicons/apple-icon-57x57.png
+++ b/front/dist/static/images/favicons/apple-icon-57x57.png
--- a/front/dist/static/images/favicons/apple-icon-60x60-white.png
+++ b/front/dist/static/images/favicons/apple-icon-60x60-white.png
--- a/front/dist/static/images/favicons/apple-icon-60x60.png
+++ b/front/dist/static/images/favicons/apple-icon-60x60.png
--- a/front/dist/static/images/favicons/apple-icon-72x72-white.png
+++ b/front/dist/static/images/favicons/apple-icon-72x72-white.png
--- a/front/dist/static/images/favicons/apple-icon-72x72.png
+++ b/front/dist/static/images/favicons/apple-icon-72x72.png
--- a/front/dist/static/images/favicons/apple-icon-76x76-white.png
+++ b/front/dist/static/images/favicons/apple-icon-76x76-white.png
--- a/front/dist/static/images/favicons/apple-icon-76x76.png
+++ b/front/dist/static/images/favicons/apple-icon-76x76.png
--- a/front/dist/static/images/favicons/apple-icon-precomposed-white.png
+++ b/front/dist/static/images/favicons/apple-icon-precomposed-white.png
--- a/front/dist/static/images/favicons/apple-icon-precomposed.png
+++ b/front/dist/static/images/favicons/apple-icon-precomposed.png
--- a/front/dist/static/images/favicons/apple-icon-white.png
+++ b/front/dist/static/images/favicons/apple-icon-white.png
--- a/front/dist/static/images/favicons/apple-icon.png
+++ b/front/dist/static/images/favicons/apple-icon.png
--- a/front/dist/static/images/favicons/favicon-16x16-white.png
+++ b/front/dist/static/images/favicons/favicon-16x16-white.png
--- a/front/dist/static/images/favicons/favicon-16x16.png
+++ b/front/dist/static/images/favicons/favicon-16x16.png
--- a/front/dist/static/images/favicons/favicon-32x32-white.png
+++ b/front/dist/static/images/favicons/favicon-32x32-white.png
--- a/front/dist/static/images/favicons/favicon-32x32.png
+++ b/front/dist/static/images/favicons/favicon-32x32.png
--- a/front/dist/static/images/favicons/favicon-96x96-white.png
+++ b/front/dist/static/images/favicons/favicon-96x96-white.png
--- a/front/dist/static/images/favicons/favicon-96x96.png
+++ b/front/dist/static/images/favicons/favicon-96x96.png
--- a/front/dist/static/images/favicons/favicon.ico
+++ b/front/dist/static/images/favicons/favicon.ico
--- a/front/dist/static/images/favicons/icon-512x512-white.png
+++ b/front/dist/static/images/favicons/icon-512x512-white.png
--- a/front/dist/static/images/favicons/icon-512x512.png
+++ b/front/dist/static/images/favicons/icon-512x512.png
--- a/front/dist/static/images/favicons/manifest.json
+++ b/front/dist/static/images/favicons/manifest.json
@ -89,7 +89,7 @@
            "sizes": "192x192",
            "type": "image\/png",
            "density": "4.0",
-            "purpose": "any maskable"
+            "purpose": "any"
        },

        {
--- a/front/dist/static/images/favicons/ms-icon-144x144.png
+++ b/front/dist/static/images/favicons/ms-icon-144x144.png
--- a/front/dist/static/images/favicons/ms-icon-150x150.png
+++ b/front/dist/static/images/favicons/ms-icon-150x150.png
--- a/front/dist/static/images/favicons/ms-icon-310x310.png
+++ b/front/dist/static/images/favicons/ms-icon-310x310.png
--- a/front/dist/static/images/favicons/ms-icon-70x70.png
+++ b/front/dist/static/images/favicons/ms-icon-70x70.png
--- a/front/dist/static/images/logo-WA-min.png
+++ b/front/dist/static/images/logo-WA-min.png
--- a/front/dist/static/images/logo.png
+++ b/front/dist/static/images/logo.png
--- a/front/src/Components/images/logo-WA-min.png
+++ b/front/src/Components/images/logo-WA-min.png
--- a/front/src/Components/images/logo.png
+++ b/front/src/Components/images/logo.png
--- a/front/src/Phaser/Components/Loader.ts
+++ b/front/src/Phaser/Components/Loader.ts
@ -3,8 +3,8 @@ import { DirtyScene } from "../Game/DirtyScene";

 const LogoNameIndex: string = "logoLoading";
 const TextName: string = "Loading...";
-const LogoResource: string = "resources/logos/logo.png";
-const LogoFrame: ImageFrameConfig = { frameWidth: 307, frameHeight: 59 };
+const LogoResource: string = "static/images/logo.png";
+const LogoFrame: ImageFrameConfig = { frameWidth: 310, frameHeight: 60 };

 export const addLoader = (scene: Phaser.Scene): void => {
    // If there is nothing to load, do not display the loader.