lbehm/workadventure
1
0
Fork 0
Code Issues Pull requests Releases Activity
941 commits 21 branches 1 tag 50 MiB
Commit graph

941 commits

This branch
This branch
All branches
Author SHA1 Message Date
Gregoire Parant 1f7f94ea9c Feedback review MR 
- Extend the ResizableScene instead.
- Remove ErrorScene
- Add git ignore
 2020-11-04 12:39:28 +01:00
Gregoire Parant 00ce899a74 Merge branch 'develop' into usersLimit 
# Conflicts:
#	back/src/Services/SocketManager.ts
 2020-11-01 12:00:31 +01:00
Kharhamel 8a687f40cb
Merge pull request #383 from thecodingmachine/improvedMetrics 
improvment: added a prometheus gauge for the number of groups in a room
 2020-10-30 18:27:51 +01:00
kharhamel b1d2543631 improvment: added prometheus metrics for the number of groups in a room 2020-10-30 15:23:50 +01:00
David Négrier 6658e2d666
Merge pull request #381 from thecodingmachine/dependabot/npm_and_yarn/back/systeminformation-4.27.11 
Bump systeminformation from 4.27.5 to 4.27.11 in /back
 2020-10-28 10:18:10 +01:00
dependabot[bot] d472f984b5
Bump systeminformation from 4.27.5 to 4.27.11 in /back 
Bumps [systeminformation](https://github.com/sebhildebrandt/systeminformation) from 4.27.5 to 4.27.11.
- [Release notes](https://github.com/sebhildebrandt/systeminformation/releases)
- [Changelog](https://github.com/sebhildebrandt/systeminformation/blob/master/CHANGELOG.md)
- [Commits](https://github.com/sebhildebrandt/systeminformation/commits)

Signed-off-by: dependabot[bot] <support@github.com>
 2020-10-27 20:55:36 +00:00
David Négrier 8941b362d1
Merge pull request #379 from rlespinasse/patch-1 
ci: update to github-slug-action v1.1.1
 2020-10-27 18:10:50 +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
Romain Lespinasse 11127db9f3
ci: update to github-slug-action v1.1.1 2020-10-26 20:10:59 +01:00
Kharhamel 11541f9f55
Merge pull request #378 from thecodingmachine/jitsiQOL 
disabling audio/video in jitsi carry over to wa
 2020-10-26 17:05:39 +01:00
kharhamel 65a710d1f4 disabling audio/video in jitsi carry over to wa 2020-10-26 16:55:56 +01:00
David Négrier de424769f3
Merge pull request #375 from thecodingmachine/update-admin-navbar 
update admin navbar
 2020-10-25 19:15:11 +01:00
Gregoire Parant e640f67156 update admin navbar 2020-10-24 13:37:33 +02:00
Gregoire Parant 1cf2f19e47 Merge branch 'develop' into usersLimit 
# Conflicts:
#	front/src/Phaser/Game/GameScene.ts
 2020-10-24 10:50:37 +02:00
Kharhamel 3e41875cd5
Merge pull request #373 from thecodingmachine/jitsiQOL 
some refractoring to jitsicreation and mediaManager
 2020-10-23 17:45:54 +02:00
kharhamel 00ad28f084 feat: jitsi no start with audio or video muted when needed 2020-10-23 17:19:20 +02:00
kharhamel 3fdca94afb refactor: move jitsi creation to a dedicated and cleaned some type in mediaManager 2020-10-23 17:19:14 +02:00
David Négrier 8d0b78072e
Merge pull request #362 from thecodingmachine/movenospeak 
When a user moves, do not trigger group creation
 2020-10-22 16:38:26 +02:00
David Négrier b7854dfb90 When a user moves, do not trigger group creation 
In order to avoid triggering group creation when walking next to someone we should avoid creating a group unless the user stops next to the other members of the group.
 2020-10-22 16:15:30 +02:00
David Négrier c8434dfd4c Renaming test file 2020-10-22 16:14:32 +02:00
Gregoire Parant bd4b6e468e Fix conflict 2020-10-22 02:03:58 +02:00
Gregoire Parant 7df605e771 remove useless 2020-10-22 01:58:53 +02:00
Gregoire Parant 4f8b315727 Merge branch 'develop' into usersLimit 
# Conflicts:
#	back/src/Controller/IoSocketController.ts
#	front/src/Phaser/Game/GameScene.ts
 2020-10-22 01:56:57 +02:00
Gregoire Parant fd1904c246 delete canjoin function 2020-10-22 01:55:38 +02:00
grégoire parant f002170ed5
Merge pull request #355 from thecodingmachine/user-limit-grp 
Create and send close message
 2020-10-22 01:47:53 +02:00
Gregoire Parant ff9f5cfc32 Revert "Create and send close message" 
This reverts commit 7ac4a2b849.

# Conflicts:
#	back/src/Controller/IoSocketController.ts
#	back/src/Services/SocketManager.ts
#	front/src/Phaser/Game/GameScene.ts
 2020-10-22 01:46:41 +02:00
Gregoire Parant f9bb749c56 Redirect user on wait scene 
- Create wait scene
- Load wait scne with status close message
 2020-10-22 01:33:36 +02:00
David Négrier b7d883b2e7
Merge pull request #359 from thecodingmachine/simple-limit-user 
Simple limit users in room
 2020-10-22 00:03:35 +02:00
Gregoire Parant 3a565362a2 Simple limit connexion in room 2020-10-21 23:45:08 +02:00
David Négrier cad94c7982
Merge pull request #357 from thecodingmachine/fix-red-circle 
Fix red circle created
 2020-10-21 23:12:42 +02:00
Gregoire Parant cfb6ad581e Fix red circle created 2020-10-21 23:08:05 +02:00
Gregoire Parant 7ac4a2b849 Create and send close message 
# TODO
- Show error or wait room
 2020-10-21 19:30:02 +02:00
arp 326c2e4183 WIP: how to respond to too many users 2020-10-21 17:43:00 +02:00
David Négrier 9d8bf8bdab
Merge pull request #354 from thecodingmachine/red-circle-full-webrtc 
Red circle when have 4 users during webrtc meet
 2020-10-21 17:34:59 +02:00
Gregoire Parant e973921390 Fix admin tags 
- Fix get size group
- Fix admin tags
- Fix texture already used
 2020-10-21 17:22:17 +02:00
Gregoire Parant 1df4cb3e17 Red circle when have 4 users during webrtc meet 2020-10-21 16:07:42 +02:00
David Négrier 142e5c3f66 Increasing node memory to 4GB 2020-10-21 15:15:07 +02:00
David Négrier 9ec5dc093c Improving benchmark 2020-10-21 14:55:18 +02:00
David Négrier 54fd429952
Merge pull request #351 from thecodingmachine/screan-sharing-peer-connection-fix 
Fix sharing peer connection
 2020-10-21 12:22:31 +02:00
David Négrier 7550d3ea38
Merge pull request #352 from thecodingmachine/fixloadingsametexture 
Fixing loading of same custom texture several time
 2020-10-21 12:20:22 +02:00
arp 664e699fd3 added a users limit per room 2020-10-21 11:33:57 +02:00
David Négrier 45c6e13cad Fixing loading of same custom texture several time 
Phaser 3 does not trigger oncomplete event if the resource is already loaded.
 2020-10-21 10:34:55 +02:00
Gregoire Parant 2ee6d43274 Fix sharing peer connection 2020-10-20 20:39:33 +02:00
David Négrier c03dd4c551 Jitsi room names don't have / 2020-10-20 19:47:28 +02:00
David Négrier cfed5b3053
Merge pull request #348 from thecodingmachine/screen-sharing-fix 
Fix screen sharing
 2020-10-20 18:31:31 +02:00
David Négrier e7f1f06272
Merge pull request #349 from thecodingmachine/customtextures 
Adding custom character textures
 2020-10-20 18:30:15 +02:00
Gregoire Parant 7fa999a1bd Fix lint 2020-10-20 18:03:10 +02:00
Gregoire Parant 173f7a5061 Fix webrct finish event delay 2020-10-20 18:02:44 +02:00
David Négrier 78a4bf3189 Adding custom character textures 2020-10-20 17:42:36 +02:00