Commit Graph

735 Commits

Author SHA1 Message Date
Gregoire Parant fff0cbc3f6 Revert message exit 2021-02-17 19:40:00 +01:00
Gregoire Parant 9b7b3eb140 Update feedback @tabascoeye 2021-02-17 19:31:05 +01:00
Gregoire Parant ce423c9fec Remove exit trigger action 2021-02-17 19:29:59 +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
Gregoire Parant e8b1b286a3 Merge Jitsi config 2021-02-17 18:49:55 +01:00
David Négrier ae1d00c828
Merge pull request #736 from MisterErwin/patch-1
Fix offsets of SpeechBubble.ts
2021-02-16 20:02:03 +01:00
David Négrier 43b48ce555
Merge pull request #737 from MisterErwin/patch-2
Do not change rooms if scene failed to load
2021-02-16 20:01:00 +01:00
David Négrier ddcb5ede59
Merge pull request #742 from znerol-forks/fix/huge-jitsi-url
Fix jitsi URLs growing indefinitely in length
2021-02-16 19:52:56 +01:00
David Négrier 9affa36608
Merge pull request #746 from thecodingmachine/turncredentials
[Feature] Connect to a Coturn server using REST API
2021-02-16 19:32:21 +01:00
kharhamel e21868ed3b FIX: current audio and video status are overwriten by jitsi config 2021-02-16 18:25:23 +01:00
David Négrier 6b00355ea8 Fixing WebRtc user name / password when using TURN REST API 2021-02-16 18:13:30 +01:00
David Négrier 12ef2820bf Refactoring parameters passed to ScreenSharingPeer 2021-02-16 11:08:03 +01:00
David Négrier cdb3cfdc81 [Feature] Connect to a Coturn server using REST API
This allows connecting to a TURN server with temporary passwords.
The passwords are expiring after 4 hours.
2021-02-16 11:06:05 +01:00
znerol 9670f92a08 Allow URLs relative to map base in iframe / openWebsite 2021-02-16 10:53:50 +01:00
znerol 4fcdad1551 Fix jitsi URLs growing indefinitely in length 2021-02-15 10:36:56 +01:00
Tim Schlüter 05b829da70 fix multi user videochat mode 2021-02-13 21:19:45 +01:00
MisterErwin aff4c8d145
Do not change rooms if scene failed to load
Sometimes a following room fails to load (e.g., #582) and instead of fading to black (as no scene is active) when trying to enter that next room, the player will stay in the old room and an error is logged (as throwing one crashes the game).
2021-02-13 14:15:09 +01:00
MisterErwin 511cd99e22
Fix offsets of SpeechBubble.ts
Since some recent optimizations, they are being added on top of the player, which makes the offset redundant.
2021-02-13 14:04:28 +01:00
kharhamel 0c892e0243 FEATURE: implemented a client side blacklist 2021-02-12 19:15:24 +01:00
Gregoire Parant b92b7304b0 Fix to use clear All Keys 2021-02-11 21:48:24 +01:00
David Négrier 64cd07cc39
Merge pull request #726 from thecodingmachine/fixHtmlAnchorElement
Update to use Anchor type
2021-02-11 18:08:52 +01:00
David Négrier bc35ade8df Improving urlify 2021-02-11 18:03:14 +01:00
David Négrier c8fc8a2834
Merge pull request #699 from thecodingmachine/pixelartmode
Switching Phaser to pixelart mode
2021-02-11 17:20:20 +01:00
David Négrier 42aee9f5c8
Merge pull request #722 from thecodingmachine/jitsislugify
Slugifies the Jitsi room name
2021-02-11 17:17:58 +01:00
David Négrier 35fdd3bf29
Merge pull request #717 from kalkspace/add-stun-server-env-variable-with-fallback
Add STUN_SERVER env variable with fallback
2021-02-11 17:17:36 +01:00
Gregoire Parant c5916e7b6d Fix ci 2021-02-11 15:06:12 +01:00
Gregoire Parant 0d104cb307 Update to use Anchor html 2021-02-11 14:49:32 +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 8389fad877 Disabling video background by default on Jitsi
(because it consumes a lot of CPU)
2021-02-10 11:20:05 +01:00
David Négrier e7ddeedb3e Disabling Join/Leave notifications by default 2021-02-10 11:13:47 +01:00
David Négrier a5bdf68246 Moving property reading inside startJitsi (startJitsi is called at 2 different places) 2021-02-10 11:08:57 +01:00
Mickael Chimansky 5cb9624b0b fixup! Jitsi config properties 2021-02-09 20:31:49 +01:00
Mickael Chimansky 9c4d0aa32f Jitsi config properties 2021-02-09 16:05:21 +01:00
Sebastian Wiesendahl b6807d274b Add STUN_SERVER env variable with fallback
default: "stun:stun.l.google.com:19302"

Make STUN_SERVER available for app config

Change also the STUN_SERVER for ScreenSharingPeer
2021-02-09 13:09:17 +01:00
David Négrier 969c9fd544 Fixing loading logo being displayed when nothing was loaded 2021-02-09 12:41:35 +01:00
David Négrier adb535d1b6
Merge pull request #703 from thecodingmachine/socialNetworkLink
Social network link anonymous connexion
2021-02-04 16:10:25 +01:00
Gregoire Parant 03f1f5bf75 Update feedback @moufmouf 2021-02-04 16:05:05 +01:00
Gregoire Parant 59b4b168e9 Social network link anonymous connexion
In menu, add social newtork link when user is connected in anonymous mode
2021-02-03 23:14:31 +01:00
Gregoire Parant 4de9b8ba40 Fix icon discussion
- Fix size of discussion icon
- Update x and y when page is resize
- Fix blanc link in chat
2021-02-03 23:11:33 +01:00
grégoire parant c41c058fb0
Merge pull request #527 from oliverlorenz/feature/iframe-feature-policy
feat: adds property openWebsitePolicy property to set "allow" property in iframe
2021-02-03 17:38:35 +01:00
David Négrier 9c9f046b16
Merge pull request #668 from piitaya/fix_game_not_centered
Use canvas instead of div container for calculating the game size
2021-02-03 14:06:09 +01:00
grégoire parant f2b9f6c92a
Merge pull request #686 from thecodingmachine/publicReportedUser
Permit puiblic report
2021-02-02 18:09:25 +01:00
David Négrier 3f274df813 Redesigning loading bar 2021-02-02 17:17:00 +01:00
David Négrier e757d63924 Switching Phaser to pixelart mode
To be honest, I'm not sure what it does exactly (it is supposed to prevent antialiasing and it is rounding coordinates for rendering sprites, but I don't see a difference yet.
2021-02-02 12:04:50 +01:00
Gregoire Parant 788e22e8b0 Fix loading logo of WorkAdventure 2021-02-01 16:52:28 +01:00
Gregoire Parant f99db4856f Add WorkAdventure logo 2021-01-30 20:33:31 +01:00
Gregoire Parant ac2bc76239 change style report button 2021-01-30 14:08:11 +01:00
Gregoire Parant 7eb38fae83 Permit puiblic report
- Create report html
 - Add report flag
2021-01-29 21:09:10 +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 ce56a5cba1
Revert "downgraded phaser version to 3.22" 2021-01-28 22:38:20 +01:00
Paul Bottein a8b5e8599f use HTMLCanvasElement 2021-01-28 21:09:41 +01:00
Paul Bottein 608a9ad347 use type guard 2021-01-28 21:07:17 +01:00
Paul Bottein b52c546a8c Use canvas instead of div container for calculating the game size 2021-01-28 21:04:43 +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
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
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
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 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 bbf9325396 Simplifying code and making START_ROOM_URL compatible with public (_) and private (@) paths 2021-01-21 09:40:11 +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 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
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 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 65d2c3dfb0 Disabling explicit any check on error handling 2021-01-18 15:36:02 +01:00
Gregoire Parant 679dbd4215 Fix focus cam on select cam scene 2021-01-18 10:40:13 +01:00
David Négrier 4234b38910 Better error message in case of 404 2021-01-17 22:40:54 +01:00
David Négrier adca51f6de Replacing FourOFourScene with more generic ErrorScene 2021-01-17 20:42:45 +01:00
Thomas Basler 572febea54 Merge remote-tracking branch 'upstream/develop' into develop 2021-01-14 20:21:29 +01:00