diff --git a/deeployer.libsonnet b/deeployer.libsonnet index 494c72b8..a2e8970a 100644 --- a/deeployer.libsonnet +++ b/deeployer.libsonnet @@ -101,6 +101,7 @@ }, "redis": { "image": "redis:6", + "ports": [6379] } }, "config": { diff --git a/docs/maps/animations.md b/docs/maps/animations.md index 276f2332..6ac69e0c 100644 --- a/docs/maps/animations.md +++ b/docs/maps/animations.md @@ -7,14 +7,14 @@ not overwrite existing ones) and click on the animation editor:
- +
You can now add all tiles that should be part of the animation via drag and drop to the "playlist" and adjust the frame duration:
- +
The tile animation editor
@@ -24,7 +24,7 @@ You can preview animations directly in Tiled, using the "Show tile animations" o
- +
The Show Tile Animations option
diff --git a/docs/maps/api-room.md b/docs/maps/api-room.md index 96b62fd2..d1a26d2f 100644 --- a/docs/maps/api-room.md +++ b/docs/maps/api-room.md @@ -7,7 +7,7 @@ If you use group layers in your map, to reference a layer in a group you will ne Example :
- +
@@ -28,7 +28,7 @@ Listens to the position of the current user. The event is triggered when the use
- +
The `zone` property, applied on a layer
@@ -140,7 +140,7 @@ Replace the tile at the `x` and `y` coordinates in the layer named `layer` by th If `tile` is a string, it's not the id of the tile but the value of the property `name`.
- +
diff --git a/docs/maps/api-state.md b/docs/maps/api-state.md index 87a8b3aa..634b47e1 100644 --- a/docs/maps/api-state.md +++ b/docs/maps/api-state.md @@ -70,7 +70,7 @@ Each object will represent a variable.
- +
diff --git a/docs/maps/api-ui.md b/docs/maps/api-ui.md index 89d46932..e4b9425d 100644 --- a/docs/maps/api-ui.md +++ b/docs/maps/api-ui.md @@ -9,10 +9,10 @@ You can position this popup by using a "rectangle" object in Tiled that you will
- +
- +
@@ -85,7 +85,7 @@ WA.ui.registerMenuCommand("test", () => { ```
- +
@@ -103,7 +103,7 @@ WA.ui.displayActionMessage({ Displays a message at the bottom of the screen (that will disappear when space bar is pressed).
- +
Example: diff --git a/docs/maps/images/anims/animation_editor.png b/docs/maps/images/anims/animation_editor.png new file mode 100644 index 00000000..92d00aa7 Binary files /dev/null and b/docs/maps/images/anims/animation_editor.png differ diff --git a/docs/maps/images/anims/camera.png b/docs/maps/images/anims/camera.png new file mode 100644 index 00000000..c96d0b52 Binary files /dev/null and b/docs/maps/images/anims/camera.png differ diff --git a/docs/maps/images/anims/settings_show_animations.png b/docs/maps/images/anims/settings_show_animations.png new file mode 100644 index 00000000..bf45e116 Binary files /dev/null and b/docs/maps/images/anims/settings_show_animations.png differ diff --git a/docs/maps/images/collides-1.png b/docs/maps/images/collides-1.png new file mode 100644 index 00000000..54582d05 Binary files /dev/null and b/docs/maps/images/collides-1.png differ diff --git a/docs/maps/images/collides-2.png b/docs/maps/images/collides-2.png new file mode 100644 index 00000000..a34b18dc Binary files /dev/null and b/docs/maps/images/collides-2.png differ diff --git a/docs/maps/images/collides-3.png b/docs/maps/images/collides-3.png new file mode 100644 index 00000000..e775e396 Binary files /dev/null and b/docs/maps/images/collides-3.png differ diff --git a/docs/maps/images/collides-4.png b/docs/maps/images/collides-4.png new file mode 100644 index 00000000..024e1b86 Binary files /dev/null and b/docs/maps/images/collides-4.png differ diff --git a/docs/maps/images/groupLayer.png b/docs/maps/images/groupLayer.png new file mode 100644 index 00000000..83e3cdd5 Binary files /dev/null and b/docs/maps/images/groupLayer.png differ diff --git a/docs/maps/images/menu-command.png b/docs/maps/images/menu-command.png new file mode 100644 index 00000000..0caf75c9 Binary files /dev/null and b/docs/maps/images/menu-command.png differ diff --git a/docs/maps/images/nameIndexProperty.png b/docs/maps/images/nameIndexProperty.png new file mode 100644 index 00000000..f434c659 Binary files /dev/null and b/docs/maps/images/nameIndexProperty.png differ diff --git a/docs/maps/images/object_variable.png b/docs/maps/images/object_variable.png new file mode 100644 index 00000000..434f6191 Binary files /dev/null and b/docs/maps/images/object_variable.png differ diff --git a/docs/maps/images/open_website_allow_api.png b/docs/maps/images/open_website_allow_api.png new file mode 100644 index 00000000..1289611b Binary files /dev/null and b/docs/maps/images/open_website_allow_api.png differ diff --git a/docs/maps/images/screen_popup_in_game.png b/docs/maps/images/screen_popup_in_game.png new file mode 100644 index 00000000..6378bec1 Binary files /dev/null and b/docs/maps/images/screen_popup_in_game.png differ diff --git a/docs/maps/images/screen_popup_tiled.png b/docs/maps/images/screen_popup_tiled.png new file mode 100644 index 00000000..66a42f8f Binary files /dev/null and b/docs/maps/images/screen_popup_tiled.png differ diff --git a/docs/maps/images/script_property.png b/docs/maps/images/script_property.png new file mode 100644 index 00000000..a374ff11 Binary files /dev/null and b/docs/maps/images/script_property.png differ diff --git a/docs/maps/images/text-object.png b/docs/maps/images/text-object.png new file mode 100644 index 00000000..7e5b3da7 Binary files /dev/null and b/docs/maps/images/text-object.png differ diff --git a/docs/maps/images/tiled_screenshot_1.png b/docs/maps/images/tiled_screenshot_1.png new file mode 100644 index 00000000..108dfed8 Binary files /dev/null and b/docs/maps/images/tiled_screenshot_1.png differ diff --git a/docs/maps/images/trigger_event.png b/docs/maps/images/trigger_event.png new file mode 100644 index 00000000..b695476a Binary files /dev/null and b/docs/maps/images/trigger_event.png differ diff --git a/docs/maps/images/trigger_message.png b/docs/maps/images/trigger_message.png new file mode 100644 index 00000000..a116294b Binary files /dev/null and b/docs/maps/images/trigger_message.png differ diff --git a/docs/maps/images/website_allowapi_property.png b/docs/maps/images/website_allowapi_property.png new file mode 100644 index 00000000..25e4df66 Binary files /dev/null and b/docs/maps/images/website_allowapi_property.png differ diff --git a/docs/maps/images/website_url_property.png b/docs/maps/images/website_url_property.png new file mode 100644 index 00000000..331135b8 Binary files /dev/null and b/docs/maps/images/website_url_property.png differ diff --git a/docs/maps/scripting.md b/docs/maps/scripting.md index 5be57ee1..8b11fe74 100644 --- a/docs/maps/scripting.md +++ b/docs/maps/scripting.md @@ -46,7 +46,7 @@ You can put relative URLs. If your script file is next to your map, you can simp
- +
The script property
@@ -72,7 +72,7 @@ In order to allow communication with WorkAdventure, you need to add an additiona
- +
The `openWebsiteAllowApi` property
diff --git a/docs/maps/text.md b/docs/maps/text.md index df3b2660..c9ee647a 100644 --- a/docs/maps/text.md +++ b/docs/maps/text.md @@ -29,7 +29,7 @@ font that has support for a variety of accents. It renders great when used at *8
- +
The "font-family" property
diff --git a/docs/maps/wa-maps.md b/docs/maps/wa-maps.md index 0eb94dbf..bdaf8a42 100644 --- a/docs/maps/wa-maps.md +++ b/docs/maps/wa-maps.md @@ -49,7 +49,7 @@ A few things to notice:
- +
"floorLayer" is compulsory
@@ -62,21 +62,21 @@ To make a tile "collidable", you should: 1. select the relevant tileset and switch to "edit" mode: - ![](https://workadventu.re/img/docs/collides-1.png){.document-img} + ![](images/collides-1.png){.document-img} 2. right click on a tile of the tileset to select it: - ![](https://workadventu.re/img/docs/collides-2.png){.document-img} + ![](images/collides-2.png){.document-img} 3. on the left pane in the custom properties section, right click and select "Add properties": - ![](https://workadventu.re/img/docs/collides-3.png){.document-img} + ![](images/collides-3.png){.document-img} Please add a `collides` property. The type of the property must be **bool**. 4. finally, check the checkbox for the `collides` property: - ![](https://workadventu.re/img/docs/collides-4.png){.document-img} + ![](images/collides-4.png){.document-img} Repeat for every tile that should be "collidable". diff --git a/docs/maps/website-in-map.md b/docs/maps/website-in-map.md index 7c7f8025..d7f6a653 100644 --- a/docs/maps/website-in-map.md +++ b/docs/maps/website-in-map.md @@ -11,7 +11,7 @@ To do this in Tiled:
- +
A "website" object
@@ -34,7 +34,7 @@ to explicitly allow it, by setting an additional `allowApi` property to `true`.
- +
A "website" object that can communicate using the Iframe API
diff --git a/front/dist/service-worker-prod.js b/front/dist/service-worker-prod.js index 919b0b91..80486623 100644 --- a/front/dist/service-worker-prod.js +++ b/front/dist/service-worker-prod.js @@ -1,4 +1,4 @@ -let CACHE_NAME = 'workavdenture-cache-v1.4.14'; +let CACHE_NAME = 'workavdenture-cache'; let urlsToCache = [ '/' ]; @@ -14,7 +14,8 @@ self.addEventListener('install', function(event) { }); self.addEventListener('fetch', function(event) { - event.respondWith( + //TODO mamnage fetch data and cache management + /*event.respondWith( caches.match(event.request) .then(function(response) { // Cache hit - return response @@ -44,7 +45,7 @@ self.addEventListener('fetch', function(event) { } ); }) - ); + );*/ }); self.addEventListener('wait', function(event) { diff --git a/front/src/Connexion/LocalUserStore.ts b/front/src/Connexion/LocalUserStore.ts index 25b673ac..8c17ed3f 100644 --- a/front/src/Connexion/LocalUserStore.ts +++ b/front/src/Connexion/LocalUserStore.ts @@ -17,7 +17,7 @@ const authToken = "authToken"; const state = "state"; const nonce = "nonce"; -const cacheAPIIndex = "workavdenture-cache-v1"; +const cacheAPIIndex = "workavdenture-cache"; class LocalUserStore { saveUser(localUser: LocalUser) {