Commit Graph

1632 Commits

Author SHA1 Message Date
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
David Négrier
33bcbd4650
Merge pull request #44 from thecodingmachine/map-v0
My first map representing TCM office grand floor without KEN office
2020-04-24 19:08:08 +02:00
David Négrier
f62b5d14ee
Merge pull request #51 from thecodingmachine/constant_speed
Computing movement amount from framerate
2020-04-24 18:55:47 +02:00
David Négrier
6c6625fd41
Merge pull request #56 from thecodingmachine/enabling_https
Enabling HTTPS in test deployment
2020-04-22 23:40:46 +02:00
David Négrier
6a349e3ef7 Switching tests on https too 2020-04-22 23:34:56 +02:00
David Négrier
321254bc2c Fixing API link to HTTPS 2020-04-22 23:27:39 +02:00
David Négrier
312940761c Enabling HTTPS in test deployment 2020-04-22 19:16:04 +02:00
David Négrier
a567cd2e11 Adapting deeployer to new format 2020-04-22 12:31:17 +02:00
gparant
a5b5072de1 Fix webrtc 2020-04-20 01:10:47 +02:00
gparant
89816a13e4 Fix video call 2020-04-19 22:30:42 +02:00
gparant
5b62ac39fb Create webrtc connexion between two player 2020-04-19 19:32:38 +02:00
David Négrier
46fcb86b28 Computing movement amount from framerate
Depending on the amount of power a computer has, the framerate will not be the same.
Hence, the amount of movement of a user should be constant on each frame.
If a frame was slow to print, the movement should be higher to keep a constant speed.

This PR takes the framerate into account when moving the players.
2020-04-18 17:16:39 +02:00
NIP
91dd903904 Add new map with embed tileset 2020-04-17 18:39:54 +02:00
David Négrier
bccd2efc2e Merge branch 'map-v0' of github.com:thecodingmachine/workadventure into map-v0 2020-04-16 22:44:44 +02:00
David Négrier
db605d100e Merge 2020-04-16 22:44:31 +02:00
David Négrier
0f2e21e88e
Merge pull request #50 from thecodingmachine/e2e
WIP: implemented basic e2e testing for k8s environment
2020-04-16 22:42:02 +02:00
David Négrier
c4b9c02d75 Removing E2E test from running in CI (it is run in K8S now) 2020-04-16 22:36:54 +02:00
NIP
95e51c7aa4 MERGE and add floorLayer 2020-04-16 21:55:34 +02:00
NIP
7e8283ddf0 Add floorLayer to the map 2020-04-16 21:37:31 +02:00
David Négrier
c0f2b890ef Fixing bad file name 2020-04-16 00:13:40 +02:00
David Négrier
75941a5c68 Trying to change Cypress basu URL 2020-04-16 00:06:24 +02:00
David Négrier
9175682f32 Backporting master changes 2020-04-15 23:57:36 +02:00
David Négrier
84edc1a2c4 Running e2e tests on K8S environment 2020-04-15 23:54:55 +02:00
David Négrier
2037147d18 First working version of the office map! Yay! 2020-04-15 23:31:39 +02:00
David Négrier
258c792531
Merge pull request #48 from moufmouf/autoload_tiles
Removing all reference to 'Tiles' constant in code
2020-04-15 23:13:14 +02:00