_Bastler/partey_workadventure
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
3,056 Commits 2 Branches 0 Tags 47 MiB
c32a523923
Commit Graph

3056 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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