Commit graph

1100 commits

Author SHA1 Message Date
David Négrier 6f2c319785 Merge branch 'master' of github.com:thecodingmachine/workadventure into scaling
# Conflicts:
#	back/src/Services/SocketManager.ts
#	deeployer.libsonnet
#	docker-compose.yaml
#	front/src/Connexion/RoomConnection.ts
#	front/src/Enum/EnvironmentVariable.ts
#	front/src/Phaser/Game/GameScene.ts
#	front/webpack.config.js
#	pusher/src/Controller/IoSocketController.ts
2020-12-11 13:00:11 +01:00
David Négrier 10e1400fc0 Fixing Uploader build 2020-12-11 12:37:11 +01:00
David Négrier ea3aa3d128 Reimplementing ban/unban/messages 2020-12-11 12:23:50 +01:00
DESKTOP-V1PKLGR\npegu b1f1942807 Fix some issues on map 2020-12-11 09:04:09 +01:00
DESKTOP-V1PKLGR\npegu 132617bbd0 Add floor2 and update floor0 and floor1 #3 2020-12-10 22:58:30 +01:00
DESKTOP-V1PKLGR\npegu 6e6c103a8d Add floor2 and update floor0 and floor1 #2 2020-12-10 22:44:50 +01:00
DESKTOP-V1PKLGR\npegu 0d530e18ce Add floor2 and update floor0 and floor1 2020-12-10 19:51:35 +01:00
David Négrier 24cb85cc7c Adapting admin connection to pusher.
Done: onUserLeave / onUserEnter
To be done: ban / unban
2020-12-10 17:46:15 +01:00
DESKTOP-V1PKLGR\npegu eabd1d1b2f Change stairs for floor 0 2020-12-10 08:59:13 +01:00
DESKTOP-V1PKLGR\npegu 958ec51b12 Change map floor 1 Fixes 2020-12-09 23:50:30 +01:00
DESKTOP-V1PKLGR\npegu 7d62d64e17 Change map floor 1 2020-12-09 23:20:13 +01:00
David Négrier bf797085e6 Extracting FileController into a Uploader container 2020-12-09 21:29:29 +01:00
DESKTOP-V1PKLGR\npegu 87519a1ad3 Add Xmas decorations #2 2020-12-09 18:04:52 +01:00
David Négrier 25f9662b3c Putting 2 replicas for pusher containers 2020-12-09 17:54:37 +01:00
David Négrier f4ed26739f Specifying HTTP port for API 2020-12-09 17:45:05 +01:00
David Négrier 95df242f9c Specifying HTTP port for API 2020-12-09 17:37:52 +01:00
David Négrier 5c59470a04 Opening port 50051 on back in K8S 2020-12-09 17:25:10 +01:00
David Négrier b12e07d353 Fixing pusher dockerfile 2020-12-09 16:36:50 +01:00
David Négrier 1a5078f87d Fixing pusher build + building in CI 2020-12-09 16:33:59 +01:00
David Négrier ff17cb99d6 Cleaning up pusher 2020-12-09 16:07:06 +01:00
David Négrier f40d8024f2 Fixing deploy 2020-12-09 15:27:52 +01:00
David Négrier a59e40fc8e Fixing deployment 2020-12-09 15:19:22 +01:00
David Négrier 1bb0ff4b23 Fixing deploy 2020-12-09 13:50:18 +01:00
DESKTOP-V1PKLGR\npegu add584f9a0 Add Wmas decorations 2020-12-08 19:52:27 +01:00
David Négrier bd38dd5ede Fixing unit tests in back 2020-12-08 18:37:15 +01:00
DESKTOP-V1PKLGR\npegu a7a5990479 Change the information page at the entrance and add inscriptions on the floor 2020-12-07 19:22:25 +01:00
DESKTOP-V1PKLGR\npegu c897bd192d Fix exit_lyon URL 2020-12-07 14:15:07 +01:00
DESKTOP-V1PKLGR\npegu da17da9613 Fix some details on collides 2020-12-07 09:19:31 +01:00
DESKTOP-V1PKLGR\npegu 0a415248c0 Change the TCM map to create a new style with more quality 2020-12-07 01:07:46 +01:00
David Négrier 5d188e51b2 Cleanup of useless files 2020-12-04 17:26:12 +01:00
David Négrier 10ee00e08a Improving benchmark measures 2020-12-04 15:13:46 +01:00
David Négrier ea6a8ff406 Adding pusher to K8S deploy 2020-12-04 15:13:35 +01:00
David Négrier e89ed8cca8 Fixing benchmark 2020-12-03 17:19:56 +01:00
David Négrier a19edd4dc1 Fixing reconnection to server on back failure 2020-12-03 16:39:44 +01:00
David Négrier 2fba6956a6 Fixing typo in doc 2020-12-02 17:51:59 +01:00
David Négrier 5a0dfdb1d5 Fixing missing uuid in back 2020-12-02 17:51:46 +01:00
David Négrier 699d5f418a
Merge pull request #472 from thecodingmachine/hotfix/privateAnonymousLogin
FIX: couldn't access to an anonymous private map
2020-12-01 19:36:21 +01:00
kharhamel 1971d26dc0 FIX: couldn't access to an anonymous private map 2020-12-01 19:34:36 +01:00
Kharhamel d36cec23a7
Merge pull request #463 from thecodingmachine/hotfix/timeouts
Hotfix/timeouts
2020-11-30 11:43:36 +01:00
kharhamel 28b0229c76 FIX: disabled pingCameraStatus and reduced the amount of errors thrown in console 2020-11-27 17:06:47 +01:00
David Négrier 4c1e566a6c Adding a Pusher container as a middleware/dispatcher between front and back 2020-11-26 17:53:30 +01:00
Kharhamel 5c18f22f1d
Merge pull request #459 from thecodingmachine/hotfix/pushRoomIDToUrl
FIX: room id is now pushed to the url
2020-11-25 17:53:45 +01:00
kharhamel 65785240e1 FIX: room id is now pushed to the url 2020-11-25 17:17:48 +01:00
Kharhamel 48b856f836
Merge pull request #455 from thecodingmachine/develop
deployment
2020-11-24 18:29:43 +01:00
Kharhamel 4aa4a8d552
Merge pull request #435 from thecodingmachine/fix/rightColumn
Rewrite the way exit detection work
2020-11-24 14:51:28 +01:00
kharhamel 540f69267b FIX: maps/dist directory is now gitignored 2020-11-24 14:43:21 +01:00
kharhamel 8d8b879ed6 FIX: the game now uses the url hash to choose the start layer 2020-11-24 14:43:21 +01:00
kharhamel 09d6d22a5d FIX: rewrote the way scene exits are triggered 2020-11-24 14:43:21 +01:00
grégoire parant c5af6df7fa
Merge pull request #448 from thecodingmachine/report-button
Report button discussion
2020-11-23 20:48:52 +01:00
grégoire parant c3d4c668e2
Merge pull request #384 from thecodingmachine/action-button
Action button
2020-11-23 20:44:46 +01:00