Kharhamel
5833629469
Merge pull request #784 from thecodingmachine/betterGlobalMessage
...
FEATURE: better implementation of the admin global message
2021-03-04 18:10:52 +01:00
kharhamel
ad7e16c33b
FEATURE: better implementation of the admin global message
2021-03-04 16:18:06 +01:00
grégoire parant
df610aa01b
Merge pull request #785 from thecodingmachine/updatePrivateAccess
...
Update private access
2021-03-02 14:35:39 +01:00
Gregoire Parant
915d945dd5
Fix ci
2021-03-01 22:32:50 +01:00
Gregoire Parant
30f4793342
Update private access
2021-03-01 22:21:52 +01:00
David Négrier
e0540790e1
Translating button
2021-03-01 14:36:18 +01:00
David Négrier
48c13119bd
Merge pull request #776 from s00500/fix_report_menu
...
Fix report userId in report menu
2021-02-27 23:16:23 +01:00
Lukas Bachschwell
2772d72eba
Fix report userId in report menu
...
Signed-off-by: Lukas Bachschwell <lukas@lbsfilm.at>
2021-02-24 21:32:16 +01:00
David Négrier
6e9c715980
Merge pull request #739 from t10r/fix/multi-user-videochat-mode
...
fix multi user videochat mode
2021-02-19 14:54:38 +01:00
David Négrier
3eec41a1d0
Merge pull request #762 from thecodingmachine/develop
...
Deploy 2021-02-18
2021-02-18 20:10:55 +01:00
David Négrier
6f06b92395
Merge pull request #760 from thecodingmachine/turncredentials
...
Fixing screensharing Coturn credentials
2021-02-18 14:09:33 +01:00
David Négrier
13a20a0ef0
Fixing screensharing Coturn credentials
...
When screensharing is initiated by the user, we previously did not send the correct Coturn credentials.
We now send the last credentials received from the Video stream.
2021-02-18 11:52:30 +01:00
grégoire parant
b5514e6e48
Merge pull request #759 from thecodingmachine/jitsiConfig
...
Fix last properties changed after trigger change position
2021-02-18 11:37:41 +01:00
Gregoire Parant
772c3174be
Fix last properties changed after trigger change position
2021-02-18 11:32:37 +01:00
grégoire parant
3a1b2490ef
Merge pull request #758 from thecodingmachine/jitsiConfig
...
Jitsi config
2021-02-18 10:12:16 +01:00
Gregoire Parant
80449e9a96
Change json map test
2021-02-18 10:00:13 +01:00
Gregoire Parant
8a2954eab9
Fix new conf feature
2021-02-18 09:38:27 +01:00
grégoire parant
13078489c6
Merge pull request #757 from thecodingmachine/jitsiConfig
...
Merge Jitsi config
2021-02-17 20:34:31 +01:00
Gregoire Parant
5ddf909fe6
Remove unless export constante
2021-02-17 20:26:33 +01:00
grégoire parant
c3286e61cf
Merge pull request #655 from thecodingmachine/exitTriggerAction
...
Message trigger action
2021-02-17 19:47:46 +01:00
Gregoire Parant
fff0cbc3f6
Revert message exit
2021-02-17 19:40:00 +01:00
Gregoire Parant
9b7b3eb140
Update feedback @tabascoeye
2021-02-17 19:31:05 +01:00
Gregoire Parant
ce423c9fec
Remove exit trigger action
2021-02-17 19:29:59 +01:00
Gregoire Parant
83fc7d0cc0
Merge branch 'develop' into exitTriggerAction
...
# Conflicts:
# front/src/Phaser/Game/GameScene.ts
2021-02-17 19:28:41 +01:00
Gregoire Parant
baae1e8125
Update to restore previous config
2021-02-17 19:21:37 +01:00
Gregoire Parant
e8b1b286a3
Merge Jitsi config
2021-02-17 18:49:55 +01:00
David Négrier
36a713ec91
Merge pull request #754 from thecodingmachine/develop
...
Deploy 2021-02-16
2021-02-16 20:28:39 +01:00
David Négrier
ae1d00c828
Merge pull request #736 from MisterErwin/patch-1
...
Fix offsets of SpeechBubble.ts
2021-02-16 20:02:03 +01:00
David Négrier
43b48ce555
Merge pull request #737 from MisterErwin/patch-2
...
Do not change rooms if scene failed to load
2021-02-16 20:01:00 +01:00
David Négrier
ddcb5ede59
Merge pull request #742 from znerol-forks/fix/huge-jitsi-url
...
Fix jitsi URLs growing indefinitely in length
2021-02-16 19:52:56 +01:00
David Négrier
9affa36608
Merge pull request #746 from thecodingmachine/turncredentials
...
[Feature] Connect to a Coturn server using REST API
2021-02-16 19:32:21 +01:00
Kharhamel
f00d07289c
Merge pull request #753 from thecodingmachine/fixJitsiConfig
...
FIX: current audio and video status are overwriten by jitsi config
2021-02-16 19:02:52 +01:00
kharhamel
e21868ed3b
FIX: current audio and video status are overwriten by jitsi config
2021-02-16 18:25:23 +01:00
David Négrier
6b00355ea8
Fixing WebRtc user name / password when using TURN REST API
2021-02-16 18:13:30 +01:00
David Négrier
7fb923f823
Fixing deploy with new TURN_STATIC_AUTH_SECRET secret
2021-02-16 11:34:12 +01:00
David Négrier
12ef2820bf
Refactoring parameters passed to ScreenSharingPeer
2021-02-16 11:08:03 +01:00
David Négrier
cdb3cfdc81
[Feature] Connect to a Coturn server using REST API
...
This allows connecting to a TURN server with temporary passwords.
The passwords are expiring after 4 hours.
2021-02-16 11:06:05 +01:00
znerol
9670f92a08
Allow URLs relative to map base in iframe / openWebsite
2021-02-16 10:53:50 +01:00
David Négrier
e07efbdf28
Merge pull request #698 from thecodingmachine/fix/deploy-cleanup
...
Adding docker-compose.prod.yaml to ease deployment
2021-02-16 10:35:18 +01:00
David Négrier
f5610261c0
Fixing deploy URL in Github message
2021-02-16 10:28:00 +01:00
David Négrier
b9c839a87d
Adding link to the docker-compose prod file in README.
2021-02-16 10:24:51 +01:00
znerol
4fcdad1551
Fix jitsi URLs growing indefinitely in length
2021-02-15 10:36:56 +01:00
Tim Schlüter
05b829da70
fix multi user videochat mode
2021-02-13 21:19:45 +01:00
MisterErwin
aff4c8d145
Do not change rooms if scene failed to load
...
Sometimes a following room fails to load (e.g., #582 ) and instead of fading to black (as no scene is active) when trying to enter that next room, the player will stay in the old room and an error is logged (as throwing one crashes the game).
2021-02-13 14:15:09 +01:00
MisterErwin
511cd99e22
Fix offsets of SpeechBubble.ts
...
Since some recent optimizations, they are being added on top of the player, which makes the offset redundant.
2021-02-13 14:04:28 +01:00
Kharhamel
cfcad07487
Merge pull request #603 from thecodingmachine/localBlackList
...
FEATURE: implemented a client side blacklist
2021-02-12 19:23:56 +01:00
kharhamel
0c892e0243
FEATURE: implemented a client side blacklist
2021-02-12 19:15:24 +01:00
grégoire parant
f917420ca7
Merge pull request #731 from thecodingmachine/develop
...
Deploy 2021-02-11 (3)
2021-02-11 21:56:08 +01:00
Gregoire Parant
b92b7304b0
Fix to use clear All Keys
2021-02-11 21:48:24 +01:00
David Négrier
0e8be106e5
Merge pull request #729 from thecodingmachine/develop
...
Deploy 2021-02-11 (2)
2021-02-11 18:09:56 +01:00