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

484 commits

Author SHA1 Message Date
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
David Négrier 702084b00a
Merge pull request #330 from thecodingmachine/exiturl 
Adding exitUrl property
 2020-10-15 16:00:50 +02:00
David Négrier 2fe61ce11b
Merge pull request #329 from thecodingmachine/fixhistory 
Fixing URL not being rewritten when changing maps
 2020-10-15 15:52:01 +02:00
David Négrier 36d73333f5 Adding exitUrl property 
The exitUrl property can be applied on a layer to link to any kind of room (private or public)
 2020-10-15 15:50:51 +02:00
David Négrier 517b3a644b Fixing URL not being rewritten when changing maps 2020-10-15 14:35:09 +02:00
arp 67a9bd2520 improved textField component and allowed 8 caracter names 2020-10-15 14:23:39 +02:00
Gregoire Parant 62dfb68aaf Update style report modal 2020-10-15 12:24:16 +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 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
David Négrier 731ccd8796 Fix CI 2020-10-14 11:48:34 +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 436cde7033 Fixe style media manager and text modale 2020-10-13 21:54:08 +02:00
Gregoire Parant 047fa7b594 Merge branch 'player-report-fix-conflict' into player-report 
# Conflicts:
#	back/src/Controller/IoSocketController.ts
 2020-10-13 21:16:57 +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 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 cb159350e9 Fixed room switching 2020-10-13 18:44:50 +02:00
David Négrier a2c750dea2 Fix linter 2020-10-13 17:30:53 +02:00
David Négrier 45a2721c5c Fixing code post rebase 2020-10-13 17:20:20 +02:00
David Négrier ec93891c6b Using Room class to load GameScene 2020-10-13 17:10:07 +02:00
David Négrier aee06da7f9 Refactoring Room.ts to fetch map url automatically from ID 2020-10-13 17:10:07 +02:00
arp ccf80c1dd0 added an edge case for the default map url 2020-10-13 16:47:15 +02:00
arp d98efc0433 lint fixes 2020-10-13 16:23:49 +02:00
Gregoire Parant 65406f844e Teleport notification 
- Create end point to permit the teleport notification. The map url will be /teleport/token_user
- Create message teleport
- Create receive feature in phaser to teleport

TODO
Teleport player on black room.
 2020-10-13 11:39:07 +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
David Négrier 0731bd39e5 Moving back to using ScenePlugin and adding EntryScene 2020-10-12 18:59:49 +02:00
David Négrier 2852f204f5 Improving error handling upon unknown URL 2020-10-12 17:42:37 +02:00
arp 02c193a262 rewrote the authorisation flow: give more responsability to gameManager and less to gameScene 2020-10-12 16:45:09 +02:00
Gregoire Parant aeced0c648 create message to report 2020-10-12 11:22:41 +02:00
arp 032facb75f lint fixes 2020-10-09 17:21:46 +02:00
arp f550c5a775 merge from develop 2020-10-09 17:10:24 +02:00
arp c5f8b43fec more fixes 2020-10-09 17:01:34 +02:00
Gregoire Parant 07c17452e7 Merge branch 'develop' into player-report 2020-10-09 16:15:15 +02:00
arp 5e54fc2c26 some fixes 2020-10-09 14:53:18 +02:00
arp 4af46b1b3f simplified mapUrl parsing 2020-10-08 18:51:24 +02:00
David Négrier 120804e774
Merge pull request #293 from thecodingmachine/responsive_scenes 
Making scenes responsive
 2020-10-08 17:53:54 +02:00
David Négrier 386b25afa0 Switching customizeScene and gameScene to new ResizableScene 2020-10-08 16:00:29 +02:00
David Négrier 66f3345861 Adding responsive to SelectCharacterScene 2020-10-08 15:10:46 +02:00
arp 5ac2083995 updated quill in front to 1.3.7 2020-10-08 11:48:49 +02:00
David Négrier 79b5c5de93 Making login scene responsive 2020-10-07 18:03:34 +02:00
Gregoire Parant c63fb6ed6f Add image to report and to teleport player 2020-10-06 23:56:27 +02:00
David Négrier f542b117a8 Refactoring connection to pass room info on connect 2020-10-06 18:11:42 +02:00
David Négrier 1061c80f1f Fixing connection closing 2020-10-01 17:16:49 +02:00
David Négrier e1193ad95a Fixing console removal 2020-10-01 17:16:36 +02:00
David Négrier 8bc5832eac Removing warning on startup 2020-10-01 17:15:33 +02:00
David Négrier 9563013f48 Removing useless file 2020-10-01 16:02:45 +02:00
David Négrier d3fa901691 Merge branch 'develop' of github.com:thecodingmachine/workadventure into feature/global-message 
+ migrating to protobuf messages

# Conflicts:
#	back/src/App.ts
#	back/src/Controller/IoSocketController.ts
#	back/yarn.lock
#	front/src/Connection.ts
#	front/src/Phaser/Game/GameScene.ts
#	front/src/Phaser/Login/EnableCameraScene.ts
#	front/src/WebRtc/SimplePeer.ts
 2020-10-01 14:11:34 +02:00
