5e54083f34
Merge pull request #316 from thecodingmachine/develop
...
Deploy to prod
2020-10-14 14:55:24 +02:00
807ccc49d4
Fixing rewriterule with register link in prod
2020-10-14 13:52:02 +02:00
b7340022de
Fixing rewriterule with @ in prod
2020-10-14 13:29:16 +02:00
d32022320e
Merge pull request #306 from thecodingmachine/gettags
...
Adding ADMIN_API_TOKEN to deployment
2020-10-14 13:18:52 +02:00
ff37e0f9b9
Adding ADMIN_API_TOKEN
2020-10-14 12:25:05 +02:00
cf4c608360
Adding ADMIN_API_TOKEN to deployment
2020-10-14 12:00:23 +02:00
a2aea2d387
Merge pull request #305 from thecodingmachine/gettags
...
Get tags from the admin
2020-10-14 11:53:55 +02:00
731ccd8796
Fix CI
2020-10-14 11:48:34 +02:00
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
3710c3cb7d
Merge pull request #303 from thecodingmachine/fixsendrights
...
Fixing the way rights are sent to the admin
2020-10-14 10:54:48 +02:00
ce93e5bbaa
Fixing the way rights are sent to the admin (now sending organization/world/room)
2020-10-14 10:37:00 +02:00
f05f4a7f5b
Fix url
2020-10-13 22:19:32 +02:00
436cde7033
Fixe style media manager and text modale
2020-10-13 21:54:08 +02:00
3e74e178fb
Fix CI
2020-10-13 21:22:39 +02:00
047fa7b594
Merge branch 'player-report-fix-conflict' into player-report
...
# Conflicts:
# back/src/Controller/IoSocketController.ts
2020-10-13 21:16:57 +02:00
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
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
dbaf44e814
Change report flag
...
- Add icon on video
- Permit to have a modal with comment
2020-10-13 19:56:42 +02:00
9113ef4ff6
Merge pull request #302 from thecodingmachine/roomswitching
...
Fixing room switching
2020-10-13 18:49:45 +02:00
cb159350e9
Fixed room switching
2020-10-13 18:44:50 +02:00
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
a2c750dea2
Fix linter
2020-10-13 17:30:53 +02:00
45a2721c5c
Fixing code post rebase
2020-10-13 17:20:20 +02:00
ec93891c6b
Using Room class to load GameScene
2020-10-13 17:10:07 +02:00
aee06da7f9
Refactoring Room.ts to fetch map url automatically from ID
2020-10-13 17:10:07 +02:00
0580c692d1
Merge pull request #300 from thecodingmachine/authorisationMap
...
rewrote the authorisation flow
2020-10-13 16:54:19 +02:00
ccf80c1dd0
added an edge case for the default map url
2020-10-13 16:47:15 +02:00
d98efc0433
lint fixes
2020-10-13 16:23:49 +02:00
94538bfaf4
Adding a /map route and removing /start-map
2020-10-13 15:29:08 +02:00
ac86914d82
Adding /map endpoint to Node API
2020-10-13 15:12:24 +02:00
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
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
3c2f134e4e
Finish report in admin
2020-10-13 09:37:38 +02:00
0731bd39e5
Moving back to using ScenePlugin and adding EntryScene
2020-10-12 18:59:49 +02:00
2852f204f5
Improving error handling upon unknown URL
2020-10-12 17:42:37 +02:00
02c193a262
rewrote the authorisation flow: give more responsability to gameManager and less to gameScene
2020-10-12 16:45:09 +02:00
aeced0c648
create message to report
2020-10-12 11:22:41 +02:00
ad06650920
Merge pull request #290 from thecodingmachine/authorisationMap
...
[WIP] Adding support for authorization in maps
2020-10-09 17:30:38 +02:00
032facb75f
lint fixes
2020-10-09 17:21:46 +02:00
f550c5a775
merge from develop
2020-10-09 17:10:24 +02:00
c5f8b43fec
more fixes
2020-10-09 17:01:34 +02:00
07c17452e7
Merge branch 'develop' into player-report
2020-10-09 16:15:15 +02:00
5e54fc2c26
some fixes
2020-10-09 14:53:18 +02:00
4af46b1b3f
simplified mapUrl parsing
2020-10-08 18:51:24 +02:00
120804e774
Merge pull request #293 from thecodingmachine/responsive_scenes
...
Making scenes responsive
2020-10-08 17:53:54 +02:00
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
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
386b25afa0
Switching customizeScene and gameScene to new ResizableScene
2020-10-08 16:00:29 +02:00
66f3345861
Adding responsive to SelectCharacterScene
2020-10-08 15:10:46 +02:00
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
David Négrier
Gregoire Parant
Kharhamel
arp
dependabot[bot]