Commit Graph

829 Commits

Author SHA1 Message Date
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
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
David Négrier
df5b183cba Merge 2020-05-03 15:51:16 +02:00
David Négrier
c4f1aa1811 Removing comment 2020-05-03 15:31:20 +02:00
David Négrier
76b745ebea Putting the name in GameManager rather than passing it from scene to scene. 2020-05-03 15:29:40 +02:00
David Négrier
5601e5e134 Adding login method back for future use in LogincScene 2020-05-03 15:18:15 +02:00
gparant
85ab0a231f Fix style cam 2020-05-03 14:29:45 +02:00
gparant
bae03fb1cf Fix CI 2020-05-02 23:48:33 +02:00
gparant
0d6ce5e6e9 Merge branch 'master' into webrtc
# Conflicts:
#	front/src/Phaser/Player/Player.ts
2020-05-02 20:51:49 +02:00
gparant
fdb40ec3e2 Fix webrtc multi 2020-05-02 20:46:02 +02:00
Kharhamel
dcaf9a8e46
Merge pull request #71 from thecodingmachine/improveAnims
used Phaser's event system to remove the dependency of Player on Connexion
2020-05-02 17:36:51 +02:00
kharhamel
ad65de75fd used the vent system to remove the dependency of Player on Connexion 2020-05-02 16:56:36 +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
David Négrier
0c04d4305b Displaying the name of a player above its head (names are not passed through the network yet) 2020-05-01 23:38:09 +02:00
David Négrier
42ddd8b858 Changed font from text
Input name can only be 4 characters long
Passing name to next scene
2020-05-01 23:19:51 +02:00
David Négrier
85f84517f6 Adding logo in the bottom right corner and placing help text in function of height 2020-05-01 22:23:41 +02:00
David Négrier
d2f94e9406
Merge pull request #68 from thecodingmachine/improveAnims
reenabled diagonal movement
2020-05-01 22:03:06 +02:00
gparant
e06b20fe96 Update video style and start peer connexion 2020-05-01 21:15:00 +02:00
kharhamel
dd0744387f reenabled diagonal movement 2020-04-30 19:36:28 +02:00
Kharhamel
c9e0be85ac
Merge pull request #67 from thecodingmachine/loginSceneFix
remove the GameSceneInterface from LoginScene
2020-04-30 19:20:44 +02:00
kharhamel
62d2498e34 remove the GameSceneInterface from LoginScene 2020-04-30 19:18:35 +02:00
David Négrier
e4052a07f3
Merge pull request #63 from thecodingmachine/barycenter_based_groups
Barycenter based groups
2020-04-29 23:28:23 +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
David Négrier
6087b51099
Merge pull request #54 from thecodingmachine/webrtc
Create webrtc connexion
2020-04-29 18:10:21 +02:00
gparant
dbf0bef149 Delete file 2020-04-29 17:55:55 +02:00
gparant
58df4118d1 Refactor 2020-04-29 17:49:40 +02:00
gparant
91851c95f3 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
2020-04-29 17:37:17 +02:00
David Négrier
a286d57a33
Merge pull request #61 from thecodingmachine/simplify
first step in simplification: remove the concept of room in the front…
2020-04-29 17:11:22 +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
gparant
4e556782af Fix integration login scene in game manager 2020-04-29 00:01:37 +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
8d784008b8
Merge pull request #57 from thecodingmachine/characters
Adding a huge collection of characters to play with
2020-04-28 22:51:24 +02:00
David Négrier
216a3008f4
Merge pull request #25 from thecodingmachine/feature/back-players-proximity
Backend - compute proximity between players and create groups of close users
2020-04-28 22:49:31 +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
8c935e8b27 Merge branch 'master' into webrtc
# Conflicts:
#	front/src/Phaser/Game/GameManager.ts
2020-04-28 20:50:51 +02:00
David Négrier
edc1136401 Merge branch 'master' of github.com:thecodingmachine/workadventure into simplify 2020-04-27 22:39:46 +02:00
David Négrier
3b9eb73929 Adding a huge collection of characters to play with 2020-04-27 22:38:21 +02:00