lbehm/workadventure
1
0
Fork 0
Code Issues Pull requests Releases Activity
1443 commits 21 branches 1 tag 50 MiB
Commit graph

434 commits

Author SHA1 Message Date
David Négrier 2122014947 Merge branch 'develop' of github.com:thecodingmachine/workadventure into scaling 
# Conflicts:
#	front/src/Phaser/Game/GameScene.ts
 2020-12-11 13:06:10 +01:00
David Négrier 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
Kharhamel 57a59cba8e
Merge pull request #473 from thecodingmachine/master 
hotfixes from master
 2020-12-03 18:48:43 +01:00
David Négrier a19edd4dc1 Fixing reconnection to server on back failure 2020-12-03 16:39:44 +01:00
Kharhamel 95665a28d5
Merge pull request #456 from thecodingmachine/performance 
Performance settings
 2020-12-03 14:33:12 +01:00
kharhamel 1971d26dc0 FIX: couldn't access to an anonymous private map 2020-12-01 19:34:36 +01:00
Kharhamel 5f372e485d
Merge pull request #468 from thecodingmachine/master 
hotfixes from master
 2020-11-30 13:49:35 +01:00
Gregoire Parant 27634a61ee Create menu to set your quality video and game 2020-11-27 16:24:07 +01:00
David Négrier 4c1e566a6c Adding a Pusher container as a middleware/dispatcher between front and back 2020-11-26 17:53:30 +01:00
Kharhamel 17e633ae45
Merge pull request #442 from cbluoss/develop 
Adding more clothing options
 2020-11-26 10:30:54 +01:00
kharhamel 65785240e1 FIX: room id is now pushed to the url 2020-11-25 17:17:48 +01:00
psy f08aec28c0 use tilewidth and tileheight to center spawn position dynamically 2020-11-25 15:58:10 +01:00
yourcoke 8ff24c38b0
added: engelbert hose + mask 2020-11-24 20:23:20 +01:00
kharhamel 8d8b879ed6 FIX: the game now uses the url hash to choose the start layer 2020-11-24 14:43:21 +01:00
kharhamel 09d6d22a5d FIX: rewrote the way scene exits are triggered 2020-11-24 14:43:21 +01:00
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
yourcoke bbd3d9efae
added: hoodies 2020-11-21 15:46:04 +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
yourcoke f5e41cc285
added: pride shirt 2020-11-20 15:56:58 +01:00
yourcoke 62f13f6b30
added: mate bottle accessorie 2020-11-20 11:49:08 +01:00
yourcoke a6c8132f0a
added: tinfoil hat1 2020-11-20 10:59:22 +01:00
psy 9e835620f1 center spawn position in the middle of a tile, instead of the upper left corner 2020-11-19 13:19:56 +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
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 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
Jacem Chaieb c4f28a0a8d
Add support for QWERTY keyboards 2020-11-09 12:24:45 +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
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
Gregoire Parant b6fe9e72e1 Fix style and refactor 2020-10-25 19:38:00 +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 dff189b223 local storage of the custom layers 2020-10-20 17:25:08 +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
arp 75d9ed8dfa implemented the admin websocket 
now send data
 2020-10-19 14:23:50 +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 c59a335a1a Removing useless resource 2020-10-15 18:00:34 +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 702084b00a
Merge pull request #330 from thecodingmachine/exiturl 
Adding exitUrl property
 2020-10-15 16:00:50 +02:00
David Négrier 2fe61ce11b
Merge pull request #329 from thecodingmachine/fixhistory 
Fixing URL not being rewritten when changing maps
 2020-10-15 15:52:01 +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
arp 67a9bd2520 improved textField component and allowed 8 caracter names 2020-10-15 14:23:39 +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
Gregoire Parant dbaf44e814 Change report flag 
- Add icon on video
- Permit to have a modal with comment
 2020-10-13 19:56:42 +02:00
David Négrier cb159350e9 Fixed room switching 2020-10-13 18:44:50 +02:00
David Négrier ec93891c6b Using Room class to load GameScene 2020-10-13 17:10:07 +02:00
David Négrier aee06da7f9 Refactoring Room.ts to fetch map url automatically from ID 2020-10-13 17:10:07 +02:00
arp d98efc0433 lint fixes 2020-10-13 16:23:49 +02:00
Gregoire Parant 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
David Négrier 0731bd39e5 Moving back to using ScenePlugin and adding EntryScene 2020-10-12 18:59:49 +02:00
David Négrier 2852f204f5 Improving error handling upon unknown URL 2020-10-12 17:42:37 +02:00
arp 02c193a262 rewrote the authorisation flow: give more responsability to gameManager and less to gameScene 2020-10-12 16:45:09 +02:00
Gregoire Parant aeced0c648 create message to report 2020-10-12 11:22:41 +02:00
arp 032facb75f lint fixes 2020-10-09 17:21:46 +02:00
arp f550c5a775 merge from develop 2020-10-09 17:10:24 +02:00
Gregoire Parant 07c17452e7 Merge branch 'develop' into player-report 2020-10-09 16:15:15 +02:00
arp 5e54fc2c26 some fixes 2020-10-09 14:53:18 +02:00
arp 4af46b1b3f simplified mapUrl parsing 2020-10-08 18:51:24 +02:00
David Négrier 386b25afa0 Switching customizeScene and gameScene to new ResizableScene 2020-10-08 16:00:29 +02:00
David Négrier 66f3345861 Adding responsive to SelectCharacterScene 2020-10-08 15:10:46 +02:00
David Négrier 79b5c5de93 Making login scene responsive 2020-10-07 18:03:34 +02:00
Gregoire Parant c63fb6ed6f Add image to report and to teleport player 2020-10-06 23:56:27 +02:00
David Négrier f542b117a8 Refactoring connection to pass room info on connect 2020-10-06 18:11:42 +02:00
David Négrier 1061c80f1f Fixing connection closing 2020-10-01 17:16:49 +02:00
David Négrier 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
arp 3f9659ef3c improvments 2020-09-28 15:40:34 +02:00
arp af4611ed29 rewrote the login workflow 2020-09-25 19:23:33 +02:00
David Négrier d7209d8864 Migrating messages locally into back and front 2020-09-24 11:16:08 +02:00
Gregoire Parant 942d2cbcef Refactor and remove prevent default keyboard 2020-09-23 17:22:00 +02:00
David Négrier 76d3779438 Moved GroupUpdateMessage to protobuf 2020-09-21 11:24:03 +02:00
Gregoire Parant e0ae79eaf1 Fini quill box 2020-09-21 00:34:25 +02:00
Gregoire Parant 45ad4bbb36 Send and play audio message 2020-09-20 17:12:27 +02:00
David Négrier b148ca3708 Linting 2020-09-18 18:16:26 +02:00
David Négrier df0636c513 Migrating user position messages to protobuf 2020-09-18 15:51:15 +02:00
David Négrier e9ca8721a6 Migrating userId to "int32" to save some space and adding userMoves message in protobuf 2020-09-18 13:57:38 +02:00
Gregoire Parant e59cbcfaa7 Create console global message 
- Add style
- Create zone and button to show the admin console
 2020-09-16 21:50:04 +02:00
