Commit Graph

2660 Commits

Author SHA1 Message Date
kharhamel
79701fe227 FIX: fixed cleanup for real this time 2021-04-27 18:18:20 +02:00
Kharhamel
76a21cafa0
Merge pull request #954 from thecodingmachine/restrictCD
FIX: fixed cleanup workflow
2021-04-27 17:28:03 +02:00
kharhamel
3ce5c2ec45 FIX: fixed cleanup workflow 2021-04-27 17:17:54 +02:00
Kharhamel
c6ed2c5c57
Merge pull request #953 from thecodingmachine/restrictCD
FIX: fixed cleanup workflow
2021-04-27 17:03:45 +02:00
kharhamel
7a8765826e FIX: fixed cleanup workflow 2021-04-27 16:51:57 +02:00
jonny
6295c8275e reset menu items on map change 2021-04-27 16:40:56 +02:00
Kharhamel
c19201b636
Merge pull request #952 from thecodingmachine/restrictCD
edited CD domain in deeployer config
2021-04-27 16:37:37 +02:00
kharhamel
ea009d912e edited CD domain in deeployer config 2021-04-27 16:30:35 +02:00
Kharhamel
998e051a45
Merge pull request #940 from thecodingmachine/restrictCD
FIX: the deploy action now only start when the label 'deploy' is applied to the PR
2021-04-27 15:49:15 +02:00
jonny
4069e87872 replace menu items if already present 2021-04-27 12:40:29 +02:00
jonny
fafaabb6e7 script api can add menu commands
# Conflicts:
#	front/src/Api/IframeListener.ts
#	front/src/iframe_api.ts
2021-04-27 12:07:02 +02:00
jonny
79e530f0e6 launch jsons + type fixes 2021-04-27 00:04:08 +02:00
jonny
6e847b5f58 Merge branch 'develop' of https://github.com/thecodingmachine/workadventure into develop 2021-04-27 00:02:05 +02:00
kharhamel
30cf078df5 FIX: the deploy action now only start when the label 'deploy' is applied to the PR 2021-04-26 18:33:03 +02:00
grégoire parant
4e09246c7f
Merge pull request #939 from thecodingmachine/develop
Release 26/04/2021
2021-04-26 13:42:27 +02:00
David Négrier
ca628d9a90
Merge pull request #901 from thecodingmachine/text_display
Adding the ability to display "Text" objects from Tiled
2021-04-26 11:30:34 +02:00
David Négrier
08ca95b143 Fixing WorkWrap 2021-04-26 11:28:15 +02:00
David Négrier
22cb41dc29 Adding the ability to display "Text" objects from Tiled
I honestly don't believe text objects look good on map, and in real maps, I think text should be written on tiles.

