Commit Graph

42 Commits

Author SHA1 Message Date
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
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
David Négrier 36d73333f5 Adding exitUrl property
The exitUrl property can be applied on a layer to link to any kind of room (private or public)
2020-10-15 15:50:51 +02:00
David Négrier 3a9196fb82 Merge 2020-09-16 11:41:03 +02:00
David Négrier 513244ae1f Enabling header module on Apache maps container 2020-07-23 19:04:33 +02:00
David Négrier 2484e4f1df Moving maps to their own container 2020-07-23 18:43:51 +02:00
David Négrier ed146226cf Adding Outline capabilities and a ActionableItem notion. 2020-07-23 18:09:24 +02:00
David Négrier f7466994c5 Playing with pipeline to display outline 2020-07-15 23:44:01 +02:00