Commit Graph

1556 Commits

Author SHA1 Message Date
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
David Négrier cdd18fd5ac
Merge pull request #59 from thecodingmachine/map-v0
Map v0: Resize chunksize from 16 to 32 pixels
2020-04-27 18:22:24 +02:00
David Négrier 0d6c4032d5 Playing with zoom levels 2020-04-27 18:12:36 +02:00
kharhamel ee4a59578a first step in simplification: remove the concept of room in the front end 2020-04-27 15:03:05 +02:00
Kharhamel 8bd4e81f48
Merge pull request #53 from Kharhamel/login
Login screen
2020-04-27 13:02:16 +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 ecdbf4269a Merge branch 'master' into webrtc 2020-04-26 23:22:40 +02:00
gparant 3f975171c2 Fix import 2020-04-26 23:22:13 +02:00
gparant d396ad2f41 Fix CI CD 2020-04-26 22:35:16 +02:00
David Négrier e7bbe29123 Merge branch 'master' of github.com:thecodingmachine/workadventure into map-v0 2020-04-26 21:48:57 +02:00
David Négrier a3cabff445 Merge branch 'map-v0' of github.com:thecodingmachine/workadventure into map-v0 2020-04-26 21:48:42 +02:00
gparant b49c012319 Add button to enter un visio 2020-04-26 20:55:20 +02:00
gparant 707931724f Start visio with user colision
When user enter in colision with other colision, webrtc start visio
2020-04-26 19:59:51 +02:00
gparant d7d7be9ed0 Web visio, add and remove video element 2020-04-26 19:12:01 +02:00
kharhamel 25ac579a90 prettier login page 2020-04-26 18:48:41 +02:00
kharhamel d691b58d0b basic login page with a text input and a click button 2020-04-26 17:54:56 +02:00
gparant e178712457 Fix send message webrtc 2020-04-26 17:43:21 +02:00
gparant e4a30712b5 Update front mutli peer conncexion 2020-04-26 17:42:49 +02:00
NIP 5b6c7a9b5f Resize chunksize from 16 to 32 pixels 2020-04-26 11:46:00 +02:00
gparant 575054fe4f Fix multi video 2020-04-25 20:29:03 +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