However, for a variety of use cases (like in test maps in the /maps/test directory, it can be useful to be
able to display some text easily on a map.

This PR adds the ability to display this text.

Note: the "font" support cannot work correctly, as Tiled is listing fonts from the local
system, and those fonts are not available in a browser.
2021-04-26 11:28:13 +02:00
David Négrier
e37ab7d8ad
Merge pull request #899 from thecodingmachine/Lurkars/map-group-layer-support
Map group layer support (2)
2021-04-26 11:26:21 +02:00
David Négrier
6e5fa2c514 Initiating CHANGELOG file 2021-04-26 11:21:36 +02:00
David Négrier
6815fe7a0a Added a new LayersIterator class
This class iterates recursively over layers, flattening groups.
This enables us to simplify the code when we iterate layers. We can remove all recursive function calls in the GameScene code (it is delegated to the LayersIterator)
2021-04-26 11:21:34 +02:00
Lurkars
66b90be0da remove redundancy 2021-04-26 11:20:28 +02:00
Lurkars
93b7b7bc91 removed redundancy, fix for startLayer 2021-04-26 11:20:28 +02:00
Lurkars
9b6be3466b support for group layer of Tiled (excludes 'start' layer) 2021-04-26 11:20:28 +02:00
grégoire parant
f0d277af32
Nickname not centered in video-container (#935)
* Nickname not centered in video-container

#823
2021-04-24 15:45:58 +02:00
Gregoire Parant
364c1d3e98 Merge branch 'master' into develop 2021-04-24 10:39:49 +02:00
grégoire parant
61c8830e24
Merge pull request #934 from thecodingmachine/HotFixStyleMessgae
HotFix Fix style message displaying
2021-04-24 10:37:33 +02:00
Gregoire Parant
0c72378001 Fix style message displaying
#926
2021-04-24 10:36:53 +02:00
grégoire parant
d9620c373f
Merge pull request #918 from thecodingmachine/newStartMobileScene
Mobile started scene
2021-04-23 19:51:45 +02:00
Gregoire Parant
b934d3404f Fix feedback WorkAdventure team 2021-04-23 19:29:43 +02:00
DESKTOP-FMM8UI0\CLV
b79d76fc2e parameter soundConfig is now optionnal
if user call mySound.play() the sound will be played with the base SoundConfig
2021-04-23 17:03:17 +02:00
DESKTOP-FMM8UI0\CLV
f8bab9ce6b Map Village with all the tilesSets 2021-04-23 15:39:45 +02:00
DESKTOP-FMM8UI0\CLV
f03f8076f3 Sound in Script Done
Fom script user can load, play and stop sound
2021-04-23 15:35:34 +02:00
David Négrier
4f4f499d47 Making alone mode more robust
This fixes a number of issues where the game was attempting to access a non existing connection (in alone mode)
2021-04-23 13:44:04 +02:00
Gregoire Parant
f11e936143 Refactoring & fix feedback WorkAdventure 2021-04-23 03:59:14 +02:00
Gregoire Parant
8e52b8597c Merge branch 'develop' into newStartMobileScene
# Conflicts:
#	front/src/Phaser/Login/EnableCameraScene.ts
#	front/src/Phaser/Login/LoginScene.ts
#	front/src/Phaser/Login/SelectCharacterScene.ts
#	front/src/Phaser/Login/SelectCompanionScene.ts
2021-04-22 23:36:21 +02:00
Gregoire Parant
d7f00b505a Update Companion Scene for mobile 2021-04-22 13:10:23 +02:00
Gregoire Parant
3697ddabfa Fix responsive Camera Settings 2021-04-22 11:47:59 +02:00
Gregoire Parant
3df32de83b Update camera and adapte for mobile 2021-04-22 11:26:35 +02:00
Kharhamel
1251cbdc76
Merge pull request #925 from thecodingmachine/touchZones
FIX: use phaser Zones instead of rectangles objects to create tap zones
2021-04-22 10:28:28 +02:00
Gregoire Parant
0a04f5d631 Finish select character scene and custom character scene 2021-04-22 02:29:13 +02:00
kharhamel
c8ba3d8ab9 FIX: use phaser Zones instead of rectangles objects to create tap zones 2021-04-21 18:27:33 +02:00
kharhamel
6a2326c4b3 WIP: testing new resolution config 2021-04-21 18:04:00 +02:00
DESKTOP-FMM8UI0\CLV
517c0e86cb Can play Sound from a map script
add sound in the TutoMap
2021-04-21 16:47:19 +02:00
jonny
3836d5037c game state can be read out by the client APIs
# Conflicts:
#	front/src/Api/IframeListener.ts
#	front/src/Phaser/Game/GameScene.ts
#	front/src/iframe_api.ts
2021-04-21 15:56:52 +02:00
jonny
006195e8cc rewrote to run in event loop 2021-04-21 11:54:37 +02:00
jonny
6c6789411a added loadPage Api call 2021-04-21 11:20:17 +02:00
David Négrier
f9f6abe7b3 Switching setTimeout to false 2021-04-21 10:37:20 +02:00
David Négrier
84bd5eff50 Bump Phaser version
This reverts commit f2c3d6f158.
Also, updates all dependencies to their latest allowed version.

# Conflicts:
#	front/package.json
#	front/yarn.lock
2021-04-21 10:35:38 +02:00
Gregoire Parant
78d888ffaf Update menu mobile
- Add mobile style share modal
- Add mobile style settings modal
- Add menu mobile style
2021-04-21 00:53:45 +02:00