Gregoire Parant
|
3d32fb90dc
|
Add constant
|
2020-11-23 20:34:05 +01:00 |
|
Gregoire Parant
|
2812387650
|
Merge branch 'develop' into action-button
|
2020-11-23 20:08:19 +01:00 |
|
Gregoire Parant
|
26cfae7136
|
Merge branch 'develop' into firefox-error-jitsi
# Conflicts:
# front/src/WebRtc/MediaManager.ts
|
2020-11-23 15:46:19 +01:00 |
|
Gregoire Parant
|
39cdc3fbd9
|
Fix trgger stream and update scene record
|
2020-11-21 18:47:38 +01:00 |
|
Gregoire Parant
|
a6876658ab
|
Merge branch 'develop' into windows-focus-blur-camera
# Conflicts:
# front/src/WebRtc/MediaManager.ts
|
2020-11-21 15:57:55 +01:00 |
|
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
|
1bff2addf1
|
Merge branch 'develop' into firefox-error-jitsi
# Conflicts:
# front/src/WebRtc/MediaManager.ts
|
2020-11-17 18:54:51 +01:00 |
|
Gregoire Parant
|
11def280cb
|
Merge branch 'develop' into feature-discussion
|
2020-11-17 18:08:53 +01:00 |
|
Gregoire Parant
|
0a7063a478
|
Add close button
|
2020-11-17 18:03:44 +01:00 |
|
Kharhamel
|
eed292b707
|
Merge pull request #428 from thecodingmachine/master
Hotfixes from master
|
2020-11-17 15:26:11 +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 |
|
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 |
|
Gregoire Parant
|
2d0fc1072f
|
Fix feedback
|
2020-11-16 15:05:51 +01:00 |
|
Gregoire Parant
|
73fa0ecbfc
|
Fix init position and trigger layers properties
|
2020-11-10 17:00:23 +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 |
|
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 |
|
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
|
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
|
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 |
|
kharhamel
|
67aa2f4b6c
|
opening and closing jitsi windows now trigger some transitions
|
2020-10-27 17:44:57 +01:00 |
|
Gregoire Parant
|
997acd17ad
|
Update to use update function scene
|
2020-10-26 22:39:52 +01:00 |
|
kharhamel
|
3fdca94afb
|
refactor: move jitsi creation to a dedicated and cleaned some type in mediaManager
|
2020-10-23 17:19:14 +02:00 |
|
Gregoire Parant
|
cfb6ad581e
|
Fix red circle created
|
2020-10-21 23:08:05 +02:00 |
|
Gregoire Parant
|
e973921390
|
Fix admin tags
- Fix get size group
- Fix admin tags
- Fix texture already used
|
2020-10-21 17:22:17 +02:00 |
|
Gregoire Parant
|
1df4cb3e17
|
Red circle when have 4 users during webrtc meet
|
2020-10-21 16:07:42 +02:00 |
|
David Négrier
|
45c6e13cad
|
Fixing loading of same custom texture several time
Phaser 3 does not trigger oncomplete event if the resource is already loaded.
|
2020-10-21 10:34:55 +02:00 |
|
David Négrier
|
c03dd4c551
|
Jitsi room names don't have /
|
2020-10-20 19:47:28 +02:00 |
|
David Négrier
|
78a4bf3189
|
Adding custom character textures
|
2020-10-20 17:42:36 +02:00 |
|
David Négrier
|
a3816cd725
|
Merge pull request #346 from thecodingmachine/customUserStore
improved the local storage of the the selectcharacterScene
|
2020-10-20 17:38:54 +02:00 |
|
arp
|
f5aa70ddc2
|
improved the local storage of the the selectcharacterScene
|
2020-10-20 13:44:57 +02:00 |
|
Gregoire Parant
|
bf9dfcc835
|
Ban mesage
- Create type message could be use to send private message at any user
- Create SendMessageUser message
- Add sound when user receive ban message
|
2020-10-19 19:32:47 +02:00 |
|
David Négrier
|
bf01116f63
|
Removing useless features of Jitsi meet
|
2020-10-19 12:36:05 +02:00 |
|
David Négrier
|
16d1c2354e
|
Adding fallback to unauthenticated Jitsi
|
2020-10-19 11:07:49 +02:00 |
|
David Négrier
|
260b0ea408
|
Adding JWT authentication to Jitsi
|
2020-10-16 19:23:28 +02:00 |
|
David Négrier
|
c259dd582c
|
Fixing change of map with relative URLs
|
2020-10-16 09:29:18 +02:00 |
|
David Négrier
|
c75f1edc40
|
Merge branch 'develop' of github.com:thecodingmachine/workadventure into player-report
# Conflicts:
# back/src/Controller/AuthenticateController.ts
|
2020-10-15 18:01:44 +02:00 |
|
David Négrier
|
0ea7240834
|
Adding condition to enable reporting only on private rooms
|
2020-10-15 17:58:27 +02:00 |
|
David Négrier
|
36d73333f5
|
Adding exitUrl property
The exitUrl property can be applied on a layer to link to any kind of room (private or public)
|
2020-10-15 15:50:51 +02:00 |
|
David Négrier
|
517b3a644b
|
Fixing URL not being rewritten when changing maps
|
2020-10-15 14:35:09 +02:00 |
|
Gregoire Parant
|
4799460064
|
Merge branch 'develop' into player-report
# Conflicts:
# front/src/Connexion/RoomConnection.ts
|
2020-10-14 15:06:10 +02:00 |
|
David Négrier
|
98bda49d7e
|
Get tags from the admin
And uses tag "admin" to choose whether to display the console or not
|
2020-10-14 11:07:34 +02:00 |
|
Gregoire Parant
|
047fa7b594
|
Merge branch 'player-report-fix-conflict' into player-report
# Conflicts:
# back/src/Controller/IoSocketController.ts
|
2020-10-13 21:16:57 +02:00 |
|
Gregoire Parant
|
9c44d37020
|
Merge remote-tracking branch 'github.com/develop' into player-report
# Conflicts:
# back/src/Controller/IoSocketController.ts
# front/src/Phaser/Game/GameScene.ts
# front/src/index.ts
# messages/messages.proto
|
2020-10-13 21:14:46 +02:00 |
|
Gregoire Parant
|
05a1ea8469
|
Merge branch 'develop' into player-report
# Conflicts:
# back/src/Controller/IoSocketController.ts
# front/src/Phaser/Game/GameScene.ts
# front/src/index.ts
# messages/messages.proto
|
2020-10-13 20:39:29 +02:00 |
|