Commit graph

107 commits

Author SHA1 Message Date
Gregoire Parant 2812387650 Merge branch 'develop' into action-button 2020-11-23 20:08:19 +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 1bff2addf1 Merge branch 'develop' into firefox-error-jitsi
# Conflicts:
#	front/src/WebRtc/MediaManager.ts
2020-11-17 18:54:51 +01:00
Gregoire Parant 0a7063a478 Add close button 2020-11-17 18:03:44 +01:00
Gregoire Parant 3333b3cee3 Fix feedback moufmouf 2020-11-10 12:38:32 +01:00
Gregoire Parant 74de2746c2 Create action button 2020-10-31 14:04:55 +01:00
Gregoire Parant a2dd3bd6ab Fix style 2020-10-30 20:35:45 +01:00
Gregoire Parant 724bb7f288 Merge branch 'develop' into feature-discussion 2020-10-30 20:04:12 +01:00
Gregoire Parant 80355e6b85 fix layout mode click when discussion is activated 2020-10-27 20:46:53 +01:00
Gregoire Parant 55c1bcee66 Add callback report in discussion part 2020-10-27 20:18:25 +01:00
Kharhamel dfd2b2048c
Merge pull request #380 from thecodingmachine/jitsiQOL
opening and closing jitsi windows now trigger some transitions
2020-10-27 17:57:56 +01:00
kharhamel 67aa2f4b6c opening and closing jitsi windows now trigger some transitions 2020-10-27 17:44:57 +01:00
Gregoire Parant 850be63284 Fix style 2020-10-26 00:26:10 +01:00
Gregoire Parant 1e096af43b Fix font family 2020-10-26 00:03:30 +01:00
Gregoire Parant bdb504722f Fix style -webkit-focus 2020-10-25 22:41:31 +01:00
Gregoire Parant 1945c24704 Create send data discussion 2020-10-25 21:59:14 +01:00
Gregoire Parant f344adc48b Create discussion
- Add new discussion class
- Feature to discuss and report user
2020-10-25 19:39:15 +01:00
Gregoire Parant b6fe9e72e1 Fix style and refactor 2020-10-25 19:38:00 +01:00
Gregoire Parant e640f67156 update admin navbar 2020-10-24 13:37:33 +02:00
Gregoire Parant bf9dfcc835 Ban mesage
- Create type message could be use to send private message at any user
- Create SendMessageUser message
- Add sound when user receive ban message
2020-10-19 19:32:47 +02:00
Gregoire Parant 62dfb68aaf Update style report modal 2020-10-15 12:24:16 +02:00
Gregoire Parant 4799460064 Merge branch 'develop' into player-report
# Conflicts:
#	front/src/Connexion/RoomConnection.ts
2020-10-14 15:06:10 +02:00
David Négrier 807ccc49d4 Fixing rewriterule with register link in prod 2020-10-14 13:52:02 +02:00
David Négrier b7340022de Fixing rewriterule with @ in prod 2020-10-14 13:29:16 +02:00
Gregoire Parant 436cde7033 Fixe style media manager and text modale 2020-10-13 21:54:08 +02:00
Gregoire Parant 05a1ea8469 Merge branch 'develop' into player-report
# Conflicts:
#	back/src/Controller/IoSocketController.ts
#	front/src/Phaser/Game/GameScene.ts
#	front/src/index.ts
#	messages/messages.proto
2020-10-13 20:39:29 +02:00
Gregoire Parant dbaf44e814 Change report flag
- Add icon on video
- Permit to have a modal with comment
2020-10-13 19:56:42 +02:00
David Négrier 9a04836215 Dynamically import Quill
We load Quill only if it is needed (after all, only admins need Quill)
2020-10-13 10:26:27 +02:00
Gregoire Parant c63fb6ed6f Add image to report and to teleport player 2020-10-06 23:56:27 +02:00
David Négrier 9563013f48 Removing useless file 2020-10-01 16:02:45 +02:00
Gregoire Parant d5fdb9d857 Fix style 2020-09-23 18:07:31 +02:00
Gregoire Parant 8c43c67741 Create feature to send and read audio message 2020-09-21 15:00:39 +02:00
Gregoire Parant 16b3e48711 Add menu to switch 2020-09-21 01:16:10 +02:00
Gregoire Parant e0ae79eaf1 Fini quill box 2020-09-21 00:34:25 +02:00
Gregoire Parant 9b955ebd20 fix style quill box 2020-09-20 19:31:24 +02:00
Gregoire Parant 45ad4bbb36 Send and play audio message 2020-09-20 17:12:27 +02:00
Gregoire Parant 4c7e458e52 create event and brodcast event in backend 2020-09-19 01:08:56 +02:00
Gregoire Parant e59cbcfaa7 Create console global message
- Add style
- Create zone and button to show the admin console
2020-09-16 21:50:04 +02:00
Gregoire Parant 509196785b Initialise global message
- Create new class to manager global message. My idea is that this class permit to manage audio or text message.
 - Update html to have main content id and inject html in this.
 - Create front event to receive startMessage and stopMessage.
 - Delete impoted variable not used.
2020-09-16 18:38:50 +02:00
David Négrier 3a9196fb82 Merge 2020-09-16 11:41:03 +02:00
David Négrier 9516f6615c Centering character based on game div
Previously, character was centered based on window size, but when doing CoWebsite browsing, window size != game size, leading to poorly centered characters
2020-08-31 17:56:11 +02:00
David Négrier 13272968cf Clicking on a video puts it in presentation mode
Adding the ability to put a video in presentation mode by clicking on it.
Also, adding small CSS animations on hover.
2020-08-27 10:16:34 +02:00
David Négrier fca93663b4 Merge branch 'develop' of github.com:thecodingmachine/workadventure into outline 2020-08-24 18:15:44 +02:00
David Négrier 044495cf05 Centering character in free space
This commit adds the ability to put the character where there is free space when a discussion is hapening (either in presentation or chat mode)
2020-08-24 14:19:36 +02:00
David Négrier b7c2f8be7b Adding colors for cam/mic/screen share button
Microphone and camera are now red when disabled.
Screen-share is green when enabled.
Also, they are now always partially visible (they were completely hidden previously until hovering in the lower right corner)
2020-08-22 15:26:40 +02:00
David Négrier f60b02f1dc Putting a wider onhover surface when clicking on one of the buttons to manage screen sharing or video/mic 2020-08-20 22:57:34 +02:00
David Négrier 0119534283 First version of screen-sharing that works when a user is joining a group after screen sharing begun. 2020-08-20 00:05:00 +02:00
Gregoire Parant 4b72958193 Fix peer connexion for two player with screen sharing 2020-08-17 23:56:46 +02:00
Gregoire Parant 0bbed7717a Continue screen sharing 2020-08-17 23:39:50 +02:00
Gregoire Parant 208b91e52a Feature screen sharing
- Send stream of screen sharing in peer connexion
 - Add button for share your screen
2020-08-17 23:17:00 +02:00