noby/workadventure
2
2
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
827 Commits 1 Branch 0 Tags 26 MiB
f05f4a7f5b
Commit Graph

827 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
grégoire parant
bdea7e49d1
Update back/src/Controller/MapController.ts 
Co-authored-by: David Négrier <d.negrier@thecodingmachine.com>
 2020-05-10 14:48:58 +02:00
grégoire parant
929bb37728
Update back/src/Controller/MapController.ts 
Co-authored-by: David Négrier <d.negrier@thecodingmachine.com>
 2020-05-10 14:48:34 +02:00
gparant
5f11b065e1 Permit to dissociate data by room 
- Update share room id.
 - Join room when a scene is loaded.
 - Add a room in constant variable.
 2020-05-10 13:58:32 +02:00
gparant
27c6034661 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".
 2020-05-09 21:28:50 +02:00
gparant
fb8d9bf9a8 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
 2020-05-09 19:41:21 +02:00
gparant
7f989cfd23 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
 2020-05-09 17:50:47 +02:00
gparant
4157a12f5d Update name map 
- Change name in game scene and login scene
 2020-05-09 16:47:55 +02:00
gparant
b983fff076 Add map 1st floor 
Rename map to floor 0
 2020-05-09 16:38:13 +02:00
David Négrier
c63752aa4b
Merge pull request #85 from thecodingmachine/fix/webrtc-group 
Fix WebRtc group
 2020-05-09 09:00:34 +02:00
gparant
6dc309db34 Fix manage webrtc room id 2020-05-08 21:17:52 +02:00
gparant
59127534ac Fix User depth 
- Update strategy layers depth
 - Add depth to manager layers positions between all users
 2020-05-08 17:35:40 +02:00
David Négrier
c59d693f6e
Merge pull request #83 from thecodingmachine/cleanup_rename_frame 
Cleanup: renaming "frame" to "character"
 2020-05-08 16:21:16 +02:00
David Négrier
e4824fe34d
Merge pull request #81 from thecodingmachine/display_groups 
Adding the display of a circle around the group
 2020-05-08 16:20:56 +02:00
David Négrier
25b7fc5e36
Merge pull request #82 from thecodingmachine/fix/webrtc 
Fix webrtc
 2020-05-08 16:14:49 +02:00
David Négrier
b2a5cb1720 Refactoring display of circle around group 
The circle is now a sprite and not generated on every frame using a giant "graphics" object
 2020-05-08 16:09:50 +02:00
David Négrier
8e9c1cac1e Renaming frame in tests 2020-05-08 15:20:49 +02:00
David Négrier
492196b333 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.
 2020-05-08 15:18:22 +02:00
gparant
8991b6f817 Add layer override 2020-05-08 13:18:34 +02:00
gparant
a87cbe4470 Personalization of DAM office 2020-05-08 12:43:02 +02:00
gparant
802d710006 Fix lint tsc 2020-05-08 11:58:09 +02:00
gparant
41f5b5a1f6 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.
 2020-05-08 11:54:47 +02:00
gparant
16cf33755c Fix webrtc back 
- Add refuse to join if webrtc room have 4 players.
 2020-05-08 11:16:49 +02:00
David Négrier
02e6b50b16 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.
 2020-05-08 00:35:36 +02:00
David Négrier
ddbd4f4c06
Merge pull request #80 from thecodingmachine/display_groups 
Fixing "none" animation does not exist log
 2020-05-08 00:33:41 +02:00
David Négrier
05fbcad252 Fixing "none" animation does not exist log 2020-05-07 23:33:21 +02:00
David Négrier
8fb9053412
Merge pull request #76 from thecodingmachine/feature/login-page 
Feature/login page
 2020-05-06 09:47:44 +02:00
gparant
3ec167ee44 Merge branch 'master' into feature/login-page 
# Conflicts:
#	front/src/Phaser/Game/GameScene.ts
#	front/src/Phaser/Login/LogincScene.ts
 2020-05-06 02:20:28 +02:00
gparant
6a4aca723f Fix CI 2020-05-06 02:17:07 +02:00
gparant
ebbe60f10f Delete comment 2020-05-06 02:13:00 +02:00
gparant
b12d762ffe Fix to add frame of player user 2020-05-06 02:12:37 +02:00
gparant
4e04357b71 Merge branch 'refactoring_messages' into feature/login-page 
# Conflicts:
#	front/src/Phaser/Player/Player.ts
 2020-05-06 01:58:04 +02:00
gparant
5a6415607d Send event and play animation with user frame 2020-05-06 01:50:01 +02:00
David Négrier
86abdfe30b 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.
 2020-05-04 23:11:59 +02:00
David Négrier
587caf968c
Merge pull request #77 from thecodingmachine/e2efix 
Fixing Cypress tests
 2020-05-04 18:48:03 +02:00
David Négrier
ad3484285b Fixing Cypress tests 2020-05-04 18:38:04 +02:00
gparant
b51ce51847 Fix unit test 2020-05-04 08:44:07 +02:00
gparant
03bda7ddd5 Fix CI 2020-05-04 01:54:49 +02:00
gparant
58a1a8a3c9 Add select player in login page 2020-05-04 01:48:14 +02:00
gparant
b65e37c468 Name of map users 
- Add name on user
 - Delete NonPlayer class not used
 2020-05-03 22:24:14 +02:00
David Négrier
8355a89dc5 Fixing master deployment 2020-05-03 18:51:25 +02:00
David Négrier
e666fe3fa1
Merge pull request #69 from thecodingmachine/improve_welcome_screen 
Improving welcome screen
 2020-05-03 18:21:24 +02:00
David Négrier
b260dc32b5 Merge from master 2020-05-03 18:04:01 +02:00
David Négrier
591ce585c5
Merge pull request #72 from thecodingmachine/event_group 
Refactoring events to connect/disconnect a user to a group
 2020-05-03 18:02:12 +02:00
David Négrier
d9fd2f7d5a Merge branch 'master' of github.com:thecodingmachine/workadventure into event_group 2020-05-03 17:53:05 +02:00
David Négrier
5f320102bb
Merge pull request #73 from thecodingmachine/groupradius 
Making the group radius distinct from the minimum distance to connect 2 players
 2020-05-03 17:52:46 +02:00
David Négrier
9c32c930a0 Merge 2020-05-03 17:47:54 +02:00
David Négrier
bf723b2e30 Reducing connection distance and group radius 2020-05-03 17:46:26 +02:00
David Négrier
58f29a8250
Merge pull request #70 from thecodingmachine/webrtc 
Webrtc
 2020-05-03 17:38:44 +02:00
gparant
fb255140e5 Add feature to mute or switch off cam 2020-05-03 17:19:42 +02:00
David Négrier
3b27f8b000 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)
 2020-05-03 16:57:17 +02:00