Commit Graph

3005 Commits

Author SHA1 Message Date
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
Kharhamel
ad06650920
Merge pull request #290 from thecodingmachine/authorisationMap
[WIP] Adding support for authorization in maps
2020-10-09 17:30:38 +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
12aecaff06
Merge pull request #296 from thecodingmachine/dependabot/npm_and_yarn/website/elliptic-6.5.3
Bump elliptic from 6.4.1 to 6.5.3 in /website
2020-10-08 16:03:53 +02:00
David Négrier
2ff11d4629
Merge pull request #297 from thecodingmachine/dependabot/npm_and_yarn/website/lodash-4.17.20
Bump lodash from 4.17.15 to 4.17.20 in /website
2020-10-08 16:03:14 +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
dependabot[bot]
607b495644
Bump lodash from 4.17.15 to 4.17.20 in /website
Bumps [lodash](https://github.com/lodash/lodash) from 4.17.15 to 4.17.20.
- [Release notes](https://github.com/lodash/lodash/releases)
- [Commits](https://github.com/lodash/lodash/compare/4.17.15...4.17.20)

Signed-off-by: dependabot[bot] <support@github.com>
2020-10-08 10:04:31 +00:00
dependabot[bot]
78e7f481d5
Bump elliptic from 6.4.1 to 6.5.3 in /website
Bumps [elliptic](https://github.com/indutny/elliptic) from 6.4.1 to 6.5.3.
- [Release notes](https://github.com/indutny/elliptic/releases)
- [Commits](https://github.com/indutny/elliptic/compare/v6.4.1...v6.5.3)

Signed-off-by: dependabot[bot] <support@github.com>
2020-10-08 10:04:29 +00:00
Kharhamel
08403ac007
Merge pull request #295 from thecodingmachine/securityUpdates
updated quill in front to 1.3.7
2020-10-08 12:03:31 +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
arp
0b78eb6277 temp 2020-10-06 15:37:00 +02:00
David Négrier
8773989bbe
Merge pull request #285 from thecodingmachine/fixdisconnect
Fixing disconnect triggering reconnect
2020-10-01 17:20:55 +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
f06abfae4c Migrating to uuid v4 2020-10-01 16:51:51 +02:00
David Négrier
1270ae6817
Merge pull request #278 from thecodingmachine/feature/global-message
Initialise global message
2020-10-01 16:11:47 +02:00
David Négrier
9563013f48 Removing useless file 2020-10-01 16:02:45 +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
e42f1a6a21
Merge pull request #284 from thecodingmachine/uws
Migrating to uWS
2020-09-30 14:51:36 +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
074398c4e0 Fixing benchmark initialization 2020-09-30 12:12:24 +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