noby/workadventure
2
2
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
822 Commits 1 Branch 0 Tags 26 MiB
9c44d37020
Commit Graph

822 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
9113ef4ff6
Merge pull request #302 from thecodingmachine/roomswitching 
Fixing room switching
 2020-10-13 18:49:45 +02:00
David Négrier
cb159350e9 Fixed room switching 2020-10-13 18:44:50 +02:00
David Négrier
4ca2876b31
Merge pull request #301 from thecodingmachine/room_refactoring 
Refactoring Room.ts to fetch map url automatically from ID
 2020-10-13 17:35:02 +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
Kharhamel
0580c692d1
Merge pull request #300 from thecodingmachine/authorisationMap 
rewrote the authorisation flow
 2020-10-13 16:54:19 +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
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
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
Gregoire Parant
3c2f134e4e Finish report in admin 2020-10-13 09:37:38 +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
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