Commit Graph

832 Commits

Author SHA1 Message Date
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
David Négrier 246174c365 Removing useless file 2021-02-03 12:29:56 +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 8572959cb0
Merge pull request #690 from thecodingmachine/newLogo
Update Loading page
2021-02-02 17:26:48 +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
David Négrier cc53023586 Using locally built images 2021-02-02 11:34:29 +01:00
David Négrier 274f5eba4c Reworking docker-compose.prod.yaml to make it generic while still having a front container configurable 2021-02-02 11:19:24 +01:00
Manfred Stock 0afbb5412e Improve display of websites not specifying background color
The `index.html` of the front-end specifies `#000` as background color,
however, it seems like various websites found 'in the wild' don't
specify their own background color and thus default to `transparent`. As
a result of this, they tend to become mostly unreadable when displayed
using `openWebsite` since they often assume that they get displayed on a
white background. Setting white as background color on the container
element of the `<iframe>` works around this issue.
2021-02-01 22:48:10 +01:00
Gregoire Parant 788e22e8b0 Fix loading logo of WorkAdventure 2021-02-01 16:52:28 +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 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
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
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 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 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 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 15b3e87bd1 Renaming TRACKING_NUMBER to GA_TRACKING_ID 2021-01-20 17:30:11 +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
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 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
kharhamel fd29826556 fixed a crash linked to incorrect textureDescriptors 2021-01-14 14:47:02 +01:00
psy 8d67947bc1 move map url to else case 2021-01-14 11:48:06 +01:00
psy f431e769cc add remote files and streams to playAudio 2021-01-14 11:45:14 +01:00
Thomas Basler f16c7d9d3c Merge remote-tracking branch 'upstream/master' into develop 2021-01-13 22:29:22 +01:00
David Négrier 8cf481ec49 Fixing bug when no WebGL is available
The switch to Phaser 3.50 introduced a bug when WebGL is not available in a browser.
The changes in this commit prevent calls to the WebGL pipeline if the pipeline is not available.
2021-01-13 18:39:28 +01:00
grégoire parant 8ffba3157a
Merge pull request #588 from thecodingmachine/customiseCharacters
Customise characters with admin console
2021-01-13 16:47:13 +01:00
Gregoire Parant 512be7acd2 New basic characters 2021-01-13 16:46:24 +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 993c58cf8e Fix select rectangle for customize scene 2021-01-12 19:49:48 +01:00
Gregoire Parant 987c80c9c4 Fix menu 2021-01-12 19:48:48 +01:00
grégoire parant 0f7f42b6f1
Merge pull request #566 from thecodingmachine/screanSharing
Fix screen sharing
2021-01-12 19:24:06 +01:00
Gregoire Parant 123ee4bc43 Fix responsive and limite select cursor 2021-01-12 15:29:26 +01:00
Gregoire Parant f8d4b696e8 Customise characters with admin console
- Add new characters choise
 - Display on 3 line of 6 pers
 - Add custom characters from admin console wilth level -1