David Négrier 57262de1bf Fixing CI + lowering extrapolation time 2020-09-30 13:49:23 +02:00
David Négrier 074398c4e0 Fixing benchmark initialization 2020-09-30 12:12:24 +02:00
David Négrier 53c6c2bc30 Fixing benchmark 2020-09-29 17:24:16 +02:00
David Négrier 9f3577286d Merge branch 'develop' of github.com:thecodingmachine/workadventure into uws 
# Conflicts:
#	back/src/Controller/AdminController.ts
#	back/src/Controller/AuthenticateController.ts
#	back/src/Controller/IoSocketController.ts
#	back/src/Controller/MapController.ts
#	benchmark/index.ts
#	front/src/Connexion/RoomConnection.ts
 2020-09-29 17:12:28 +02:00
David Négrier 432b4a0e85 Linting app 2020-09-29 16:12:17 +02:00
David Négrier b485c9bf46 Switching WebRTC to protobuf + uws 2020-09-29 16:01:22 +02:00
David Négrier 6a4c0c8678 Migrating to uWS 2020-09-28 18:52:54 +02:00
arp 3f9659ef3c improvments 2020-09-28 15:40:34 +02:00
arp af4611ed29 rewrote the login workflow 2020-09-25 19:23:33 +02:00
David Négrier ac80850335 Switching SetViewport to protobuf 2020-09-24 17:36:10 +02:00
David Négrier 24a6cd7f8e Switched ITEM_EVENT to protobuf 2020-09-24 17:24:37 +02:00
David Négrier cd083a2090 Merge branch 'develop' of github.com:thecodingmachine/workadventure into protobuf 
# Conflicts:
#	back/package.json
 2020-09-24 16:22:16 +02:00
David Négrier 0c4c43f88c Adding USER_LEFT message to protobuf 2020-09-24 16:11:47 +02:00
David Négrier 2dad601311 Adding JOIN_ROOM message in protobuf 2020-09-24 14:50:28 +02:00
David Négrier d7209d8864 Migrating messages locally into back and front 2020-09-24 11:16:08 +02:00
David Négrier b4f971c501 Switched group position to protobuf 2020-09-24 10:05:16 +02:00
Gregoire Parant 7f4014cccf Fix CI 2020-09-23 19:07:45 +02:00
Gregoire Parant 7584c3a04d Fix CI 2020-09-23 18:44:24 +02:00
Gregoire Parant 3cb079c80c Fix CI 2020-09-23 18:37:54 +02:00
Gregoire Parant d5fdb9d857 Fix style 2020-09-23 18:07:31 +02:00
Gregoire Parant bcb126a146 Merge branch 'develop' into feature/global-message 
# Conflicts:
#	back/src/App.ts
 2020-09-23 17:26:00 +02:00
Gregoire Parant 942d2cbcef Refactor and remove prevent default keyboard 2020-09-23 17:22:00 +02:00
Gregoire Parant 8c43c67741 Create feature to send and read audio message 2020-09-21 15:00:39 +02:00
David Négrier 76d3779438 Moved GroupUpdateMessage to protobuf 2020-09-21 11:24:03 +02:00
arp a19f09bef2 improve the register workflow 2020-09-21 10:51:48 +02:00
Gregoire Parant 16b3e48711 Add menu to switch 2020-09-21 01:16:10 +02:00
Gregoire Parant 1829912c91 Fix remove last childnode 2020-09-21 00:42:39 +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 844bffa988 Create file controller to upload audio document 2020-09-20 19:01:21 +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
David Négrier b148ca3708 Linting 2020-09-18 18:16:26 +02:00
David Négrier d2a5060ad2 Using multistage builds with protocol buffers 2020-09-18 18:00:03 +02:00
David Négrier d3116c7400 Building proto messages in CI 2020-09-18 17:51:12 +02:00
David Négrier 5c0a4e7c5a Fixing front Dockerfile 2020-09-18 17:39:59 +02:00
David Négrier 7826b2ea8d Fixing Docker build images to add new messages directory 2020-09-18 17:22:45 +02:00
David Négrier df0636c513 Migrating user position messages to protobuf 2020-09-18 15:51:15 +02:00
David Négrier e9ca8721a6 Migrating userId to "int32" to save some space and adding userMoves message in protobuf 2020-09-18 13:57:38 +02:00
arp ed9552b62b added a register route via token 2020-09-17 18:21:49 +02:00
David Négrier 4b55b54a07 Adding first protobuf message exchange 2020-09-17 17:14:47 +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 f5f9dcac04 Making groups part of zones 2020-09-16 16:06:43 +02:00
David Négrier 3a9196fb82 Merge 2020-09-16 11:41:03 +02:00
David Négrier d24ec0bd75 Plugin PositionNotifier into the main application. 2020-09-15 16:21:41 +02:00
David Négrier f8d462b0d7 Fixing "any" type 2020-09-15 10:10:35 +02:00
David Négrier 9b702c75e3 Adding batched messages + the notion of notifier / zones (not plugged in the system yet) 2020-09-15 10:06:11 +02:00
David Négrier e418e8fd09 Setting the depth of the chat mode / presentation mode to 99999 to avoid melting buttons with map. 2020-09-10 09:31:53 +02:00