Commit Graph

144 Commits

Author SHA1 Message Date
kharhamel
eb88db92be FIX: going back a 2nd time to SelectCharacterScene used to crash the game 2020-12-16 15:09:58 +01:00
Kharhamel
1f3c738cd0
Merge pull request from thecodingmachine/updateStyleCss
update pointer style
2020-12-16 12:58:37 +01:00
kharhamel
f5e77ad749 FIX: menu flicker 2020-12-16 12:49:34 +01:00
Gregoire Parant
bb8980e1d2 update pointer style 2020-12-15 17:34:47 +01:00
Gregoire Parant
8947e1b781 update pointer style 2020-12-15 17:31:55 +01:00
kharhamel
069f2f1cec FEAT: prototype game menu using html elements, better icon for text chat 2020-12-15 16:37:57 +01:00
kharhamel
a1aedaa594 FEAT: now play a sound when a user quit the webrtc group 2020-12-11 16:01:31 +01:00
Kharhamel
95665a28d5
Merge pull request from thecodingmachine/performance
Performance settings
2020-12-03 14:33:12 +01:00
Gregoire Parant
27634a61ee Create menu to set your quality video and game 2020-11-27 16:24:07 +01:00
Kharhamel
17e633ae45
Merge pull request from cbluoss/develop
Adding more clothing options
2020-11-26 10:30:54 +01:00
yourcoke
8ff24c38b0
added: engelbert hose + mask 2020-11-24 20:23:20 +01:00
Gregoire Parant
2812387650 Merge branch 'develop' into action-button 2020-11-23 20:08:19 +01:00
yourcoke
bbd3d9efae
added: hoodies 2020-11-21 15:46:04 +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
yourcoke
f5e41cc285
added: pride shirt 2020-11-20 15:56:58 +01:00
yourcoke
62f13f6b30
added: mate bottle accessorie 2020-11-20 11:49:08 +01:00
yourcoke
a6c8132f0a
added: tinfoil hat1 2020-11-20 10:59:22 +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 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
436cde7033 Fixe style media manager and text modale 2020-10-13 21:54:08 +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
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
David Négrier
6b970adc6c Merge branch 'develop' of github.com:thecodingmachine/workadventure into outline
# Conflicts:
#	front/src/Phaser/Game/GameScene.ts
#	front/src/Phaser/Player/Player.ts
#	front/src/index.ts
#	front/yarn.lock
2020-08-17 22:51:37 +02:00
David Négrier
0f305b0c12 CSS cleanup 2020-08-17 21:59:26 +02:00
David Négrier
7fe2cc19c3 Adding buttons to switch mode 2020-08-17 15:20:03 +02:00
David Négrier
1509777945 Improving video CSS (work on overlay) 2020-08-16 23:45:03 +02:00
David Négrier
88c099fc13 Improving layout
Fixing left-right switch on all cameras (except current player camera)
2020-08-16 23:19:04 +02:00
David Négrier
0041e088a4 Fixing position of self webcam in CoWebsite mode 2020-08-13 18:28:22 +02:00
David Négrier
9f6c6e0ce1 Adding CoWebsiteManager + first working version of flex video 2020-08-13 18:21:48 +02:00
David Négrier
6d0bccc0e1 Making a nice "customize" button 2020-07-28 15:53:44 +02:00
David Perez
25abcfe202 png files 2020-07-28 11:25:19 +02:00
David Négrier
2484e4f1df Moving maps to their own container 2020-07-23 18:43:51 +02:00
David Négrier
b3c18702bb Adding borders, centering camera, fixing small bug on resize when no camera is enabled 2020-06-24 17:49:38 +02:00
David Négrier
253108eba0 - Making the EnableCameraScene responsive
- Enabling click on arrows
2020-06-24 17:29:23 +02:00
David Négrier
3de37bafed Adding a scene to configure the webcam 2020-06-24 15:35:07 +02:00
David Négrier
f2c9647882 Adding connecting spinner and blinking error to webrtc display
I put a connecting spinner around the user name when the user is connecting.
Also, if an error occurs, we will see a blinking red circle around the player name.
2020-06-06 22:49:55 +02:00
gparant
787e1c463c Media webrtcA
- Update peerConnexion manage
 - Add muted microphone logo
 - Add icon user
 - Sound when user enter in room webrtc
2020-05-14 20:39:30 +02:00
gparant
ec297e3912 Auto-reconnect 2020-05-13 20:22:42 +02:00
gparant
d3ff717f9e Minor Fix overflow css style 2020-05-12 00:22:55 +02:00
gparant
b65e37c468 Name of map users
- Add name on user
 - Delete NonPlayer class not used
2020-05-03 22:24:14 +02:00
David Négrier
b260dc32b5 Merge from master 2020-05-03 18:04:01 +02:00
gparant
fb255140e5 Add feature to mute or switch off cam 2020-05-03 17:19:42 +02:00
gparant
85ab0a231f Fix style cam 2020-05-03 14:29:45 +02:00
gparant
fdb40ec3e2 Fix webrtc multi 2020-05-02 20:46:02 +02:00
David Négrier
42ddd8b858 Changed font from text
Input name can only be 4 characters long
Passing name to next scene
2020-05-01 23:19:51 +02:00
gparant
e06b20fe96 Update video style and start peer connexion 2020-05-01 21:15:00 +02:00
gparant
3151113db3 Merge branch 'master' into webrtc
# Conflicts:
#	back/src/Model/Websocket/MessageUserPosition.ts
2020-04-29 00:05:16 +02:00
gparant
8c935e8b27 Merge branch 'master' into webrtc
# Conflicts:
#	front/src/Phaser/Game/GameManager.ts
2020-04-28 20:50:51 +02:00
David Négrier
3b9eb73929 Adding a huge collection of characters to play with 2020-04-27 22:38:21 +02:00
gparant
b49c012319 Add button to enter un visio 2020-04-26 20:55:20 +02:00
kharhamel
d691b58d0b basic login page with a text input and a click button 2020-04-26 17:54:56 +02:00
gparant
575054fe4f Fix multi video 2020-04-25 20:29:03 +02:00
gparant
5b62ac39fb Create webrtc connexion between two player 2020-04-19 19:32:38 +02:00
kharhamel
241cbd720a added a rock 2020-04-11 18:17:36 +02:00
David Négrier
b10f8d9069 Loading first sprite 2020-04-05 16:20:53 +02:00
kevin
25841b51c0 ajout des logos TCM 2020-04-04 15:42:45 +02:00