Gregoire Parant 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
David Négrier f5f9dcac04 Making groups part of zones 2020-09-16 16:06:43 +02:00
David Négrier 3a9196fb82 Merge 2020-09-16 11:41:03 +02:00
David Négrier d24ec0bd75 Plugin PositionNotifier into the main application. 2020-09-15 16:21:41 +02:00
David Négrier 9b702c75e3 Adding batched messages + the notion of notifier / zones (not plugged in the system yet) 2020-09-15 10:06:11 +02:00
David Négrier 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
David Négrier f70ba1411a Hiding cam details when entering a Jisti room 2020-09-01 14:43:21 +02:00
David Négrier 6f6873e870
Merge pull request #251 from thecodingmachine/fix_camera_stop 
Camera was not properly closed in EnableCameraScene
 2020-08-31 15:31:33 +02:00
David Négrier c739037bc4 Camera was not properly closed in EnableCameraScene 2020-08-31 14:54:52 +02:00
David Négrier 9351719873 Adding the notion of silent zone 2020-08-31 14:10:01 +02:00
David Négrier df7b5cc2e3 Adding a "silent" notion (triggered in Jitsi meets) 2020-08-31 14:03:40 +02:00
David Négrier 0a8ba37049 Adding Jitsi meet support 2020-08-31 12:18:00 +02:00
David Négrier a128ff117b code style 2020-08-30 17:40:04 +02:00
David Négrier 01319b50ca Adding a "openWebsite" property that opens websites when we walk over the zone. 2020-08-30 17:37:38 +02:00
David Négrier 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
David Négrier fca93663b4 Merge branch 'develop' of github.com:thecodingmachine/workadventure into outline 2020-08-24 18:15:44 +02:00
David Négrier 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
David Négrier 2e61c2ef62 Getting back code in compilable fashion after huge rebase 2020-08-18 00:12:38 +02:00
David Négrier 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 6516e621b0 Adding display / hide of layout buttons when a meet start / ends 2020-08-17 16:12:53 +02:00
David Négrier 7fe2cc19c3 Adding buttons to switch mode 2020-08-17 15:20:03 +02:00
David Négrier 88c099fc13 Improving layout 
Fixing left-right switch on all cameras (except current player camera)
 2020-08-16 23:19:04 +02:00
David Négrier 24fb605f50 Switching to definitely assigned parameters 
This allows us to go in "full strict mode" (yeah!)
See https://www.typescriptlang.org/docs/handbook/release-notes/typescript-2-7.html#strict-class-initialization
 2020-08-07 23:39:06 +02:00
David Négrier bc929615d1 Fixing problem when switching scenes with container 2020-07-29 11:42:18 +02:00
David Négrier 84529d6e99 Propagating customized sprites all over the game 2020-07-28 17:45:55 +02:00
David Négrier 6d0bccc0e1 Making a nice "customize" button 2020-07-28 15:53:44 +02:00
David Perez 866985326b Fixing merge issue 2020-07-28 11:35:30 +02:00
David Perez 90c56ca683 merge 2020-07-28 11:29:21 +02:00
David Perez 21d2a7939b custome characters 2020-07-28 11:24:34 +02:00
David Négrier ee612f6585 Adding event support to items 2020-07-27 22:36:58 +02:00
David Négrier d48d5b0285 Fix CS 2020-07-23 18:47:28 +02:00
David Négrier 2484e4f1df Moving maps to their own container 2020-07-23 18:43:51 +02:00
David Négrier ed146226cf Adding Outline capabilities and a ActionableItem notion. 2020-07-23 18:09:24 +02:00
David Négrier f7466994c5 Playing with pipeline to display outline 2020-07-15 23:44:01 +02:00
David Négrier 6879418098 Adding a 404 page when resources loading fails 2020-07-07 22:52:22 +02:00
David Négrier 55767f2c78 Fixing image tileset key 
If 2 maps share the same tileset name (even if they use 2 different URLs for the tileset), the tileset image will be reused wrongly.

This commit fixes the tileset key to make it equal to the image URL.
 2020-07-07 18:22:10 +02:00