Commit Graph

1343 Commits

Author SHA1 Message Date
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
David Négrier 3a046cb450 Removing admin from develop branch because of issue with SSL certificate 2021-01-28 23:18:12 +01:00
David Négrier 2f01677849
Merge pull request #681 from thecodingmachine/downgradephaser3.24
Downgraded phaser version to 3.24.1
2021-01-28 23:08:47 +01:00
kharhamel f2c3d6f158 downgraded phaser version to 3.24.1 2021-01-28 23:03:06 +01:00
David Négrier 8d8d0cb1b7
Merge pull request #680 from thecodingmachine/revert-677-phaserDowngrade
Revert "downgraded phaser version to 3.22"
2021-01-28 22:45:45 +01:00
David Négrier ce56a5cba1
Revert "downgraded phaser version to 3.22" 2021-01-28 22:38:20 +01:00
David Négrier 755fc44dd9
Merge pull request #677 from thecodingmachine/phaserDowngrade
downgraded phaser version to 3.22
2021-01-28 22:31:46 +01:00
kharhamel e7120317c1 downgraded phaser version to 3.22 2021-01-28 19:15:34 +01:00
David Négrier b7b2934106
Merge pull request #672 from Amirault/tam_use_type_guard_on_html_element
Use type guard for html element subtype
2021-01-28 17:13:02 +01:00
Tony Amirault 72799d4f0e added end of line 2021-01-28 15:31:09 +01:00
Tony Amirault 3a05ef6640 package.lock removed 2021-01-28 15:30:20 +01:00
Kharhamel 9849e70613
Merge pull request #670 from thecodingmachine/httpCypress
Removed cypress from the project
2021-01-28 15:03:12 +01:00
kharhamel ca231eee4a remove cypress from the project :( 2021-01-28 14:56:24 +01:00
Kharhamel a6a66c7789
Merge pull request #666 from thecodingmachine/disablepipeline
Removing pipeline related code
2021-01-28 14:53:33 +01:00
Tony Amirault cdbae5fa43 use type guard on html element 2021-01-27 18:33:40 +01:00
David Négrier 8eebed1829 Removing pipeline related code
This code is broken since Phaser 3.50 and we are facing weird issues with MacOS memory leaks and crashes.
Removing this code will remove one potential suspect.
2021-01-27 11:18:07 +01:00
grégoire parant 86f1099247
Merge pull request #648 from thecodingmachine/customCharacterLadyLoading
Fix custom character lazy loading
2021-01-26 15:27:46 +01:00
Gregoire Parant 45b355f780 Refactor lazy loading 2021-01-26 15:21:23 +01:00
Kharhamel 556d5a4695
Merge pull request #658 from thecodingmachine/lockUserBanned
Lock user banned
2021-01-26 14:06:35 +01:00
Gregoire Parant 1dd2858424 Fix feadback @Kharhamel 2021-01-26 14:04:42 +01:00
Gregoire Parant e2695c58af Verify existing texture 2021-01-26 09:16:39 +01:00
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 ab0fe63cb2 Adding start room url to develop env 2021-01-25 22:42:44 +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
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
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