2021-01-12 13:19:51 +01:00
grégoire parant 648e6aef97
Merge pull request #561 from thecodingmachine/linkNotClickable
Verify URL in message
2021-01-12 11:30:11 +01:00
Piotr Dobrowolski 7f8cc76eb7 front: fix webrtc webcam feed on Firefox
Seems like Firefox doesn't support specifing both exact and ideal
constraints...
2021-01-10 17:05:48 +01:00
kharhamel 472fbb1de0 All player textures are now lazy-loaded 2021-01-08 11:44:41 +01:00
Thomas Basler 92ce52cdb3 Merge remote-tracking branch 'upstream/develop' into develop 2021-01-07 14:17:36 +01:00
Kharhamel c2d0cda441
Merge pull request #572 from thecodingmachine/master
Master
2021-01-07 14:00:45 +01:00
Gregoire Parant e8f1b2d048 Add clear array peer connection sharing 2021-01-07 12:58:45 +01:00
Thomas Basler 952d9d3fca Repalced var by let 2021-01-07 12:48:31 +01:00
kharhamel 3ce8427378 fixed a game crashed because of lack of animations and improved the character class 2021-01-07 12:46:13 +01:00
Gregoire Parant a88ad3cf4d Dont delete PeerSharingConnection because it will be resuse
When user try to screen charing with same user, the event send is not a offer but renegociation. So could clear arry only when user out of circle.
2021-01-07 12:13:12 +01:00
Gregoire Parant 018f01e878 Increase stability camera and microphone permission 2021-01-07 11:02:00 +01:00
Gregoire Parant 8c89b5e0b1 Permit to change style when getCamera was ready and permission accorded 2021-01-07 10:30:28 +01:00
Gregoire Parant d4c7a20dfa Update feedback @moufmouf 2021-01-07 09:42:11 +01:00
Thomas Basler f6c7c466eb Added environment variable to set default map url 2021-01-06 23:30:14 +01:00
Gregoire Parant 1659fa400f Increase stability to force stopped screen sharing 2021-01-06 17:09:17 +01:00
kharhamel fbb44af369 added a basic loader 2021-01-06 17:08:48 +01:00
Gregoire Parant 73d7e798e9 Upgrade conversion
When user send multi message, scroll on last message
2021-01-06 17:08:13 +01:00
Thomas Basler 45ab174dab Fix typo 2021-01-06 15:35:09 +01:00
kharhamel 1359fbe977 updated phaser to version 3.51 and fixed the BC 2021-01-06 15:00:54 +01:00
Thomas Basler 92b386580f Merge remote-tracking branch 'upstream/develop' into develop 2021-01-06 14:47:54 +01:00
Gregoire Parant 4397ff7712 Update style and focus keyboard 2021-01-06 13:36:18 +01:00
Thomas Basler 7874c89c1a Fix exception in javascript console by commenting not required function 2021-01-06 13:07:50 +01:00
Gregoire Parant 438469ae24 Verify URL in message 2021-01-06 12:20:02 +01:00
Thomas Basler e3f539ca8e Fix: Firefox doesn't show the webcam permission dialogue 2021-01-06 04:01:25 +01:00
Thomas Basler 4242abcc52 Added button to show the copyright info of the map 2021-01-06 02:27:48 +01:00
dependabot[bot] c7ed0bf8bb
Bump axios from 0.20.0 to 0.21.1 in /front
Bumps [axios](https://github.com/axios/axios) from 0.20.0 to 0.21.1.
- [Release notes](https://github.com/axios/axios/releases)
- [Changelog](https://github.com/axios/axios/blob/v0.21.1/CHANGELOG.md)
- [Commits](https://github.com/axios/axios/compare/v0.20.0...v0.21.1)

Signed-off-by: dependabot[bot] <support@github.com>
2021-01-05 23:50:25 +00:00
Thomas Basler 08280afb9b Replaced favicon by binary kitchen 2021-01-05 22:18:04 +01:00
Thomas Basler 51849bee4e Removed ugly cursor images 2021-01-05 21:50:56 +01:00
Thomas Basler be2a8eeeff Changed html title 2021-01-05 21:43:39 +01:00
Thomas Basler c1f31c0235 Hide the create map button in the menu 2021-01-05 21:12:58 +01:00
Thomas Basler 030e3b324d Fixed animation by appling another PR
https://github.com/thecodingmachine/workadventure/pull/443/
2021-01-05 21:04:57 +01:00
Thomas Basler 7797df539f Fixed syntax error and commited yarn.lock 2021-01-05 19:13:34 +01:00
Thomas Basler 88a5fe4664 Added animation function as in PR
https://github.com/thecodingmachine/workadventure/pull/542
2021-01-05 18:59:51 +01:00
kharhamel 6caa0e5b62 HOTFIX: the map property exitUrl now accept relative links that are deep enough to rewrite the base url 2021-01-05 18:23:17 +01:00
Thomas Basler 378ae0fe01 Deliver frontend using nginx and generate static files 2021-01-05 18:02:18 +01:00
David Négrier dea7d6dba7
Merge pull request #541 from Informatic/feature/map-sounds
[rC3] front: implement map sounds
2021-01-05 13:42:50 +01:00
David Négrier e02e051f91
Merge pull request #544 from thecodingmachine/updateMenu
Update menu design
2021-01-04 18:10:27 +01:00
Gregoire Parant ac92cbc8f7 Crate share menu and fix menu design 2021-01-04 17:13:41 +01:00
Piotr Dobrowolski 28d687e338 front: implement map sounds 2021-01-04 16:57:31 +01:00
Oliver Lorenz 7c89cf0e47 feat: adds property openWebsitePolicy to set allow property in iframe 2020-12-29 23:17:16 +01:00
Dariusz Niemczyk 640d994dda
Properly fix the CustomizeScene by limiting input
When left/right arrow is being held on chrome the Phaser gets into infinite rendering loop that doesn't crash the browser but makes it slow to a crawl.
2020-12-27 11:00:23 +01:00
Dariusz Niemczyk c9250c08f3
Fix CustomizeScene killing CPU
Fixes #518
2020-12-27 10:47:56 +01:00
David Négrier e5138e1c03
Merge pull request #505 from thecodingmachine/fixFrameLocalStorage
Manage Local Storage customers player error
2020-12-18 16:33:36 +01:00
Gregoire Parant a1fd209578 Fix catch error 2020-12-18 16:30:22 +01:00
David Négrier 36f886aed6 Fixing cat running too fast on reconnect scene because animations were duplicated 2020-12-18 16:08:04 +01:00
David Négrier df114bc1ce Fixing broken reconnection 2020-12-18 15:59:07 +01:00
Gregoire Parant 323fa6abba Create exception error 2020-12-18 14:30:46 +01:00
Gregoire Parant f5dd5efc0e Manage Local Storage customers player error 2020-12-18 13:56:25 +01:00
Gregoire Parant 89064d23f9 Fix style 2020-12-18 00:09:07 +01:00
David Négrier 0984e7eaad Fix linting 2020-12-17 22:35:38 +01:00
Gregoire Parant ed214f2b41 Fix style menu 2020-12-17 22:10:36 +01:00
Gregoire Parant ed8232b0f5 Fix style menu 2020-12-17 21:58:18 +01:00
Gregoire Parant e77eb6d5be Typo fixes 2020-12-17 18:19:47 +01:00
Gregoire Parant ca1cd388e8 Fix lint 2020-12-17 16:39:11 +01:00
Gregoire Parant 08ce954f56 Add new click event to close co website 2020-12-17 16:36:01 +01:00
David Négrier 055131ac66 Typo fixes 2020-12-17 15:20:42 +01:00
Gregoire Parant faf32bfa01 Fix event click listner 2020-12-17 14:16:10 +01:00
Gregoire Parant 2d4193a917 Merge branch 'develop' into notifOutSound 2020-12-17 13:56:21 +01:00
kharhamel 9fbcf0dc12 FIX: spark button open in a new window 2020-12-16 19:02:10 +01:00
Gregoire Parant 6a21436c9e Update menu 2020-12-16 18:56:02 +01:00
Gregoire Parant a2d56ef56a Update admin menu 2020-12-16 18:52:11 +01:00
Gregoire Parant 1a27b7d2ee Update menu 2020-12-16 17:17:31 +01:00