f5e41cc285
added: pride shirt
2020-11-20 15:56:58 +01:00
62f13f6b30
added: mate bottle accessorie
2020-11-20 11:49:08 +01:00
a6c8132f0a
added: tinfoil hat1
2020-11-20 10:59:22 +01:00
9e835620f1
center spawn position in the middle of a tile, instead of the upper left corner
2020-11-19 13:19:56 +01:00
1bff2addf1
Merge branch 'develop' into firefox-error-jitsi
...
# Conflicts:
# front/src/WebRtc/MediaManager.ts
2020-11-17 18:54:51 +01:00
11def280cb
Merge branch 'develop' into feature-discussion
2020-11-17 18:08:53 +01:00
0a7063a478
Add close button
2020-11-17 18:03:44 +01:00
64d00bda56
Add function to show when message received
2020-11-17 16:46:46 +01:00
eed292b707
Merge pull request #428 from thecodingmachine/master
...
Hotfixes from master
2020-11-17 15:26:11 +01:00
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
b6b76cbfaf
FIX: creating an exit to the current map should not cause a crash anymore
2020-11-17 15:02:21 +01:00
f70f0a58a9
Merge pull request #424 from thecodingmachine/fix/coWebsiteBlocking
...
FIX: more cowebsite fixes
2020-11-17 14:58:13 +01:00
3d8d8cc3a9
FIX: more cowebsite fixes
2020-11-16 16:15:21 +01:00
1570ef9663
Merge branch 'develop' into windows-focus-blur-camera
...
# Conflicts:
# front/src/Phaser/Game/GameScene.ts
2020-11-16 15:46:52 +01:00
b0bd4c5f40
Merge remote-tracking branch 'github.com/develop' into feature-discussion
2020-11-16 15:43:28 +01:00
c7031c7c54
Merge pull request #411 from thecodingmachine/fix-#314
...
Fix init position and trigger layers properties
2020-11-16 15:24:21 +01:00
2d0fc1072f
Fix feedback
2020-11-16 15:05:51 +01:00
0fc57f3548
Change resolution
2020-11-14 14:04:11 +01:00
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
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
733efd4a03
Add env admin url in webpack
2020-11-13 12:41:49 +01:00
ebfe08fb92
Create new env admin url
2020-11-13 12:15:33 +01:00
6c6d046891
Merge pull request #401 from kidager/qwerty-support
...
Add support for QWERTY keyboards
2020-11-12 10:32:58 +01:00
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
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
73fa0ecbfc
Fix init position and trigger layers properties
2020-11-10 17:00:23 +01:00
ed527f5e72
Merge pull request #409 from thecodingmachine/fix/cowebsiteConflicts
...
Fix/cowebsite conflicts
2020-11-10 15:54:27 +01:00
8412575c40
Merge branch 'develop' into windows-focus-blur-camera
...
# Conflicts:
# front/src/WebRtc/MediaManager.ts
2020-11-10 15:27:22 +01:00
1080328afa
FIX: cowebsite transitions are now queued to prevent conflicts
2020-11-10 15:22:30 +01:00
b75f28d3ca
Merge branch 'develop' into feature-discussion
...
# Conflicts:
# front/src/WebRtc/MediaManager.ts
2020-11-10 15:15:24 +01:00
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
694f5d692f
Merge branch 'develop' into windows-focus-blur-camera
2020-11-10 13:07:08 +01:00
76014e3dc1
Merge branch 'develop' into action-button
2020-11-10 13:06:47 +01:00
0acbe20bbf
Fix name send in message
2020-11-10 13:00:14 +01:00
3333b3cee3
Fix feedback moufmouf
2020-11-10 12:38:32 +01:00
f837f1a31f
Merge branch 'develop' into feature-discussion
2020-11-10 11:50:41 +01:00
c4f28a0a8d
Add support for QWERTY keyboards
2020-11-09 12:24:45 +01:00
760708948f
FIX: close the coWebSite on network error
2020-11-09 11:16:54 +01:00
00b83ae349
Merge branch 'develop' of github.com:thecodingmachine/workadventure into windows-focus-blur-camera
2020-11-06 17:36:43 +01:00
a1d3b01619
Fix typo
2020-11-04 16:30:01 +01:00
968787555f
Update feedback @moufmouf
2020-11-04 13:33:58 +01:00
6ef2148a34
Fix feedback @moufmouf
2020-11-04 13:07:38 +01:00
47a049ecaf
Feedback comment @moufmouf
2020-11-04 12:42:33 +01:00
6051e5f46a
Fix when user have activated action button
2020-11-01 11:53:24 +01:00
fcb7f364b6
Fix button action when user have activated
2020-11-01 11:49:09 +01:00
74de2746c2
Create action button
2020-10-31 14:04:55 +01:00
a2dd3bd6ab
Fix style
2020-10-30 20:35:45 +01:00
724bb7f288
Merge branch 'develop' into feature-discussion
2020-10-30 20:04:12 +01:00
df49ea856a
Fix conflict error
2020-10-27 20:51:11 +01:00
80355e6b85
fix layout mode click when discussion is activated
2020-10-27 20:46:53 +01:00
55c1bcee66
Add callback report in discussion part
2020-10-27 20:18:25 +01:00
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
67aa2f4b6c
opening and closing jitsi windows now trigger some transitions
2020-10-27 17:44:57 +01:00
855f42a12e
Merge remote-tracking branch 'github.com/develop' into windows-focus-blur-camera
...
# Conflicts:
# front/src/WebRtc/MediaManager.ts
2020-10-26 22:43:14 +01:00
997acd17ad
Update to use update function scene
2020-10-26 22:39:52 +01:00
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
65a710d1f4
disabling audio/video in jitsi carry over to wa
2020-10-26 16:55:56 +01:00
f95f38b092
Permit to remove callback
2020-10-26 14:13:51 +01:00
850be63284
Fix style
2020-10-26 00:26:10 +01:00
1e096af43b
Fix font family
2020-10-26 00:03:30 +01:00
bdb504722f
Fix style -webkit-focus
2020-10-25 22:41:31 +01:00
1945c24704
Create send data discussion
2020-10-25 21:59:14 +01:00
f344adc48b
Create discussion
...
- Add new discussion class
- Feature to discuss and report user
2020-10-25 19:39:15 +01:00
b6fe9e72e1
Fix style and refactor
2020-10-25 19:38:00 +01:00
69f3e511ab
Ping status camera and microphone
2020-10-24 14:40:51 +02:00
199ed1266a
Switch off camera when user is not focused on WorkAdventure windows
...
Feature to switch off camera when user is not focused on WorkAdventure windows after 10 seconds
2020-10-24 14:13:23 +02:00
e640f67156
update admin navbar
2020-10-24 13:37:33 +02:00
00ad28f084
feat: jitsi no start with audio or video muted when needed
2020-10-23 17:19:20 +02:00
3fdca94afb
refactor: move jitsi creation to a dedicated and cleaned some type in mediaManager
2020-10-23 17:19:14 +02:00
cfb6ad581e
Fix red circle created
2020-10-21 23:08:05 +02:00
e973921390
Fix admin tags
...
- Fix get size group
- Fix admin tags
- Fix texture already used
2020-10-21 17:22:17 +02:00
1df4cb3e17
Red circle when have 4 users during webrtc meet
2020-10-21 16:07:42 +02:00
9ec5dc093c
Improving benchmark
2020-10-21 14:55:18 +02:00
54fd429952
Merge pull request #351 from thecodingmachine/screan-sharing-peer-connection-fix
...
Fix sharing peer connection
2020-10-21 12:22:31 +02:00
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
2ee6d43274
Fix sharing peer connection
2020-10-20 20:39:33 +02:00
c03dd4c551
Jitsi room names don't have /
2020-10-20 19:47:28 +02:00
cfed5b3053
Merge pull request #348 from thecodingmachine/screen-sharing-fix
...
Fix screen sharing
2020-10-20 18:31:31 +02:00
7fa999a1bd
Fix lint
2020-10-20 18:03:10 +02:00
173f7a5061
Fix webrct finish event delay
2020-10-20 18:02:44 +02:00
78a4bf3189
Adding custom character textures
2020-10-20 17:42:36 +02:00
a3816cd725
Merge pull request #346 from thecodingmachine/customUserStore
...
improved the local storage of the the selectcharacterScene
2020-10-20 17:38:54 +02:00
dff189b223
local storage of the custom layers
2020-10-20 17:25:08 +02:00
336742b8b3
Fix screen sharing
...
Foce screan sharing to create new peer connexion and share it
2020-10-20 14:48:59 +02:00
f5aa70ddc2
improved the local storage of the the selectcharacterScene
2020-10-20 13:44:57 +02:00
fef6786697
Fix typo
2020-10-20 11:27:11 +02:00
3325cdf970
Update banned message modal
2020-10-20 11:25:17 +02:00
8d1d6fc8dc
Push message when user is connected on new room
2020-10-20 09:20:00 +02:00
7059c6e6e3
Refactor message
2020-10-20 08:20:21 +02:00
ba9f9dcbe1
Fix CD
2020-10-19 21:04:16 +02:00
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
75d9ed8dfa
implemented the admin websocket
...
now send data
2020-10-19 14:23:50 +02:00
bf01116f63
Removing useless features of Jitsi meet
2020-10-19 12:36:05 +02:00
16d1c2354e
Adding fallback to unauthenticated Jitsi
2020-10-19 11:07:49 +02:00
260b0ea408
Adding JWT authentication to Jitsi
2020-10-16 19:23:28 +02:00
c259dd582c
Fixing change of map with relative URLs
2020-10-16 09:29:18 +02:00
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
c59a335a1a
Removing useless resource
2020-10-15 18:00:34 +02:00
267476c651
Removing TODO
2020-10-15 17:59:32 +02:00
0ea7240834
Adding condition to enable reporting only on private rooms
2020-10-15 17:58:27 +02:00
e7890907c1
Merge pull request #331 from thecodingmachine/verifyjwtserverside
...
Adding a new endpoint to verify the JWT token server-side before connecting
2020-10-15 17:02:41 +02:00
a348001036
Adding a new endpoint to verify the JWT token server-side before connecting
2020-10-15 16:48:42 +02:00
702084b00a
Merge pull request #330 from thecodingmachine/exiturl
...
Adding exitUrl property
2020-10-15 16:00:50 +02:00
2fe61ce11b
Merge pull request #329 from thecodingmachine/fixhistory
...
Fixing URL not being rewritten when changing maps
2020-10-15 15:52:01 +02:00
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
517b3a644b
Fixing URL not being rewritten when changing maps
2020-10-15 14:35:09 +02:00
67a9bd2520
improved textField component and allowed 8 caracter names
2020-10-15 14:23:39 +02:00
62dfb68aaf
Update style report modal
2020-10-15 12:24:16 +02:00
38d2cc9a8c
Remove teleport feature
2020-10-15 12:12:11 +02:00
8df56204e3
Add teleport event
2020-10-15 11:51:24 +02:00
4799460064
Merge branch 'develop' into player-report
...
# Conflicts:
# front/src/Connexion/RoomConnection.ts
2020-10-14 15:06:10 +02:00
807ccc49d4
Fixing rewriterule with register link in prod
2020-10-14 13:52:02 +02:00
b7340022de
Fixing rewriterule with @ in prod
2020-10-14 13:29:16 +02:00
731ccd8796
Fix CI
2020-10-14 11:48:34 +02:00
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
ce93e5bbaa
Fixing the way rights are sent to the admin (now sending organization/world/room)
2020-10-14 10:37:00 +02:00
436cde7033
Fixe style media manager and text modale
2020-10-13 21:54:08 +02:00
047fa7b594
Merge branch 'player-report-fix-conflict' into player-report
...
# Conflicts:
# back/src/Controller/IoSocketController.ts
2020-10-13 21:16:57 +02:00
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
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
dbaf44e814
Change report flag
...
- Add icon on video
- Permit to have a modal with comment
2020-10-13 19:56:42 +02:00
cb159350e9
Fixed room switching
2020-10-13 18:44:50 +02:00
a2c750dea2
Fix linter
2020-10-13 17:30:53 +02:00
45a2721c5c
Fixing code post rebase
2020-10-13 17:20:20 +02:00
ec93891c6b
Using Room class to load GameScene
2020-10-13 17:10:07 +02:00
aee06da7f9
Refactoring Room.ts to fetch map url automatically from ID
2020-10-13 17:10:07 +02:00
ccf80c1dd0
added an edge case for the default map url
2020-10-13 16:47:15 +02:00
d98efc0433
lint fixes
2020-10-13 16:23:49 +02:00
65406f844e
Teleport notification
...
- Create end point to permit the teleport notification. The map url will be /teleport/token_user
- Create message teleport
- Create receive feature in phaser to teleport
TODO
Teleport player on black room.
2020-10-13 11:39:07 +02:00
9a04836215
Dynamically import Quill
...
We load Quill only if it is needed (after all, only admins need Quill)
2020-10-13 10:26:27 +02:00
0731bd39e5
Moving back to using ScenePlugin and adding EntryScene
2020-10-12 18:59:49 +02:00
2852f204f5
Improving error handling upon unknown URL
2020-10-12 17:42:37 +02:00
02c193a262
rewrote the authorisation flow: give more responsability to gameManager and less to gameScene
2020-10-12 16:45:09 +02:00
aeced0c648
create message to report
2020-10-12 11:22:41 +02:00
032facb75f
lint fixes
2020-10-09 17:21:46 +02:00
f550c5a775
merge from develop
2020-10-09 17:10:24 +02:00
c5f8b43fec
more fixes
2020-10-09 17:01:34 +02:00
07c17452e7
Merge branch 'develop' into player-report
2020-10-09 16:15:15 +02:00
5e54fc2c26
some fixes
2020-10-09 14:53:18 +02:00
4af46b1b3f
simplified mapUrl parsing
2020-10-08 18:51:24 +02:00
120804e774
Merge pull request #293 from thecodingmachine/responsive_scenes
...
Making scenes responsive
2020-10-08 17:53:54 +02:00
386b25afa0
Switching customizeScene and gameScene to new ResizableScene
2020-10-08 16:00:29 +02:00
66f3345861
Adding responsive to SelectCharacterScene
2020-10-08 15:10:46 +02:00
5ac2083995
updated quill in front to 1.3.7
2020-10-08 11:48:49 +02:00
79b5c5de93
Making login scene responsive
2020-10-07 18:03:34 +02:00
c63fb6ed6f
Add image to report and to teleport player
2020-10-06 23:56:27 +02:00
f542b117a8
Refactoring connection to pass room info on connect
2020-10-06 18:11:42 +02:00
1061c80f1f
Fixing connection closing
2020-10-01 17:16:49 +02:00
e1193ad95a
Fixing console removal
2020-10-01 17:16:36 +02:00
8bc5832eac
Removing warning on startup
2020-10-01 17:15:33 +02:00
9563013f48
Removing useless file
2020-10-01 16:02:45 +02:00
d3fa901691
Merge branch 'develop' of github.com:thecodingmachine/workadventure into feature/global-message
...
+ migrating to protobuf messages
# Conflicts:
# back/src/App.ts
# back/src/Controller/IoSocketController.ts
# back/yarn.lock
# front/src/Connection.ts
# front/src/Phaser/Game/GameScene.ts
# front/src/Phaser/Login/EnableCameraScene.ts
# front/src/WebRtc/SimplePeer.ts
2020-10-01 14:11:34 +02:00
57262de1bf
Fixing CI + lowering extrapolation time
2020-09-30 13:49:23 +02:00
074398c4e0
Fixing benchmark initialization
2020-09-30 12:12:24 +02:00
53c6c2bc30
Fixing benchmark
2020-09-29 17:24:16 +02:00
9f3577286d
Merge branch 'develop' of github.com:thecodingmachine/workadventure into uws
...
# Conflicts:
# back/src/Controller/AdminController.ts
# back/src/Controller/AuthenticateController.ts
# back/src/Controller/IoSocketController.ts
# back/src/Controller/MapController.ts
# benchmark/index.ts
# front/src/Connexion/RoomConnection.ts
2020-09-29 17:12:28 +02:00
432b4a0e85
Linting app
2020-09-29 16:12:17 +02:00
b485c9bf46
Switching WebRTC to protobuf + uws
2020-09-29 16:01:22 +02:00
6a4c0c8678
Migrating to uWS
2020-09-28 18:52:54 +02:00
3f9659ef3c
improvments
2020-09-28 15:40:34 +02:00
af4611ed29
rewrote the login workflow
2020-09-25 19:23:33 +02:00
ac80850335
Switching SetViewport to protobuf
2020-09-24 17:36:10 +02:00
24a6cd7f8e
Switched ITEM_EVENT to protobuf
2020-09-24 17:24:37 +02:00
cd083a2090
Merge branch 'develop' of github.com:thecodingmachine/workadventure into protobuf
...
# Conflicts:
# back/package.json
2020-09-24 16:22:16 +02:00
0c4c43f88c
Adding USER_LEFT message to protobuf
2020-09-24 16:11:47 +02:00
2dad601311
Adding JOIN_ROOM message in protobuf
2020-09-24 14:50:28 +02:00
d7209d8864
Migrating messages locally into back and front
2020-09-24 11:16:08 +02:00
b4f971c501
Switched group position to protobuf
2020-09-24 10:05:16 +02:00
7f4014cccf
Fix CI
2020-09-23 19:07:45 +02:00
7584c3a04d
Fix CI
2020-09-23 18:44:24 +02:00
3cb079c80c
Fix CI
2020-09-23 18:37:54 +02:00
d5fdb9d857
Fix style
2020-09-23 18:07:31 +02:00
bcb126a146
Merge branch 'develop' into feature/global-message
...
# Conflicts:
# back/src/App.ts
2020-09-23 17:26:00 +02:00
942d2cbcef
Refactor and remove prevent default keyboard
2020-09-23 17:22:00 +02:00
8c43c67741
Create feature to send and read audio message
2020-09-21 15:00:39 +02:00
76d3779438
Moved GroupUpdateMessage to protobuf
2020-09-21 11:24:03 +02:00
a19f09bef2
improve the register workflow
2020-09-21 10:51:48 +02:00
16b3e48711
Add menu to switch
2020-09-21 01:16:10 +02:00
1829912c91
Fix remove last childnode
2020-09-21 00:42:39 +02:00
e0ae79eaf1
Fini quill box
2020-09-21 00:34:25 +02:00
9b955ebd20
fix style quill box
2020-09-20 19:31:24 +02:00
844bffa988
Create file controller to upload audio document
2020-09-20 19:01:21 +02:00
45ad4bbb36
Send and play audio message
2020-09-20 17:12:27 +02:00
4c7e458e52
create event and brodcast event in backend
2020-09-19 01:08:56 +02:00
b148ca3708
Linting
2020-09-18 18:16:26 +02:00
d2a5060ad2
Using multistage builds with protocol buffers
2020-09-18 18:00:03 +02:00
d3116c7400
Building proto messages in CI
2020-09-18 17:51:12 +02:00
5c0a4e7c5a
Fixing front Dockerfile
2020-09-18 17:39:59 +02:00
7826b2ea8d
Fixing Docker build images to add new messages directory
2020-09-18 17:22:45 +02:00
df0636c513
Migrating user position messages to protobuf
2020-09-18 15:51:15 +02:00
e9ca8721a6
Migrating userId to "int32" to save some space and adding userMoves message in protobuf
2020-09-18 13:57:38 +02:00
ed9552b62b
added a register route via token
2020-09-17 18:21:49 +02:00
4b55b54a07
Adding first protobuf message exchange
2020-09-17 17:14:47 +02:00
e59cbcfaa7
Create console global message
...
- Add style
- Create zone and button to show the admin console
2020-09-16 21:50:04 +02:00
509196785b
Initialise global message
...
- Create new class to manager global message. My idea is that this class permit to manage audio or text message.
- Update html to have main content id and inject html in this.
- Create front event to receive startMessage and stopMessage.
- Delete impoted variable not used.
2020-09-16 18:38:50 +02:00
f5f9dcac04
Making groups part of zones
2020-09-16 16:06:43 +02:00
3a9196fb82
Merge
2020-09-16 11:41:03 +02:00
d24ec0bd75
Plugin PositionNotifier into the main application.
2020-09-15 16:21:41 +02:00
f8d462b0d7
Fixing "any" type
2020-09-15 10:10:35 +02:00
9b702c75e3
Adding batched messages + the notion of notifier / zones (not plugged in the system yet)
2020-09-15 10:06:11 +02:00
yourcoke