Gregoire Parant
1cf2f19e47
Merge branch 'develop' into usersLimit
...
# Conflicts:
# front/src/Phaser/Game/GameScene.ts
2020-10-24 10:50:37 +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
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
Gregoire Parant
3a565362a2
Simple limit connexion in room
2020-10-21 23:45:08 +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
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
David Négrier
142e5c3f66
Increasing node memory to 4GB
2020-10-21 15:15:07 +02:00
arp
664e699fd3
added a users limit per room
2020-10-21 11:33:57 +02:00
David Négrier
78a4bf3189
Adding custom character textures
2020-10-20 17:42:36 +02:00
Gregoire Parant
565ce6b70b
eslint fix
2020-10-20 09:24:06 +02:00
Gregoire Parant
8d1d6fc8dc
Push message when user is connected on new room
2020-10-20 09:20:00 +02:00
Gregoire Parant
eb1f62bb1c
Add banned message and close ws
2020-10-20 08:30:11 +02:00
Gregoire Parant
7059c6e6e3
Refactor message
2020-10-20 08:20:21 +02:00
Gregoire Parant
ba9f9dcbe1
Fix CD
2020-10-19 21:04:16 +02:00
Gregoire Parant
dfa6d2cc66
Verify user in admin
...
- If 404, user don't exist in admin, it will be anonym user
- if 403, user is ban or not associate in the world
2020-10-19 20:49:30 +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
arp
75d9ed8dfa
implemented the admin websocket
...
now send data
2020-10-19 14:23:50 +02:00
David Négrier
a7c16654c3
Deploying with new configurable Jitsi conf
2020-10-19 12:07:05 +02:00
David Négrier
ed1fbb5324
Linting
2020-10-19 11:14:52 +02:00
David Négrier
16d1c2354e
Adding fallback to unauthenticated Jitsi
2020-10-19 11:07:49 +02:00
David Négrier
260b0ea408
Adding JWT authentication to Jitsi
2020-10-16 19:23:28 +02:00
arp
e6bd655527
move most of the logic of IOSocketController into a dedicated class
2020-10-15 18:22:28 +02:00
David Négrier
c75f1edc40
Merge branch 'develop' of github.com:thecodingmachine/workadventure into player-report
...
# Conflicts:
# back/src/Controller/AuthenticateController.ts
2020-10-15 18:01:44 +02:00
David Négrier
267476c651
Removing TODO
2020-10-15 17:59:32 +02:00
David Négrier
2bf795d9c2
Fixing HTTP status code not correctly outputed because of CORS headers
2020-10-15 17:27:40 +02:00
David Négrier
e7890907c1
Merge pull request #331 from thecodingmachine/verifyjwtserverside
...
Adding a new endpoint to verify the JWT token server-side before connecting
2020-10-15 17:02:41 +02:00
David Négrier
4f54c3cd86
Fixing JWT verify
2020-10-15 16:54:04 +02:00
David Négrier
a348001036
Adding a new endpoint to verify the JWT token server-side before connecting
2020-10-15 16:48:42 +02:00
Kharhamel
47275acebb
Merge pull request #327 from thecodingmachine/name8
...
improved textField component and allowed 8 caracter names
2020-10-15 15:27:45 +02:00
arp
d35b3ff5be
extended the exprire duration for jwt token
2020-10-15 14:30:43 +02:00
David Négrier
d098a1b8db
The server now sends regular ping requests to keep connections alive
2020-10-15 13:53:59 +02:00
Gregoire Parant
38d2cc9a8c
Remove teleport feature
2020-10-15 12:12:11 +02:00
Gregoire Parant
8df56204e3
Add teleport event
2020-10-15 11:51:24 +02:00
Gregoire Parant
7b435edd71
Finish report
2020-10-15 10:37:40 +02:00
Gregoire Parant
f6ae7d8d3b
Merge branch 'develop' into player-report
...
# Conflicts:
# back/src/Controller/IoSocketController.ts
2020-10-15 09:44:37 +02:00
arp
a6a51caa93
now fetch the tags from the admin into the nodejs back
2020-10-14 16:50:42 +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
98bda49d7e
Get tags from the admin
...
And uses tag "admin" to choose whether to display the console or not
2020-10-14 11:07:34 +02:00
David Négrier
ce93e5bbaa
Fixing the way rights are sent to the admin (now sending organization/world/room)
2020-10-14 10:37:00 +02:00
Gregoire Parant
f05f4a7f5b
Fix url
2020-10-13 22:19:32 +02:00
Gregoire Parant
3e74e178fb
Fix CI
2020-10-13 21:22:39 +02:00
Gregoire Parant
9c44d37020
Merge remote-tracking branch 'github.com/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 21:14:46 +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