Kharhamel
|
f70f0a58a9
|
Merge pull request #424 from thecodingmachine/fix/coWebsiteBlocking
FIX: more cowebsite fixes
|
2020-11-17 14:58:13 +01:00 |
|
kharhamel
|
3d8d8cc3a9
|
FIX: more cowebsite fixes
|
2020-11-16 16:15:21 +01:00 |
|
David Négrier
|
1b58356919
|
Merge pull request #419 from thecodingmachine/update-resolution
Update resolution
|
2020-11-16 15:47:22 +01:00 |
|
Gregoire Parant
|
1570ef9663
|
Merge branch 'develop' into windows-focus-blur-camera
# Conflicts:
# front/src/Phaser/Game/GameScene.ts
|
2020-11-16 15:46:52 +01:00 |
|
Gregoire Parant
|
b0bd4c5f40
|
Merge remote-tracking branch 'github.com/develop' into feature-discussion
|
2020-11-16 15:43:28 +01:00 |
|
David Négrier
|
c7031c7c54
|
Merge pull request #411 from thecodingmachine/fix-#314
Fix init position and trigger layers properties
|
2020-11-16 15:24:21 +01:00 |
|
Gregoire Parant
|
2d0fc1072f
|
Fix feedback
|
2020-11-16 15:05:51 +01:00 |
|
Gregoire Parant
|
0fc57f3548
|
Change resolution
|
2020-11-14 14:04:11 +01:00 |
|
Kharhamel
|
40e9570cdc
|
Merge pull request #418 from thecodingmachine/fix/coWebsiteBlocking
FIX: the jitsi iframe promise now throw an error if it cannot load in 10 secondes
|
2020-11-13 18:28:31 +01:00 |
|
kharhamel
|
2a6b2e0cbf
|
FIX: the jitsi iframe promise now throw an error if it cannot load in 10 secondes
|
2020-11-13 18:08:43 +01:00 |
|
David Négrier
|
6ece5e543b
|
Merge pull request #417 from gparant/webpack-env
Webpack env
|
2020-11-13 12:47:23 +01:00 |
|
Gregoire Parant
|
733efd4a03
|
Add env admin url in webpack
|
2020-11-13 12:41:49 +01:00 |
|
David Négrier
|
a5024650c9
|
Merge pull request #416 from gparant/env-admin-url
Create new env admin url
|
2020-11-13 12:23:13 +01:00 |
|
David Négrier
|
b888acdc15
|
Merge pull request #415 from thecodingmachine/hotfix/adminSocket
HOTFIX: fixed server crash on /map
|
2020-11-13 12:18:46 +01:00 |
|
kharhamel
|
0a2e967eca
|
HOTFIX: fixed a server when trying to connect to the adminRoomSocket
|
2020-11-13 12:15:58 +01:00 |
|
Gregoire Parant
|
ebfe08fb92
|
Create new env admin url
|
2020-11-13 12:15:33 +01:00 |
|
kharhamel
|
3c0f61d3b3
|
HOTFIX: fixed server crash on /map
|
2020-11-13 12:11:59 +01:00 |
|
Kharhamel
|
74ec363449
|
Merge pull request #413 from thecodingmachine/nbRoomsGauge
FEAT: added a prometheus gauge for the number of active rooms
|
2020-11-12 14:56:01 +01:00 |
|
kharhamel
|
b064f01f97
|
FEAT: added a prometheus gauge for the number of active rooms
|
2020-11-12 14:51:19 +01:00 |
|
Kharhamel
|
6c6d046891
|
Merge pull request #401 from kidager/qwerty-support
Add support for QWERTY keyboards
|
2020-11-12 10:32:58 +01:00 |
|
Kharhamel
|
b468f03603
|
Merge pull request #412 from thecodingmachine/fix/iHatePong
FIX: remove the ping and pong overrides server side
|
2020-11-12 10:28:02 +01:00 |
|
kharhamel
|
9b64a970b5
|
FIX: remove the ping and pong overrides server side in favor of and idleTimeout and added a manual ping client side
|
2020-11-10 18:26:46 +01:00 |
|
Gregoire Parant
|
73fa0ecbfc
|
Fix init position and trigger layers properties
|
2020-11-10 17:00:23 +01:00 |
|
David Négrier
|
ed527f5e72
|
Merge pull request #409 from thecodingmachine/fix/cowebsiteConflicts
Fix/cowebsite conflicts
|
2020-11-10 15:54:27 +01:00 |
|
Gregoire Parant
|
8412575c40
|
Merge branch 'develop' into windows-focus-blur-camera
# Conflicts:
# front/src/WebRtc/MediaManager.ts
|
2020-11-10 15:27:22 +01:00 |
|
kharhamel
|
5a1147866c
|
FIX: in dev mode, sockets won't be closed to prevent conflicts with live-reloading
|
2020-11-10 15:24:02 +01:00 |
|
kharhamel
|
1080328afa
|
FIX: cowebsite transitions are now queued to prevent conflicts
|
2020-11-10 15:22:30 +01:00 |
|
Gregoire Parant
|
b75f28d3ca
|
Merge branch 'develop' into feature-discussion
# Conflicts:
# front/src/WebRtc/MediaManager.ts
|
2020-11-10 15:15:24 +01:00 |
|
David Négrier
|
0a52d924fa
|
Merge pull request #408 from thecodingmachine/fix-#386
Fix error get media stream camera
|
2020-11-10 14:44:47 +01:00 |
|
Gregoire Parant
|
142566dfde
|
Fix error get media stream camera
Fix error camera when user have not cam on computer
|
2020-11-10 14:03:29 +01:00 |
|
Gregoire Parant
|
694f5d692f
|
Merge branch 'develop' into windows-focus-blur-camera
|
2020-11-10 13:07:08 +01:00 |
|
Gregoire Parant
|
76014e3dc1
|
Merge branch 'develop' into action-button
|
2020-11-10 13:06:47 +01:00 |
|
Gregoire Parant
|
0acbe20bbf
|
Fix name send in message
|
2020-11-10 13:00:14 +01:00 |
|
Gregoire Parant
|
3333b3cee3
|
Fix feedback moufmouf
|
2020-11-10 12:38:32 +01:00 |
|
Gregoire Parant
|
f837f1a31f
|
Merge branch 'develop' into feature-discussion
|
2020-11-10 11:50:41 +01:00 |
|
Kharhamel
|
21d2e6aa69
|
Merge pull request #400 from thecodingmachine/fix/disconnect
FIX: the server now closes the socket after 30s of no pong
|
2020-11-09 15:38:44 +01:00 |
|
Jacem Chaieb
|
c4f28a0a8d
|
Add support for QWERTY keyboards
|
2020-11-09 12:24:45 +01:00 |
|
kharhamel
|
85f2dabe6c
|
FIX: the server now closes the socket after 30s of no pong
|
2020-11-09 12:12:52 +01:00 |
|
David Négrier
|
a14e227706
|
Merge pull request #399 from thecodingmachine/fix/cowebsite
FIX: close the coWebSite on network error
|
2020-11-09 11:27:52 +01:00 |
|
kharhamel
|
760708948f
|
FIX: close the coWebSite on network error
|
2020-11-09 11:16:54 +01:00 |
|
David Négrier
|
00b83ae349
|
Merge branch 'develop' of github.com:thecodingmachine/workadventure into windows-focus-blur-camera
|
2020-11-06 17:36:43 +01:00 |
|
David Négrier
|
b817d5e126
|
Merge pull request #398 from thecodingmachine/master
Backporting website changes
|
2020-11-06 17:35:08 +01:00 |
|
David Négrier
|
b2a6b3c242
|
Merge pull request #396 from thecodingmachine/website-typos-changes
Website typos changes
|
2020-11-06 17:34:20 +01:00 |
|
David Négrier
|
71e2c92f7b
|
Update website/dist/create-map.html
|
2020-11-06 16:46:28 +01:00 |
|
David Négrier
|
d0f643cfa6
|
Update website/dist/choose-map.html
|
2020-11-06 16:46:22 +01:00 |
|
kevin
|
467cf3260f
|
change 'play private' to 'work in privtae', fix broken html, add homepage link in inner pages
|
2020-11-06 06:57:56 +01:00 |
|
kevin
|
8e1e2596e5
|
changing typos on Home Page
|
2020-11-05 23:17:58 +01:00 |
|
David Négrier
|
8dfdee85ea
|
Merge branch 'develop' of github.com:thecodingmachine/workadventure into action-button
|
2020-11-05 16:47:56 +01:00 |
|
David Négrier
|
8960efca71
|
Merge branch 'develop' of github.com:thecodingmachine/workadventure into feature-discussion
|
2020-11-05 16:47:41 +01:00 |
|
David Négrier
|
2258d8323b
|
Merge pull request #395 from thecodingmachine/fixwithoutadmin
Fixing deployment of WA without admin
|
2020-11-05 16:47:12 +01:00 |
|