gparant [Mon, 11 May 2020 18:53:23 +0000 (20:53 +0200)]
Fix position layer in map lyon
David Négrier [Mon, 11 May 2020 16:49:20 +0000 (18:49 +0200)]
Refactoring "exit" to allow multiple maps
Adding several layers named "exit" causes issues with Phaser 3.
This PR makes any possible layer being an exit layer (it only depends on the exitUrl property)
Also, fixing start position (it takes into account the layer width now)
William [Mon, 11 May 2020 12:00:15 +0000 (14:00 +0200)]
use start and exit layers on map
David Négrier [Mon, 11 May 2020 06:57:17 +0000 (08:57 +0200)]
Merge pull request #88 from thecodingmachine/feature/map-floor1
Map 1st floor
David Négrier [Mon, 11 May 2020 06:51:46 +0000 (08:51 +0200)]
Rewording exit paragraph
gparant [Sun, 10 May 2020 22:32:37 +0000 (00:32 +0200)]
Fix exit tile map of floot1
gparant [Sun, 10 May 2020 22:25:06 +0000 (00:25 +0200)]
Fix url to get the next map in GameScene
gparant [Sun, 10 May 2020 22:07:54 +0000 (00:07 +0200)]
Add explain to have multi exit layers into the map
gparant [Sun, 10 May 2020 21:49:08 +0000 (23:49 +0200)]
Fix error mapping refresh in back & the end of this feature development
gparant [Sun, 10 May 2020 17:54:41 +0000 (19:54 +0200)]
Refactor leave and join room
gparant [Sun, 10 May 2020 17:45:17 +0000 (19:45 +0200)]
Change to update world by scene and room id
gparant [Sun, 10 May 2020 16:34:55 +0000 (18:34 +0200)]
Fix feedback @moufmouf strategy of maps managing by back.
gparant [Sun, 10 May 2020 15:55:30 +0000 (17:55 +0200)]
Fix feedback @moufmouf on circle texture
gparant [Sun, 10 May 2020 15:31:27 +0000 (17:31 +0200)]
Remove middleware to secure access API.
gparant [Sun, 10 May 2020 12:49:49 +0000 (14:49 +0200)]
Correct feedback @moufmouf
grégoire parant [Sun, 10 May 2020 12:48:58 +0000 (14:48 +0200)]
Update back/src/Controller/MapController.ts
Co-authored-by: David Négrier <d.negrier@thecodingmachine.com>
grégoire parant [Sun, 10 May 2020 12:48:34 +0000 (14:48 +0200)]
Update back/src/Controller/MapController.ts
Co-authored-by: David Négrier <d.negrier@thecodingmachine.com>
gparant [Sun, 10 May 2020 11:58:32 +0000 (13:58 +0200)]
Permit to dissociate data by room
- Update share room id.
- Join room when a scene is loaded.
- Add a room in constant variable.
gparant [Sat, 9 May 2020 19:28:50 +0000 (21:28 +0200)]
Manage multi scene
- Create position and check if user is in position to switch in the next scene.
- When scene is load, we load all scene in the layer of name "exit".
- Layer "exit" of map.json have a parametter "exitSceneKey" to identify next scene.
- Add layer "start", the player could start in the scene on the object present in the layer of name "start".
gparant [Sat, 9 May 2020 17:41:21 +0000 (19:41 +0200)]
Multi Scene in back end
- Change maps url to get maps
- Change GameScene to create scene with file since back end
- Change LoginScene to upload scene and start game
gparant [Sat, 9 May 2020 15:50:47 +0000 (17:50 +0200)]
Add maps in back
- Add all map json in back
- Create middleware to check authentification user
- Create controllers to get map
- Create access to get all files in folder Assets/Maps
gparant [Sat, 9 May 2020 14:47:55 +0000 (16:47 +0200)]
Update name map
- Change name in game scene and login scene
gparant [Sat, 9 May 2020 14:38:13 +0000 (16:38 +0200)]
Add map 1st floor
Rename map to floor 0
David Négrier [Sat, 9 May 2020 07:00:34 +0000 (09:00 +0200)]
Merge pull request #85 from thecodingmachine/fix/webrtc-group
Fix WebRtc group
gparant [Fri, 8 May 2020 19:17:52 +0000 (21:17 +0200)]
Fix manage webrtc room id
gparant [Fri, 8 May 2020 15:35:40 +0000 (17:35 +0200)]
Fix User depth
- Update strategy layers depth
- Add depth to manager layers positions between all users
David Négrier [Fri, 8 May 2020 14:21:16 +0000 (16:21 +0200)]
Merge pull request #83 from thecodingmachine/cleanup_rename_frame
Cleanup: renaming "frame" to "character"
David Négrier [Fri, 8 May 2020 14:20:56 +0000 (16:20 +0200)]
Merge pull request #81 from thecodingmachine/display_groups
Adding the display of a circle around the group
David Négrier [Fri, 8 May 2020 14:14:49 +0000 (16:14 +0200)]
Merge pull request #82 from thecodingmachine/fix/webrtc
Fix webrtc
David Négrier [Fri, 8 May 2020 14:09:50 +0000 (16:09 +0200)]
Refactoring display of circle around group
The circle is now a sprite and not generated on every frame using a giant "graphics" object
David Négrier [Fri, 8 May 2020 13:20:49 +0000 (15:20 +0200)]
Renaming frame in tests
David Négrier [Fri, 8 May 2020 13:18:22 +0000 (15:18 +0200)]
Cleanup: renaming "frame" to "character"
The "frame" variable actually contains a string pointing to the character selected.
It has nothing to do with a frame which is usually a particular image in an animation.
I'm renaming the variable accross the application to avoid confusion.
gparant [Fri, 8 May 2020 11:18:34 +0000 (13:18 +0200)]
Add layer override
gparant [Fri, 8 May 2020 10:43:02 +0000 (12:43 +0200)]
Personalization of DAM office
gparant [Fri, 8 May 2020 09:58:09 +0000 (11:58 +0200)]
Fix lint tsc
gparant [Fri, 8 May 2020 09:54:47 +0000 (11:54 +0200)]
Fix shares information to enter into Webrtc room.
- Refactor share position in world class.
- Update selects a client to send information about connecting WebRtc room.
gparant [Fri, 8 May 2020 09:16:49 +0000 (11:16 +0200)]
Fix webrtc back
- Add refuse to join if webrtc room have 4 players.
David Négrier [Thu, 7 May 2020 22:35:36 +0000 (00:35 +0200)]
Adding the display of a circle around the group
This PR adds the display of a circle around groups. This is useful to view where you need to go to speak to someone but also to debug.
Note: implementation is suboptimal, relying on a "graphics" object that is known to be slow. In the future, we need to use a circle as a sprite instead.
David Négrier [Thu, 7 May 2020 22:33:41 +0000 (00:33 +0200)]
Merge pull request #80 from thecodingmachine/display_groups
Fixing "none" animation does not exist log
David Négrier [Thu, 7 May 2020 21:33:21 +0000 (23:33 +0200)]
Fixing "none" animation does not exist log
David Négrier [Wed, 6 May 2020 07:47:44 +0000 (09:47 +0200)]
Merge pull request #76 from thecodingmachine/feature/login-page
Feature/login page
gparant [Wed, 6 May 2020 00:20:28 +0000 (02:20 +0200)]
Merge branch 'master' into feature/login-page
# Conflicts:
# front/src/Phaser/Game/GameScene.ts
# front/src/Phaser/Login/LogincScene.ts
gparant [Wed, 6 May 2020 00:17:07 +0000 (02:17 +0200)]
Fix CI
gparant [Wed, 6 May 2020 00:13:00 +0000 (02:13 +0200)]
Delete comment
gparant [Wed, 6 May 2020 00:12:37 +0000 (02:12 +0200)]
Fix to add frame of player user
gparant [Tue, 5 May 2020 23:58:04 +0000 (01:58 +0200)]
Merge branch 'refactoring_messages' into feature/login-page
# Conflicts:
# front/src/Phaser/Player/Player.ts
gparant [Tue, 5 May 2020 23:50:01 +0000 (01:50 +0200)]
Send event and play animation with user frame
David Négrier [Mon, 4 May 2020 21:11:59 +0000 (23:11 +0200)]
Only sending move events if the player actually moved
If the player did not move a pixel (and if it did not change direction), then do not send an event to save bandwidth and processing.
David Négrier [Mon, 4 May 2020 16:48:03 +0000 (18:48 +0200)]
Merge pull request #77 from thecodingmachine/e2efix
Fixing Cypress tests
David Négrier [Mon, 4 May 2020 16:38:04 +0000 (18:38 +0200)]
Fixing Cypress tests
gparant [Mon, 4 May 2020 06:44:07 +0000 (08:44 +0200)]
Fix unit test
gparant [Sun, 3 May 2020 23:54:49 +0000 (01:54 +0200)]
Fix CI
gparant [Sun, 3 May 2020 23:48:14 +0000 (01:48 +0200)]
Add select player in login page
gparant [Sun, 3 May 2020 20:24:14 +0000 (22:24 +0200)]
Name of map users
- Add name on user
- Delete NonPlayer class not used
David Négrier [Sun, 3 May 2020 16:51:25 +0000 (18:51 +0200)]
Fixing master deployment
David Négrier [Sun, 3 May 2020 16:21:24 +0000 (18:21 +0200)]
Merge pull request #69 from thecodingmachine/improve_welcome_screen
Improving welcome screen
David Négrier [Sun, 3 May 2020 16:04:01 +0000 (18:04 +0200)]
Merge from master
David Négrier [Sun, 3 May 2020 16:02:12 +0000 (18:02 +0200)]
Merge pull request #72 from thecodingmachine/event_group
Refactoring events to connect/disconnect a user to a group
David Négrier [Sun, 3 May 2020 15:53:05 +0000 (17:53 +0200)]
Merge branch 'master' of github.com:thecodingmachine/workadventure into event_group
David Négrier [Sun, 3 May 2020 15:52:46 +0000 (17:52 +0200)]
Merge pull request #73 from thecodingmachine/groupradius
Making the group radius distinct from the minimum distance to connect 2 players
David Négrier [Sun, 3 May 2020 15:47:54 +0000 (17:47 +0200)]
Merge
David Négrier [Sun, 3 May 2020 15:46:26 +0000 (17:46 +0200)]
Reducing connection distance and group radius
David Négrier [Sun, 3 May 2020 15:38:44 +0000 (17:38 +0200)]
Merge pull request #70 from thecodingmachine/webrtc
Webrtc
gparant [Sun, 3 May 2020 15:19:42 +0000 (17:19 +0200)]
Add feature to mute or switch off cam
David Négrier [Sun, 3 May 2020 14:56:19 +0000 (16:56 +0200)]
Making the group radius distinct from the minimum distance to connect 2 players
Also, changed default settings from 160px for Group Radius to 120px
(minimum distance to connect 2 players remains 160px)
gparant [Sun, 3 May 2020 14:30:22 +0000 (16:30 +0200)]
Fix update callback
gparant [Sun, 3 May 2020 14:28:18 +0000 (16:28 +0200)]
Connect and Disconnect event.
David Négrier [Sun, 3 May 2020 14:22:42 +0000 (16:22 +0200)]
Improving test
gparant [Sun, 3 May 2020 14:18:05 +0000 (16:18 +0200)]
Merge branch 'event_group' into webrtc
# Conflicts:
# back/src/Model/Group.ts
# back/src/Model/World.ts
David Négrier [Sun, 3 May 2020 14:08:04 +0000 (16:08 +0200)]
Refactoring events to connect/disconnect a user to a group
David Négrier [Sun, 3 May 2020 13:51:16 +0000 (15:51 +0200)]
Merge
David Négrier [Sun, 3 May 2020 13:31:20 +0000 (15:31 +0200)]
Removing comment
David Négrier [Sun, 3 May 2020 13:29:40 +0000 (15:29 +0200)]
Putting the name in GameManager rather than passing it from scene to scene.
David Négrier [Sun, 3 May 2020 13:18:15 +0000 (15:18 +0200)]
Adding login method back for future use in LogincScene
gparant [Sun, 3 May 2020 12:29:45 +0000 (14:29 +0200)]
Fix style cam
gparant [Sat, 2 May 2020 21:48:33 +0000 (23:48 +0200)]
Fix CI
gparant [Sat, 2 May 2020 18:51:49 +0000 (20:51 +0200)]
Merge branch 'master' into webrtc
# Conflicts:
# front/src/Phaser/Player/Player.ts
gparant [Sat, 2 May 2020 18:46:02 +0000 (20:46 +0200)]
Fix webrtc multi
Kharhamel [Sat, 2 May 2020 15:36:51 +0000 (17:36 +0200)]
Merge pull request #71 from thecodingmachine/improveAnims
used Phaser's event system to remove the dependency of Player on Connexion
kharhamel [Sat, 2 May 2020 14:54:52 +0000 (16:54 +0200)]
used the vent system to remove the dependency of Player on Connexion
gparant [Fri, 1 May 2020 22:36:04 +0000 (00:36 +0200)]
Merge remote-tracking branch 'github.com/master' into webrtc
# Conflicts:
# back/src/Model/Group.ts
# back/src/Model/World.ts
gparant [Fri, 1 May 2020 22:31:44 +0000 (00:31 +0200)]
Fix webrtc
David Négrier [Fri, 1 May 2020 21:48:30 +0000 (23:48 +0200)]
Fixing linting
David Négrier [Fri, 1 May 2020 21:38:09 +0000 (23:38 +0200)]
Displaying the name of a player above its head (names are not passed through the network yet)
David Négrier [Fri, 1 May 2020 21:19:51 +0000 (23:19 +0200)]
Changed font from text
Input name can only be 4 characters long
Passing name to next scene
David Négrier [Fri, 1 May 2020 20:23:41 +0000 (22:23 +0200)]
Adding logo in the bottom right corner and placing help text in function of height
David Négrier [Fri, 1 May 2020 20:03:06 +0000 (22:03 +0200)]
Merge pull request #68 from thecodingmachine/improveAnims
reenabled diagonal movement
gparant [Fri, 1 May 2020 19:15:00 +0000 (21:15 +0200)]
Update video style and start peer connexion
kharhamel [Thu, 30 Apr 2020 17:36:28 +0000 (19:36 +0200)]
reenabled diagonal movement
Kharhamel [Thu, 30 Apr 2020 17:20:44 +0000 (19:20 +0200)]
Merge pull request #67 from thecodingmachine/loginSceneFix
remove the GameSceneInterface from LoginScene
kharhamel [Thu, 30 Apr 2020 17:18:35 +0000 (19:18 +0200)]
remove the GameSceneInterface from LoginScene
David Négrier [Wed, 29 Apr 2020 21:28:23 +0000 (23:28 +0200)]
Merge pull request #63 from thecodingmachine/barycenter_based_groups
Barycenter based groups
David Négrier [Wed, 29 Apr 2020 21:18:42 +0000 (23:18 +0200)]
Adding support for leaving the group if the socket is closed
David Négrier [Wed, 29 Apr 2020 21:12:55 +0000 (23:12 +0200)]
First working version with disconnection
David Négrier [Wed, 29 Apr 2020 20:41:48 +0000 (22:41 +0200)]
Switching connection to a barycenter approach
David Négrier [Wed, 29 Apr 2020 20:06:37 +0000 (22:06 +0200)]
Merge branch 'feature/back-players-proximity' into barycenter_based_groups
David Négrier [Wed, 29 Apr 2020 16:10:21 +0000 (18:10 +0200)]
Merge pull request #54 from thecodingmachine/webrtc
Create webrtc connexion
gparant [Wed, 29 Apr 2020 15:55:55 +0000 (17:55 +0200)]
Delete file
gparant [Wed, 29 Apr 2020 15:49:40 +0000 (17:49 +0200)]
Refactor
gparant [Wed, 29 Apr 2020 15:37:17 +0000 (17:37 +0200)]
Merge remote-tracking branch 'github.com/master' into webrtc
# Conflicts:
# front/src/Connexion.ts
# front/src/Phaser/Game/GameManager.ts
# front/src/Phaser/Game/GameScene.ts
# front/src/index.ts