Gregoire Parant
|
3aaeda6f80
|
Merge branch 'develop' into action-button
# Conflicts:
# front/dist/resources/style/style.css
# front/src/Phaser/Game/GameScene.ts
|
2020-11-21 15:40:24 +01:00 |
|
Gregoire Parant
|
11def280cb
|
Merge branch 'develop' into feature-discussion
|
2020-11-17 18:08:53 +01:00 |
|
Gregoire Parant
|
64d00bda56
|
Add function to show when message received
|
2020-11-17 16:46:46 +01:00 |
|
Kharhamel
|
eed292b707
|
Merge pull request #428 from thecodingmachine/master
Hotfixes from master
|
2020-11-17 15:26:11 +01:00 |
|
Kharhamel
|
ff8ebc3912
|
Merge pull request #425 from thecodingmachine/fix/teleportExit
FIX: creating an exit to the current map should not cause a crash anymore
|
2020-11-17 15:13:04 +01:00 |
|
kharhamel
|
b6b76cbfaf
|
FIX: creating an exit to the current map should not cause a crash anymore
|
2020-11-17 15:02:21 +01:00 |
|
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 |
|
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 |
|
Gregoire Parant
|
733efd4a03
|
Add env admin url in webpack
|
2020-11-13 12:41:49 +01:00 |
|
Gregoire Parant
|
ebfe08fb92
|
Create new env admin url
|
2020-11-13 12:15:33 +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 |
|
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 |
|
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
|
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 |
|
Jacem Chaieb
|
c4f28a0a8d
|
Add support for QWERTY keyboards
|
2020-11-09 12:24:45 +01:00 |
|
kharhamel
|
760708948f
|
FIX: close the coWebSite on network error
|
2020-11-09 11:16:54 +01:00 |
|
Gregoire Parant
|
a1d3b01619
|
Fix typo
|
2020-11-04 16:30:01 +01:00 |
|
Gregoire Parant
|
968787555f
|
Update feedback @moufmouf
|
2020-11-04 13:33:58 +01:00 |
|
Gregoire Parant
|
6ef2148a34
|
Fix feedback @moufmouf
|
2020-11-04 13:07:38 +01:00 |
|
Gregoire Parant
|
6051e5f46a
|
Fix when user have activated action button
|
2020-11-01 11:53:24 +01:00 |
|
Gregoire Parant
|
fcb7f364b6
|
Fix button action when user have activated
|
2020-11-01 11:49:09 +01:00 |
|
Gregoire Parant
|
74de2746c2
|
Create action button
|
2020-10-31 14:04:55 +01:00 |
|
Gregoire Parant
|
a2dd3bd6ab
|
Fix style
|
2020-10-30 20:35:45 +01:00 |
|
Gregoire Parant
|
724bb7f288
|
Merge branch 'develop' into feature-discussion
|
2020-10-30 20:04:12 +01:00 |
|
Gregoire Parant
|
80355e6b85
|
fix layout mode click when discussion is activated
|
2020-10-27 20:46:53 +01:00 |
|
Gregoire Parant
|
55c1bcee66
|
Add callback report in discussion part
|
2020-10-27 20:18:25 +01:00 |
|
Kharhamel
|
dfd2b2048c
|
Merge pull request #380 from thecodingmachine/jitsiQOL
opening and closing jitsi windows now trigger some transitions
|
2020-10-27 17:57:56 +01:00 |
|
kharhamel
|
67aa2f4b6c
|
opening and closing jitsi windows now trigger some transitions
|
2020-10-27 17:44:57 +01:00 |
|
Kharhamel
|
11541f9f55
|
Merge pull request #378 from thecodingmachine/jitsiQOL
disabling audio/video in jitsi carry over to wa
|
2020-10-26 17:05:39 +01:00 |
|
kharhamel
|
65a710d1f4
|
disabling audio/video in jitsi carry over to wa
|
2020-10-26 16:55:56 +01:00 |
|
Gregoire Parant
|
f95f38b092
|
Permit to remove callback
|
2020-10-26 14:13:51 +01:00 |
|
Gregoire Parant
|
850be63284
|
Fix style
|
2020-10-26 00:26:10 +01:00 |
|
Gregoire Parant
|
1e096af43b
|
Fix font family
|
2020-10-26 00:03:30 +01:00 |
|
Gregoire Parant
|
bdb504722f
|
Fix style -webkit-focus
|
2020-10-25 22:41:31 +01:00 |
|
Gregoire Parant
|
1945c24704
|
Create send data discussion
|
2020-10-25 21:59:14 +01:00 |
|
Gregoire Parant
|
f344adc48b
|
Create discussion
- Add new discussion class
- Feature to discuss and report user
|
2020-10-25 19:39:15 +01:00 |
|