Commit Graph

81 Commits

Author SHA1 Message Date
David Négrier
d80681c40b
Merge branch 'develop' into FTUEPopup 2021-04-09 17:40:26 +02:00
DESKTOP-FMM8UI0\CLV
8720354c87 exit Url changed : tcm/workadventure/floor0 2021-04-09 16:39:37 +02:00
DESKTOP-FMM8UI0\CLV
2c84d9a07d position of popups changed
clear log in gameScene
2021-04-09 16:34:01 +02:00
DESKTOP-FMM8UI0\CLV
d52c983ab9 Merge branch 'FTUEPopup' of https://github.com/ClementVieilly75/workadventure into FTUEPopup 2021-04-09 14:35:20 +02:00
DESKTOP-FMM8UI0\CLV
46cc7b3b3b add pannels 2021-04-09 14:35:15 +02:00
David Négrier
fb6a529e4a
Merge pull request #879 from ClementVieilly75/FTUEPopup
map village + popUp go to page
2021-04-08 12:02:50 +02:00
David Négrier
34e89fa63e
Update maps/Village/scriptMapVillage.js 2021-04-08 12:02:14 +02:00
DESKTOP-FMM8UI0\CLV
0f4034854c Add closePopup function 2021-04-08 10:50:41 +02:00
DESKTOP-FMM8UI0\CLV
eb66ab3fdd Supp arrow white 2021-04-08 10:17:52 +02:00
DESKTOP-FMM8UI0\CLV
af69510bc8 Modif popup positions and add arrow 2021-04-08 09:41:53 +02:00
DESKTOP-FMM8UI0\CLV
39074511a4 map village + popUp go to page 2021-04-07 13:06:30 +02:00
David Négrier
3ef1f0dc7b [Breaking change] UPLOADER_URL and ADMIN_URL are now true URLs (and not only host name) and API_URL is replaced by PUSHER_URL
API_URL is still accepted for BC compatibility of the self-hosted deployments.

This will allow deploying on a single domain, using a reverse proxy that acts on the path.
This however means that the config needs to be changed for all WorkAdventure deployments.
2021-03-31 16:00:14 +02:00
David Négrier
ccb80317ee Changing exit URL of Tuto map 2021-03-28 17:33:10 +02:00
David Négrier
aaaa192b71 Merge branch 'develop' of github.com:thecodingmachine/workadventure into iframe_api
# Conflicts:
#	front/dist/.gitignore
#	front/dist/index.tmpl.html
#	front/src/Phaser/Game/GameScene.ts
#	front/src/WebRtc/CoWebsiteManager.ts
2021-03-28 16:53:15 +02:00
David Négrier
98aa94bb12 Minor changes 2021-03-28 16:36:02 +02:00
DESKTOP-FMM8UI0\CLV
8764fe5de5 Popup openWebSite
Add possibility to open a website with a popup
3 cases :
Open page
GoTo Page
OpenCoWebsite
2021-03-25 17:12:53 +01:00
DESKTOP-FMM8UI0\CLV
7140637807 Map tuto version 3 by Jack O 2021-03-25 09:06:41 +01:00
DESKTOP-FMM8UI0\CLV
cb1459de96 remove exitUrl 2021-03-24 11:00:24 +01:00
DESKTOP-FMM8UI0\CLV
7c7916df60 remove useless files and clean code in ScriptTuto.js 2021-03-24 10:58:30 +01:00
DESKTOP-FMM8UI0\CLV
77e768e5f7 Add map Tuto v2 and scriptTuto.js 2021-03-23 16:00:24 +01:00
DESKTOP-FMM8UI0\CLV
f437b6057c subProject maps/Tuto 2021-03-23 15:58:32 +01:00
DESKTOP-FMM8UI0\CLV
3ef3561b57 no message 2021-03-22 16:10:21 +01:00
DESKTOP-FMM8UI0\CLV
0ffbf8b4b7 Add Final popup to notify that the tuto is finished, some CSS on the popups and clean code 2021-03-22 16:09:04 +01:00
David Négrier
ffb5823b2a Adding the ability to specify a custom Jitsi URL directly in the map
This feature allows to add a "jitsiUrl" property in the map.
As a result, you can use for a given Jitsi room a custom instance of Jitsi.
Using "jitsiUrl" will only work with public Jitsi instances (authentication is not supported when "jitsiUrl" property is provided)

