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

86 commits

Author SHA1 Message Date
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 6dc309db34 Fix manage webrtc room id 2020-05-08 21:17:52 +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 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 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
gparant 6a4aca723f Fix CI 2020-05-06 02:17:07 +02:00
gparant 5a6415607d Send event and play animation with user frame 2020-05-06 01:50:01 +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 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 b260dc32b5 Merge from master 2020-05-03 18:04:01 +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 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 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
gparant c48073b908 Fix update callback 2020-05-03 16:30:22 +02:00
gparant 372f938bbb Connect and Disconnect event. 2020-05-03 16:28:18 +02:00
David Négrier dcc9725abd Improving test 2020-05-03 16:22:42 +02:00
gparant 8357f9b8c2 Merge branch 'event_group' into webrtc 
# Conflicts:
#	back/src/Model/Group.ts
#	back/src/Model/World.ts
 2020-05-03 16:18:05 +02:00
David Négrier 58565a7f45 Refactoring events to connect/disconnect a user to a group 2020-05-03 16:08:04 +02:00
gparant bae03fb1cf Fix CI 2020-05-02 23:48:33 +02:00
gparant fdb40ec3e2 Fix webrtc multi 2020-05-02 20:46:02 +02:00
gparant aff77fe074 Merge remote-tracking branch 'github.com/master' into webrtc 
# Conflicts:
#	back/src/Model/Group.ts
#	back/src/Model/World.ts
 2020-05-02 00:36:04 +02:00
gparant c7f8f92e85 Fix webrtc 2020-05-02 00:31:44 +02:00
David Négrier d72741ce0c Fixing linting 2020-05-01 23:48:30 +02:00
gparant e06b20fe96 Update video style and start peer connexion 2020-05-01 21:15:00 +02:00
David Négrier c778afcbca Adding support for leaving the group if the socket is closed 2020-04-29 23:18:42 +02:00
David Négrier bf0fa516d4 First working version with disconnection 2020-04-29 23:12:55 +02:00
David Négrier 2a8e3ea323 Switching connection to a barycenter approach 2020-04-29 22:41:48 +02:00
David Négrier 5ffc5a420e Merge branch 'feature/back-players-proximity' into barycenter_based_groups 2020-04-29 22:06:37 +02:00
gparant 2bfa57b0ba Merge world and webrtc conexion 2020-04-29 01:40:32 +02:00
gparant 3151113db3 Merge branch 'master' into webrtc 
# Conflicts:
#	back/src/Model/Websocket/MessageUserPosition.ts
 2020-04-29 00:05:16 +02:00
David Négrier abeac558fd Adding TODO comment 2020-04-28 23:23:50 +02:00
David Négrier 7da8a6138f Adding a (failing test) for disconnecting users 2020-04-28 23:01:56 +02:00
David Négrier 9d2f96b348 Manually fixing a weird lint bug in eslint 2020-04-28 22:40:54 +02:00
David Négrier 7dc3d9d836 Merge 2020-04-28 22:31:54 +02:00
gparant 881bb04eb0 Implement Distance Merge Request 2020-04-27 00:44:25 +02:00
gparant c907048c12 Merge branch 'feature/back-players-proximity' into webrtc 2020-04-26 23:34:35 +02:00
gparant 9730df2295 Merge branch 'master' into feature/back-players-proximity 
# Conflicts:
#	back/src/Model/Websocket/MessageUserPosition.ts
 2020-04-26 23:31:40 +02:00
gparant d396ad2f41 Fix CI CD 2020-04-26 22:35:16 +02:00
gparant d7d7be9ed0 Web visio, add and remove video element 2020-04-26 19:12:01 +02:00
gparant 89db8558f6 Add multi SimplePear connection 2020-04-25 17:14:05 +02:00
gparant c28108f6c9 Use WebRtc with SimplePeer 2020-04-25 16:05:33 +02:00
gparant a5b5072de1 Fix webrtc 2020-04-20 01:10:47 +02:00