6f2c319785
Merge branch 'master' of github.com:thecodingmachine/workadventure into scaling
...
# Conflicts:
# back/src/Services/SocketManager.ts
# deeployer.libsonnet
# docker-compose.yaml
# front/src/Connexion/RoomConnection.ts
# front/src/Enum/EnvironmentVariable.ts
# front/src/Phaser/Game/GameScene.ts
# front/webpack.config.js
# pusher/src/Controller/IoSocketController.ts
2020-12-11 13:00:11 +01:00
a19edd4dc1
Fixing reconnection to server on back failure
2020-12-03 16:39:44 +01:00
95665a28d5
Merge pull request #456 from thecodingmachine/performance
...
Performance settings
2020-12-03 14:33:12 +01:00
27634a61ee
Create menu to set your quality video and game
2020-11-27 16:24:07 +01:00
4c1e566a6c
Adding a Pusher container as a middleware/dispatcher between front and back
2020-11-26 17:53:30 +01:00
65785240e1
FIX: room id is now pushed to the url
2020-11-25 17:17:48 +01:00
f08aec28c0
use tilewidth and tileheight to center spawn position dynamically
2020-11-25 15:58:10 +01:00
8d8b879ed6
FIX: the game now uses the url hash to choose the start layer
2020-11-24 14:43:21 +01:00
09d6d22a5d
FIX: rewrote the way scene exits are triggered
2020-11-24 14:43:21 +01:00
3d32fb90dc
Add constant
2020-11-23 20:34:05 +01:00
2812387650
Merge branch 'develop' into action-button
2020-11-23 20:08:19 +01:00
26cfae7136
Merge branch 'develop' into firefox-error-jitsi
...
# Conflicts:
# front/src/WebRtc/MediaManager.ts
2020-11-23 15:46:19 +01:00
39cdc3fbd9
Fix trgger stream and update scene record
2020-11-21 18:47:38 +01:00
a6876658ab
Merge branch 'develop' into windows-focus-blur-camera
...
# Conflicts:
# front/src/WebRtc/MediaManager.ts
2020-11-21 15:57:55 +01:00
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
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
eed292b707
Merge pull request #428 from thecodingmachine/master
...
Hotfixes from master
2020-11-17 15:26:11 +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
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
2d0fc1072f
Fix feedback
2020-11-16 15:05:51 +01:00
73fa0ecbfc
Fix init position and trigger layers properties
2020-11-10 17:00:23 +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
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
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
724bb7f288
Merge branch 'develop' into feature-discussion
2020-10-30 20:04:12 +01:00
80355e6b85
fix layout mode click when discussion is activated
2020-10-27 20:46:53 +01:00
67aa2f4b6c
opening and closing jitsi windows now trigger some transitions
2020-10-27 17:44:57 +01:00
997acd17ad
Update to use update function scene
2020-10-26 22:39:52 +01: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
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
c03dd4c551
Jitsi room names don't have /
2020-10-20 19:47:28 +02:00
78a4bf3189
Adding custom character textures
2020-10-20 17:42:36 +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
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
0ea7240834
Adding condition to enable reporting only on private rooms
2020-10-15 17:58:27 +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
4799460064
Merge branch 'develop' into player-report
...
# Conflicts:
# front/src/Connexion/RoomConnection.ts
2020-10-14 15:06:10 +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
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
cb159350e9
Fixed room switching
2020-10-13 18:44:50 +02:00
ec93891c6b
Using Room class to load GameScene
2020-10-13 17:10:07 +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
0731bd39e5
Moving back to using ScenePlugin and adding EntryScene
2020-10-12 18:59:49 +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
07c17452e7
Merge branch 'develop' into player-report
2020-10-09 16:15:15 +02:00
4af46b1b3f
simplified mapUrl parsing
2020-10-08 18:51:24 +02:00
386b25afa0
Switching customizeScene and gameScene to new ResizableScene
2020-10-08 16:00:29 +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
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
3f9659ef3c
improvments
2020-09-28 15:40:34 +02:00
af4611ed29
rewrote the login workflow
2020-09-25 19:23:33 +02:00
d7209d8864
Migrating messages locally into back and front
2020-09-24 11:16:08 +02:00
942d2cbcef
Refactor and remove prevent default keyboard
2020-09-23 17:22:00 +02:00
76d3779438
Moved GroupUpdateMessage to protobuf
2020-09-21 11:24:03 +02:00
e0ae79eaf1
Fini quill box
2020-09-21 00:34:25 +02:00
45ad4bbb36
Send and play audio message
2020-09-20 17:12:27 +02:00
b148ca3708
Linting
2020-09-18 18:16:26 +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
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
9b702c75e3
Adding batched messages + the notion of notifier / zones (not plugged in the system yet)
2020-09-15 10:06:11 +02:00
e418e8fd09
Setting the depth of the chat mode / presentation mode to 99999 to avoid melting buttons with map.
2020-09-10 09:31:53 +02:00
f70ba1411a
Hiding cam details when entering a Jisti room
2020-09-01 14:43:21 +02:00
9351719873
Adding the notion of silent zone
2020-08-31 14:10:01 +02:00
df7b5cc2e3
Adding a "silent" notion (triggered in Jitsi meets)
2020-08-31 14:03:40 +02:00
0a8ba37049
Adding Jitsi meet support
2020-08-31 12:18:00 +02:00
01319b50ca
Adding a "openWebsite" property that opens websites when we walk over the zone.
2020-08-30 17:37:38 +02:00
168697eb46
Adding a GameMap class that helps tracking when the properties of the tiles the user is changes (when the user moves)
2020-08-30 15:44:22 +02:00
fca93663b4
Merge branch 'develop' of github.com:thecodingmachine/workadventure into outline
2020-08-24 18:15:44 +02:00
044495cf05
Centering character in free space
...
This commit adds the ability to put the character where there is free space when a discussion is hapening (either in presentation or chat mode)
2020-08-24 14:19:36 +02:00
2e61c2ef62
Getting back code in compilable fashion after huge rebase
2020-08-18 00:12:38 +02:00
6b970adc6c
Merge branch 'develop' of github.com:thecodingmachine/workadventure into outline
...
# Conflicts:
# front/src/Phaser/Game/GameScene.ts
# front/src/Phaser/Player/Player.ts
# front/src/index.ts
# front/yarn.lock
2020-08-17 22:51:37 +02:00
David Négrier