The Jitsi external_api.js script is now lazily loaded.
2021-03-16 20:37:12 +01:00
DESKTOP-FMM8UI0\CLV
c5c8770a60 Add First Version of Tuto
PopUp
Player Control disable
Fake bubble displayed
2021-03-12 16:39:29 +01:00
DESKTOP-FMM8UI0\CLV
6c21a31004 Update Map Tuto 2021-03-11 15:17:53 +01:00
DESKTOP-FMM8UI0\CLV
6441fa71d3 Adding placeHolder Popup tuto to Map2
need to cut player controller and simulate bobble
2021-03-11 10:58:48 +01:00
DESKTOP-FMM8UI0\CLV
f9f618094d adding error log if name of square in Tile not matching with the param targetObject of OpenPopup in script.js 2021-03-10 17:22:39 +01:00
DESKTOP-FMM8UI0\CLV
8d0411e8a3 can manage position and width/height of a popUp using a square in Tiled 2021-03-10 09:23:45 +01:00
DESKTOP-FMM8UI0\CLV
5e4940dba6 Merge branch 'iframe_api' of https://github.com/thecodingmachine/workadventure into FTUEPopup
* 'iframe_api' of https://github.com/thecodingmachine/workadventure:
  Removing closeOnClick as it is not implemented
  Adding a Popup object with a close() method on it.
2021-03-10 09:00:47 +01:00
DESKTOP-FMM8UI0\CLV
f7f8be24bc Set Position of the popUp with pos of an object in floorLayer object group 2021-03-10 08:57:49 +01:00
David Négrier
7fddcc28f1 Removing closeOnClick as it is not implemented 2021-03-09 18:57:25 +01:00
David Négrier
bb8b222c22 Adding a Popup object with a close() method on it. 2021-03-09 18:51:30 +01:00
DESKTOP-FMM8UI0\CLV
d29e0819f4 Get position of an object in Tile to set popUp Position 2021-03-09 17:07:14 +01:00
David Négrier
1e002f93ed Implementation of openPopup script method (WIP) 2021-03-09 16:21:14 +01:00
David Négrier
2bef328d8a Adding the abaility to track users entering/leaving a zone in the script language. 2021-03-08 18:58:38 +01:00
David Négrier
6fbf165c91 Adding the ability to register a single script using the "script" attribute at the map property level. 2021-03-07 21:02:38 +01:00
David Négrier
7d67f55012 Improving security: only iframes opened with "openWebsiteAllowApi" property are now able to send/receive messages. 2021-03-06 16:00:07 +01:00
David Négrier
e927e0fa16 Adding ability to listen to user types chat messages using WA.onChatMessage 2021-03-06 15:26:07 +01:00
David Négrier
eb93a04341 Adding an API for inter-iframe communication
Adds a first version of an API to communicate between an iFrame opened by WorkAdventure and WorkAdventure itself.
The first API method is a method allowing to add messages in the chat, from the iFrame.

Comes with a test file.
2021-03-04 19:00:00 +01:00
grégoire parant
3a1b2490ef
Merge pull request #758 from thecodingmachine/jitsiConfig
Jitsi config
2021-02-18 10:12:16 +01:00
Gregoire Parant
80449e9a96 Change json map test 2021-02-18 10:00:13 +01:00
grégoire parant
13078489c6
Merge pull request #757 from thecodingmachine/jitsiConfig
Merge Jitsi config
2021-02-17 20:34:31 +01:00
Gregoire Parant
83fc7d0cc0 Merge branch 'develop' into exitTriggerAction
# Conflicts:
#	front/src/Phaser/Game/GameScene.ts
2021-02-17 19:28:41 +01:00
Gregoire Parant
baae1e8125 Update to restore previous config 2021-02-17 19:21:37 +01:00
David Négrier
e07efbdf28
Merge pull request #698 from thecodingmachine/fix/deploy-cleanup
Adding docker-compose.prod.yaml to ease deployment
2021-02-16 10:35:18 +01:00
David Négrier
91fddd6893 Slugifies the Jitsi room name
This will avoid Jitsi breaking on unexpected characters and displaying a HTTP 404 error.
2021-02-10 13:51:17 +01:00
David Négrier
f6e93da48a Fixing loading logo being displayed when nothing was loaded 2021-02-10 12:08:16 +01:00
David Négrier
f8b5ca04e5 Adding a test map for Jitsi meet special properties 2021-02-10 11:09:22 +01:00
David Négrier
686427f6fe Merge branch 'develop' of github.com:thecodingmachine/workadventure into fix/deploy-cleanup
# Conflicts:
#	front/Dockerfile
2021-02-01 14:00:07 +01:00