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

284 commits

Author SHA1 Message Date
David Négrier 267476c651 Removing TODO 2020-10-15 17:59:32 +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
David Négrier aee06da7f9 Refactoring Room.ts to fetch map url automatically from ID 2020-10-13 17:10:07 +02:00
arp d98efc0433 lint fixes 2020-10-13 16:23:49 +02:00
David Négrier 94538bfaf4 Adding a /map route and removing /start-map 2020-10-13 15:29:08 +02:00
David Négrier ac86914d82 Adding /map endpoint to Node API 2020-10-13 15:12:24 +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
Gregoire Parant 3c2f134e4e Finish report in admin 2020-10-13 09:37:38 +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
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 f542b117a8 Refactoring connection to pass room info on connect 2020-10-06 18:11:42 +02:00
arp 0b78eb6277 temp 2020-10-06 15:37:00 +02:00
David Négrier e1193ad95a Fixing console removal 2020-10-01 17:16:36 +02:00
David Négrier f06abfae4c Migrating to uuid v4 2020-10-01 16:51:51 +02:00
David Négrier e4872c6f9d Fix CI 2020-10-01 15:55:23 +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 a8bbe04cae Adding logs to track overheating 2020-09-30 14:42:35 +02:00
David Négrier 57262de1bf Fixing CI + lowering extrapolation time 2020-09-30 13:49:23 +02:00
David Négrier a87cdc543b Adding CPU tracking: if CPU > 80%, ignore position of moving players 2020-09-30 12:50:34 +02:00
David Négrier 27871641aa Removing dead code 2020-09-30 12:17:27 +02:00
David Négrier d9c910cfca Removing useless code 2020-09-30 12:16:39 +02:00
David Négrier c7f5770968 Fix CI 2020-09-30 10:17:01 +02:00
David Négrier 5de2f61231 Adding back authentication to uws websocket 2020-09-30 10:12:40 +02:00
David Négrier e9b538e43c Fixing import 2020-09-29 17:30:38 +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 a37557dd4b Fixing tests 2020-09-29 16:27:41 +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 a9b1313d39 Cleanup 2020-09-29 10:57:14 +02:00
David Négrier 2cea0e490b Fixing disconnect call 2020-09-29 09:45:47 +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