Commit Graph

56 Commits

Author SHA1 Message Date
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
Gregoire Parant
beb53df364 Error problem open new map 2021-01-25 13:18:57 +01:00
Gregoire Parant
5954ded195 Update link for private TCM map 2021-01-18 16:25:44 +01:00
Piotr Dobrowolski
33b9bd773f *: Dockerfiles cleanup, docker-compose.prod.yaml
New docker-compose.prod.yaml should provide a production-ish deployment
of WorkAdventure
2021-01-12 22:32:37 +01:00
Gregoire Parant
01c430dfdb Start layer TCM 2020-12-18 12:45:50 +01:00
Gregoire Parant
4f4e7e3d7d Change layer tcm-start => start-tcm 2020-12-17 23:47:17 +01:00
Gregoire Parant
ed8232b0f5 Fix style menu 2020-12-17 21:58:18 +01:00
DESKTOP-V1PKLGR\npegu
b1f1942807 Fix some issues on map 2020-12-11 09:04:09 +01:00
DESKTOP-V1PKLGR\npegu
132617bbd0 Add floor2 and update floor0 and floor1 #3 2020-12-10 22:58:30 +01:00
DESKTOP-V1PKLGR\npegu
6e6c103a8d Add floor2 and update floor0 and floor1 #2 2020-12-10 22:44:50 +01:00
DESKTOP-V1PKLGR\npegu
0d530e18ce Add floor2 and update floor0 and floor1 2020-12-10 19:51:35 +01:00
DESKTOP-V1PKLGR\npegu
eabd1d1b2f Change stairs for floor 0 2020-12-10 08:59:13 +01:00
DESKTOP-V1PKLGR\npegu
958ec51b12 Change map floor 1 Fixes 2020-12-09 23:50:30 +01:00
DESKTOP-V1PKLGR\npegu
7d62d64e17 Change map floor 1 2020-12-09 23:20:13 +01:00
DESKTOP-V1PKLGR\npegu
87519a1ad3 Add Xmas decorations #2 2020-12-09 18:04:52 +01:00
DESKTOP-V1PKLGR\npegu
add584f9a0 Add Wmas decorations 2020-12-08 19:52:27 +01:00
DESKTOP-V1PKLGR\npegu
a7a5990479 Change the information page at the entrance and add inscriptions on the floor 2020-12-07 19:22:25 +01:00
DESKTOP-V1PKLGR\npegu
c897bd192d Fix exit_lyon URL 2020-12-07 14:15:07 +01:00
DESKTOP-V1PKLGR\npegu
da17da9613 Fix some details on collides 2020-12-07 09:19:31 +01:00
DESKTOP-V1PKLGR\npegu
0a415248c0 Change the TCM map to create a new style with more quality 2020-12-07 01:07:46 +01:00
kharhamel
540f69267b FIX: maps/dist directory is now gitignored 2020-11-24 14:43:21 +01:00
Gregoire Parant
b1410b915c Add 'onaction' JitsiTrigger on Jitsi space floor0 2020-11-23 20:44:16 +01:00
Gregoire Parant
3aaeda6f80 Merge branch 'develop' into action-button
# Conflicts:
#	front/dist/resources/style/style.css
#	front/src/Phaser/Game/GameScene.ts
2020-11-21 15:40:24 +01:00
Gregoire Parant
c956e27bc8 Add tenue sg 2020-11-18 16:55:58 +01:00
Gregoire Parant
968787555f Update feedback @moufmouf 2020-11-04 13:33:58 +01:00
David Négrier
78a4bf3189 Adding custom character textures 2020-10-20 17:42:36 +02:00