Commit Graph

1556 Commits

Author SHA1 Message Date
Gregoire Parant 803be36def Merge branch 'develop' into customCharacterLadyLoading 2021-01-26 09:02:17 +01:00
Gregoire Parant c6903cc4c5 Use Error scene and add banned message 2021-01-26 08:57:10 +01:00
David Négrier 6432d2459b
Merge pull request #659 from thecodingmachine/develop
Deploy 2020-01-25
2021-01-25 22:55:12 +01:00
David Négrier ab0fe63cb2 Adding start room url to develop env 2021-01-25 22:42:44 +01:00
Thomas Basler bace2c6281 Merge remote-tracking branch 'upstream/develop' into develop 2021-01-25 19:39:28 +01:00
David Négrier a4cb39eef3
Merge pull request #653 from thecodingmachine/maccrash
Add a parameter to allow changing phaser renderer
2021-01-25 16:52:15 +01:00
Gregoire Parant 8de05c39c1 Lock user when he was banned 2021-01-25 14:10:16 +01:00
Gregoire Parant beb53df364 Error problem open new map 2021-01-25 13:18:57 +01:00
Gregoire Parant 5f88a1a0b9 Exit trigger action
- [x] Add trigger message custom
- [x] Add trigger for exit map
- [x] Update documentation
2021-01-25 12:21:40 +01:00
David Négrier c2c8680dae Fix linting 2021-01-25 12:02:00 +01:00
David Négrier 8609cda0d0 Add a parameter to allow changing phaser renderer
Recently, some Macs have been crashing running WorkAdventure.
Hard to say if this is related to Phaser 3.50 upgrade or to the new MacOS version.

It happens mostly on Mac Air and might be related to WebGL rendering.

This commit allows to switch to CANVAS renderer by adding `?phaserMode=canvas` in the URL
2021-01-25 11:18:48 +01:00
Kharhamel 18fb508828
Merge pull request #639 from thecodingmachine/betterLink
changed the color of the chat links and unit test
2021-01-25 10:42:32 +01:00
Kharhamel 39194b5531
Merge pull request #642 from tabascoeye/patch-1
cleanup when closing the scene
2021-01-25 10:35:01 +01:00
Kharhamel d32fca9777
Merge pull request #597 from psy/feature_streams
add remote files and streams to playAudio
2021-01-25 10:33:43 +01:00
Gregoire Parant 232ac6d5d1 Error lazy loading
Update loader custom characters
2021-01-24 18:00:30 +01:00
Gregoire Parant 0133609770 clean 2021-01-24 16:06:52 +01:00
Gregoire Parant 75d8d46c62 clean 2021-01-24 16:02:10 +01:00
Gregoire Parant d93a8da828 Fix custom character lazy loading 2021-01-24 15:57:47 +01:00
TabascoEye 39b433eef5
Update GameScene.ts
stop all the map specific stuff (Jitsi, coWebsite, Audio) when leaving the scene
Fixes #633
2021-01-23 01:16:13 +01:00
kharhamel 4ad7f4d5a3 changed the color of the chat links and unit test 2021-01-22 15:06:41 +01:00
David Négrier 3d84a9c8cd Turning French 'Moi' into English 'Me' 2021-01-21 10:16:08 +01:00
David Négrier de7bf08de1
Merge pull request #632 from thecodingmachine/feat/url-room-started
Removed hard coded default map (2)
2021-01-21 10:10:22 +01:00
David Négrier bbf9325396 Simplifying code and making START_ROOM_URL compatible with public (_) and private (@) paths 2021-01-21 09:40:11 +01:00
David Négrier c568f32ff1
Merge pull request #631 from thecodingmachine/fixdockerstartup
Fixing docker-compose startup
2021-01-21 09:08:53 +01:00
David Négrier ae48284460 Fixing docker-compose startup
With the addition of ./template.sh in #623, we now need to call the templater on each container startup, even in development environments.
2021-01-21 09:02:47 +01:00
Thomas Basler d79a18ee81 Removed unused URL_ROOM_STARTED variable from pusher and back 2021-01-20 22:56:24 +01:00
Thomas Basler 14b328c733 Removed hard coded default map
You can apply local maps using the maps vhost as previously.
But it's also possible to specify external maps by prepending http or https.
2021-01-20 22:56:21 +01:00
Thomas Basler e8127fc4ae Fix handling of remote maps 2021-01-20 21:00:59 +01:00
Thomas Basler 84d9e47c73 Undo previous changes regaring index.html template 2021-01-20 20:38:58 +01:00
Thomas Basler cfaf7aaf60 Merge remote-tracking branch 'upstream/develop' into develop 2021-01-20 19:41:05 +01:00
David Négrier 84f85effe5
Merge pull request #628 from thecodingmachine/template-analytics
Template google analytics data (2)
2021-01-20 18:03:28 +01:00
David Négrier f87f3889df Running templater in CI phase 2021-01-20 18:00:11 +01:00
David Négrier 9e469a4a8f Removing Google Analytics tracking from test environments 2021-01-20 17:30:26 +01:00
David Négrier 15b3e87bd1 Renaming TRACKING_NUMBER to GA_TRACKING_ID 2021-01-20 17:30:11 +01:00
David Négrier fd89d54ed9 Adding GA tracking in test envs 2021-01-20 16:57:30 +01:00
David Négrier aa9a21ad4c
Merge pull request #581 from Informatic/fix/firefox-webcam
front: fix webrtc webcam feed on Firefox
2021-01-20 16:27:45 +01:00
David Négrier b03abee481 Fixing admin links 2021-01-20 10:34:34 +01:00
David Négrier 2452c96bf1
Merge pull request #620 from thecodingmachine/develop
Deploy 2021-01-18
2021-01-19 21:49:45 +01:00
grégoire parant cb7cf7a141
Merge pull request #625 from thecodingmachine/phaser3.54
FEATURE: updated phaser to version 3.52
2021-01-19 18:51:03 +01:00
kharhamel 49531bb8fa FEATURE: updated phaser to version 3.52 2021-01-19 18:31:58 +01:00
Jean-Philippe Evrard e2f400472f Template google analytics data
Without this patch, the index.html contains google analytics at
all times, including for people self-hosting it.

This is a problem for privacy reasons, and only people wanting
to have analytics on their instances should be able to enable
them.

This fixes it by making sure the index.html page is templated
to sideload content from ANALYTICS_CODE_PATH (which itself is
also templated, for convenience).
2021-01-19 12:17:05 +01:00
Gregoire Parant c95419f0e7 Prepar release 1.1.0
Automatically redirect on floor0 of TCM map
2021-01-18 22:52:25 +01:00
David Négrier d891a288b5 Switching to new admin url 2021-01-18 21:02:25 +01:00
David Négrier 1f9d975505 Fixing CI 2021-01-18 19:52:44 +01:00
David Négrier db1e700488
Merge pull request #618 from thecodingmachine/featureBan
Removing website container entirely from project
2021-01-18 19:49:21 +01:00
David Négrier 675c043cb5 Removing website container entirely from project (as it is specific to the WorkAdventure company and not to the WorkAdventure self-installed project) 2021-01-18 19:39:22 +01:00
David Négrier c466ba8ca5
Merge pull request #601 from thecodingmachine/featureBan
Create ban feature by admin console
2021-01-18 19:31:51 +01:00
David Négrier 4df200c6c0 Switching ban by IP to be world specific 2021-01-18 16:41:36 +01:00
Gregoire Parant 5954ded195 Update link for private TCM map 2021-01-18 16:25:44 +01:00
David Négrier 0d4808231a Linting code 2021-01-18 15:43:27 +01:00