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 |
|
gparant
|
5b62ac39fb
|
Create webrtc connexion between two player
|
2020-04-19 19:32:38 +02:00 |
|
David Négrier
|
d826668273
|
Merge pull request #35 from thecodingmachine/cd
Installing a continuous deployement environement
|
2020-04-13 14:53:09 +02:00 |
|
David Négrier
|
62dd34b591
|
Triggerring CI rerun
|
2020-04-12 15:50:14 +02:00 |
|
David Négrier
|
d979636a19
|
Fixing Dockerfiles
|
2020-04-11 15:11:22 +02:00 |
|
gparant
|
d257b2b944
|
Multi players on the map
- Fix share user position
- Fix initialise map
- Create function to add user on the map with back end data
|
2020-04-10 12:54:05 +02:00 |
|
David MAECHLER
|
4bc23ede90
|
unit test on connect is working, lets start the worst ....
|
2020-04-09 23:26:19 +02:00 |
|
David Négrier
|
bc7b5fc6c9
|
Setting up continuous deployment
|
2020-04-09 11:00:30 +02:00 |
|
David MAECHLER
|
e3b0f99f04
|
blocked on some logic...WIP commit
|
2020-04-08 20:40:44 +02:00 |
|
gparant
|
77780bd27b
|
Change comment with new message strategy
|
2020-04-07 21:03:33 +02:00 |
|
gparant
|
67c3eaa7f4
|
Fix Message send to add direction
|
2020-04-07 21:02:23 +02:00 |
|
David MAECHLER
|
fbfc208129
|
BIG WIP of refactoring my work in TS
|
2020-04-07 10:08:04 +02:00 |
|
David MAECHLER
|
af5d2a5a97
|
Merge branch 'master' of https://github.com/thecodingmachine/workadventure into feature/back-players-proximity
|
2020-04-06 23:02:01 +02:00 |
|
David MAECHLER
|
60c0188e9e
|
Merge branch 'master' of https://github.com/thecodingmachine/workadventure into feature/back-players-proximity
|
2020-04-06 17:35:58 +02:00 |
|
kharhamel
|
ded19549c7
|
added jasmine in the back
|
2020-04-06 15:48:19 +02:00 |
|
David MAECHLER
|
3bcb12b3ef
|
add stub method for recheck on group members proximity
|
2020-04-06 02:00:21 +02:00 |
|
David MAECHLER
|
886477cddf
|
fix stupid error in for loop
|
2020-04-06 01:45:51 +02:00 |
|