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

340 commits

Author SHA1 Message Date
Kharhamel d32fca9777
Merge pull request #597 from psy/feature_streams 
add remote files and streams to playAudio
 2021-01-25 10:33:43 +01:00
Gregoire Parant 75d8d46c62 clean 2021-01-24 16:02:10 +01:00
Gregoire Parant d93a8da828 Fix custom character lazy loading 2021-01-24 15:57:47 +01:00
TabascoEye 39b433eef5
Update GameScene.ts 
stop all the map specific stuff (Jitsi, coWebsite, Audio) when leaving the scene
Fixes #633
 2021-01-23 01:16:13 +01:00
David Négrier adca51f6de Replacing FourOFourScene with more generic ErrorScene 2021-01-17 20:42:45 +01:00
psy 8d67947bc1 move map url to else case 2021-01-14 11:48:06 +01:00
psy f431e769cc add remote files and streams to playAudio 2021-01-14 11:45:14 +01:00
kharhamel 472fbb1de0 All player textures are now lazy-loaded 2021-01-08 11:44:41 +01:00
kharhamel 3ce8427378 fixed a game crashed because of lack of animations and improved the character class 2021-01-07 12:46:13 +01:00
kharhamel fbb44af369 added a basic loader 2021-01-06 17:08:48 +01:00
kharhamel 1359fbe977 updated phaser to version 3.51 and fixed the BC 2021-01-06 15:00:54 +01:00
Piotr Dobrowolski 28d687e338 front: implement map sounds 2021-01-04 16:57:31 +01:00
Oliver Lorenz 7c89cf0e47 feat: adds property openWebsitePolicy to set allow property in iframe 2020-12-29 23:17:16 +01:00
David Négrier e5138e1c03
Merge pull request #505 from thecodingmachine/fixFrameLocalStorage 
Manage Local Storage customers player error
 2020-12-18 16:33:36 +01:00
Gregoire Parant a1fd209578 Fix catch error 2020-12-18 16:30:22 +01:00
David Négrier 36f886aed6 Fixing cat running too fast on reconnect scene because animations were duplicated 2020-12-18 16:08:04 +01:00
David Négrier df114bc1ce Fixing broken reconnection 2020-12-18 15:59:07 +01:00
Gregoire Parant 323fa6abba Create exception error 2020-12-18 14:30:46 +01:00
Gregoire Parant f5dd5efc0e Manage Local Storage customers player error 2020-12-18 13:56:25 +01:00
kharhamel eb88db92be FIX: going back a 2nd time to SelectCharacterScene used to crash the game 2020-12-16 15:09:58 +01:00
kharhamel de9d6756b4 FIX: going to loginScene or customizeScene and then clicking next bring you back directly to the gameScene 2020-12-15 18:00:04 +01:00
kharhamel 069f2f1cec FEAT: prototype game menu using html elements, better icon for text chat 2020-12-15 16:37:57 +01:00
David Négrier 855b55903b
Merge pull request #440 from psy/develop 
center spawn position in the middle of a tile
 2020-12-11 17:36:10 +01:00
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
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
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 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
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
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
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
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
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
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
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
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 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
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 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 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 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 ed146226cf Adding Outline capabilities and a ActionableItem notion. 2020-07-23 18:09:24 +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
David Négrier 67e07c04f8 Fixing loading of tilesets with margin or padding 2020-07-05 17:10:08 +02:00
David Négrier d78006e106 Fixing memory leak with listeners 
The listeners from MediaManager and SimplePeer were never removed, leading to a huge amount of listeners all over the applications when switching regularly of scene.
 2020-06-23 15:02:35 +02:00
David Négrier a5514ce78a Code cleanup and removing exception in favor of console error 2020-06-22 18:42:54 +02:00
David Négrier 407c6db070 Fixing difference between MapKey and scene key (prevented proper caching of resources) 2020-06-22 17:18:24 +02:00
David Négrier 3f927280a6 Lint 2020-06-22 16:11:48 +02:00
David Négrier 9b174836cd Making sure connection is established again EVEN if the tab is not displayed 2020-06-22 16:11:02 +02:00
David Négrier f88f28db3f Refactoring reconnection: putting it into the GameScene directly. 2020-06-22 15:00:23 +02:00
David Négrier d785a8a1bf Refactoring connection to be part of a GameScene 
Most of the refactoring issues we are seeing are probably due to the fact that we are trying to manipulate a ScenePlugin out of a Scene (the GameManager is not a Scene and holds a reference to a ScenePlugin coming from a Scene that might get invalidated by Phaser 3).
Furthermore, if we want in the future to be able to scale, scenes could be hosted on different servers. Therefore, it makes no sense to have one connexion for the whole application.
Instead, we should have one connexion for each scene.
 2020-06-22 11:58:07 +02:00
David Négrier 4496c49621 Fix linting 2020-06-19 18:51:58 +02:00
David Négrier 2b820c7d56 Adding an event queue in the GameScene. 
Events are processed only in the 'update' method.
We hope this will solve a number of null pointer errors. See #194
 2020-06-19 18:18:43 +02:00
David Négrier e2be99490b Finishing removing any reference to "any" in the front. 2020-06-19 16:36:40 +02:00
David Négrier 39928b46f9 Removing any in the front 2020-06-19 14:30:34 +02:00
David Négrier 8348d13bfe Fixing use const instead of let 2020-06-19 14:30:34 +02:00
David Négrier 54f2518b5e Enabling stricter lint on front 2020-06-19 14:29:29 +02:00
David Négrier 80fddb3c69 Removing dead code 2020-06-10 16:01:01 +02:00