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
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
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
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
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
David Négrier
8ddd4656e6
Adding automatic loading of layers
2020-04-15 23:10:12 +02:00
David Négrier
5f118c2a4a
Removing all reference to 'Tiles' constant in code
2020-04-15 19:39:26 +02:00
David Négrier
1dd66b4998
Merging
2020-04-15 19:30:49 +02:00
David Négrier
b7220a6724
Merge pull request #47 from moufmouf/autoload_tiles
...
Autoload tiles
2020-04-15 19:27:40 +02:00
David Négrier
482a344f45
Autoload tiles
...
This commit adds a listener in the preload function that will be triggered as soon as the map is loaded.
This function will load the resources from the map (tilesets) defined in the map.
That way, we don't have to define manually the list of tiles that have to be loaded (at the expense of a slight delay in loading since we must wait for the map to be loaded to start loading the tiles).
2020-04-15 19:23:06 +02:00
kharhamel
935745b3b5
fixed the version mismatch of cypress between local and ci
2020-04-14 20:54:27 +02:00
kharhamel
5fb3968234
added artifact download
2020-04-14 20:42:57 +02:00
kharhamel
56093201fb
integrate it into the ci
2020-04-14 20:23:00 +02:00
kharhamel
a2ed7164e4
implemented basic e2e testing
2020-04-14 20:04:55 +02:00
NIP
c42dbc3f95
Fix JS issue regarding multiple tilesets
2020-04-13 21:24:48 +02:00
NIP
84f0420694
Change GameScene to import new png, change map name and add missing png files
2020-04-13 20:34:19 +02:00
grégoire parant
705617abe7
Merge pull request #45 from Kharhamel/camera
...
Better camera code
2020-04-13 20:08:33 +02:00
NIP
f00d10d56a
Change calque names into game scene TS file
2020-04-13 20:05:13 +02:00
kharhamel
1774594e76
deleted cameraManager, use camera follow code instead
2020-04-13 19:57:14 +02:00
