Commit Graph

3102 Commits

Author SHA1 Message Date
Kharhamel
5890e72dd5
Merge pull request #471 from thecodingmachine/feat/menu
FEAT: prototype gameMenu, using html dom elements
2020-12-15 16:40:55 +01:00
kharhamel
069f2f1cec FEAT: prototype game menu using html elements, better icon for text chat 2020-12-15 16:37:57 +01:00
Kharhamel
4680c65500
Merge pull request #487 from thecodingmachine/website-demo
Update website
2020-12-15 16:29:36 +01:00
grégoire parant
2e511345f6
Merge pull request #490 from thecodingmachine/startLayerTcm
Add new start layer for TCM
2020-12-15 16:06:45 +01:00
Gregoire Parant
403400b170 Fixe url demo anonymous 2020-12-15 16:03:59 +01:00
Gregoire Parant
973ecb3446 Add new start layer for TCM 2020-12-15 12:54:42 +01:00
Gregoire Parant
22eb941084 Update css and cursor website 2020-12-15 09:17:09 +01:00
Gregoire Parant
794c13c8d5 Fixe url admin 2020-12-15 08:30:02 +01:00
David Négrier
49c7927e9f Load balancing preprod API back servers 2020-12-14 23:12:51 +01:00
David Négrier
c633de5eed Making HTTP and GRPC ports configurable in API server 2020-12-14 22:43:05 +01:00
David Négrier
aeb5dc7922 Add scaling capability to the API servers with this one weird trick
:) This allows spreading rooms on different API servers based on room name.
Note this does provide neither autoscaling nor high availability, but it provides some kind of load balancing.
2020-12-14 22:20:43 +01:00
Gregoire Parant
f8c3a10930 Update website for demo and anonymous conection 2020-12-14 20:27:56 +01:00
David Négrier
7e2e530f9f
Merge pull request #486 from thecodingmachine/doc_for_collides
Adding documentation for "collides" property
2020-12-14 17:01:39 +01:00
David Négrier
8a1a23e82b Adding documentation for "collides" property 2020-12-14 16:53:04 +01:00
David Négrier
855b55903b
Merge pull request #440 from psy/develop
center spawn position in the middle of a tile
2020-12-11 17:36:10 +01:00
David Négrier
053a4449ae
Merge pull request #480 from thecodingmachine/dependabot/npm_and_yarn/pusher/systeminformation-4.30.5
Bump systeminformation from 4.27.11 to 4.30.5 in /pusher
2020-12-11 16:57:53 +01:00
David Négrier
de51f01dc1
Merge pull request #483 from thecodingmachine/dependabot/npm_and_yarn/website/ini-1.3.7
Bump ini from 1.3.5 to 1.3.7 in /website
2020-12-11 16:57:32 +01:00
David Négrier
708790c570
Merge pull request #482 from thecodingmachine/dependabot/npm_and_yarn/front/ini-1.3.7
Bump ini from 1.3.5 to 1.3.7 in /front
2020-12-11 16:57:23 +01:00
David Négrier
378517564a
Merge pull request #481 from thecodingmachine/dependabot/npm_and_yarn/back/ini-1.3.7
Bump ini from 1.3.5 to 1.3.7 in /back
2020-12-11 16:57:10 +01:00
David Négrier
c2ff153bc7
Merge pull request #479 from thecodingmachine/dependabot/npm_and_yarn/pusher/ini-1.3.7
Bump ini from 1.3.5 to 1.3.7 in /pusher
2020-12-11 16:56:47 +01:00
David Négrier
0ecbe1b282
Merge pull request #478 from thecodingmachine/dependabot/npm_and_yarn/messages/ini-1.3.7
Bump ini from 1.3.5 to 1.3.7 in /messages
2020-12-11 16:56:31 +01:00
David Négrier
eec84d13cf Code cleanup 2020-12-11 16:47:59 +01:00
Kharhamel
5e7d33e533
Merge pull request #485 from thecodingmachine/webrtcOutSound
FEAT: now play a sound when a user quit the webrtc group
2020-12-11 16:28:01 +01:00
kharhamel
a1aedaa594 FEAT: now play a sound when a user quit the webrtc group 2020-12-11 16:01:31 +01:00
dependabot[bot]
3b612d9848
Bump ini from 1.3.5 to 1.3.7 in /website
Bumps [ini](https://github.com/isaacs/ini) from 1.3.5 to 1.3.7.
- [Release notes](https://github.com/isaacs/ini/releases)
- [Commits](https://github.com/isaacs/ini/compare/v1.3.5...v1.3.7)

Signed-off-by: dependabot[bot] <support@github.com>
2020-12-11 13:25:50 +00:00
dependabot[bot]
37fba17c20
Bump ini from 1.3.5 to 1.3.7 in /front
Bumps [ini](https://github.com/isaacs/ini) from 1.3.5 to 1.3.7.
- [Release notes](https://github.com/isaacs/ini/releases)
- [Commits](https://github.com/isaacs/ini/compare/v1.3.5...v1.3.7)

Signed-off-by: dependabot[bot] <support@github.com>
2020-12-11 13:25:44 +00:00
dependabot[bot]
a4f6ae7247
Bump systeminformation from 4.27.11 to 4.30.5 in /pusher
Bumps [systeminformation](https://github.com/sebhildebrandt/systeminformation) from 4.27.11 to 4.30.5.
- [Release notes](https://github.com/sebhildebrandt/systeminformation/releases)
- [Changelog](https://github.com/sebhildebrandt/systeminformation/blob/master/CHANGELOG.md)
- [Commits](https://github.com/sebhildebrandt/systeminformation/compare/v4.27.11...v4.30.5)

Signed-off-by: dependabot[bot] <support@github.com>
2020-12-11 13:25:43 +00:00
dependabot[bot]
d39dab3085
Bump ini from 1.3.5 to 1.3.7 in /back
Bumps [ini](https://github.com/isaacs/ini) from 1.3.5 to 1.3.7.
- [Release notes](https://github.com/isaacs/ini/releases)
- [Commits](https://github.com/isaacs/ini/compare/v1.3.5...v1.3.7)

Signed-off-by: dependabot[bot] <support@github.com>
2020-12-11 13:25:43 +00:00
dependabot[bot]
9b6a7e651b
Bump ini from 1.3.5 to 1.3.7 in /pusher
Bumps [ini](https://github.com/isaacs/ini) from 1.3.5 to 1.3.7.
- [Release notes](https://github.com/isaacs/ini/releases)
- [Commits](https://github.com/isaacs/ini/compare/v1.3.5...v1.3.7)

Signed-off-by: dependabot[bot] <support@github.com>
2020-12-11 13:25:43 +00:00
dependabot[bot]
1923ad185d
Bump ini from 1.3.5 to 1.3.7 in /messages
Bumps [ini](https://github.com/isaacs/ini) from 1.3.5 to 1.3.7.
- [Release notes](https://github.com/isaacs/ini/releases)
- [Commits](https://github.com/isaacs/ini/compare/v1.3.5...v1.3.7)

Signed-off-by: dependabot[bot] <support@github.com>
2020-12-11 13:25:41 +00:00
David Négrier
e2c81c4eb1
Merge pull request #432 from thecodingmachine/scaling
Adding "pusher" container to add scaling capability
2020-12-11 14:24:57 +01:00
David Négrier
2122014947 Merge branch 'develop' of github.com:thecodingmachine/workadventure into scaling
# Conflicts:
#	front/src/Phaser/Game/GameScene.ts
2020-12-11 13:06:10 +01:00
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