gparant [Wed, 29 Apr 2020 15:37:17 +0000 (17:37 +0200)]
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
David Négrier [Wed, 29 Apr 2020 15:11:22 +0000 (17:11 +0200)]
Merge pull request #61 from thecodingmachine/simplify
first step in simplification: remove the concept of room in the front…
gparant [Tue, 28 Apr 2020 23:40:32 +0000 (01:40 +0200)]
Merge world and webrtc conexion
gparant [Tue, 28 Apr 2020 22:05:16 +0000 (00:05 +0200)]
Merge branch 'master' into webrtc
# Conflicts:
# back/src/Model/Websocket/MessageUserPosition.ts
gparant [Tue, 28 Apr 2020 22:01:37 +0000 (00:01 +0200)]
Fix integration login scene in game manager
David Négrier [Tue, 28 Apr 2020 20:51:24 +0000 (22:51 +0200)]
Merge pull request #57 from thecodingmachine/characters
Adding a huge collection of characters to play with
David Négrier [Tue, 28 Apr 2020 20:49:31 +0000 (22:49 +0200)]
Merge pull request #25 from thecodingmachine/feature/back-players-proximity
Backend - compute proximity between players and create groups of close users
David Négrier [Tue, 28 Apr 2020 20:40:54 +0000 (22:40 +0200)]
Manually fixing a weird lint bug in eslint
David Négrier [Tue, 28 Apr 2020 20:31:54 +0000 (22:31 +0200)]
Merge
gparant [Tue, 28 Apr 2020 18:50:51 +0000 (20:50 +0200)]
Merge branch 'master' into webrtc
# Conflicts:
# front/src/Phaser/Game/GameManager.ts
David Négrier [Mon, 27 Apr 2020 20:39:46 +0000 (22:39 +0200)]
Merge branch 'master' of github.com:thecodingmachine/workadventure into simplify
David Négrier [Fri, 24 Apr 2020 19:57:59 +0000 (21:57 +0200)]
Adding a huge collection of characters to play with
David Négrier [Mon, 27 Apr 2020 16:22:24 +0000 (18:22 +0200)]
Merge pull request #59 from thecodingmachine/map-v0
Map v0: Resize chunksize from 16 to 32 pixels
David Négrier [Mon, 27 Apr 2020 16:12:36 +0000 (18:12 +0200)]
Playing with zoom levels
kharhamel [Mon, 27 Apr 2020 13:03:05 +0000 (15:03 +0200)]
first step in simplification: remove the concept of room in the front end
Kharhamel [Mon, 27 Apr 2020 11:02:16 +0000 (13:02 +0200)]
Merge pull request #53 from Kharhamel/login
Login screen
gparant [Sun, 26 Apr 2020 22:44:25 +0000 (00:44 +0200)]
Implement Distance Merge Request
gparant [Sun, 26 Apr 2020 21:34:35 +0000 (23:34 +0200)]
Merge branch 'feature/back-players-proximity' into webrtc
gparant [Sun, 26 Apr 2020 21:31:40 +0000 (23:31 +0200)]
Merge branch 'master' into feature/back-players-proximity
# Conflicts:
# back/src/Model/Websocket/MessageUserPosition.ts
gparant [Sun, 26 Apr 2020 21:22:40 +0000 (23:22 +0200)]
Merge branch 'master' into webrtc
gparant [Sun, 26 Apr 2020 21:22:13 +0000 (23:22 +0200)]
Fix import
gparant [Sun, 26 Apr 2020 20:35:16 +0000 (22:35 +0200)]
Fix CI CD
David Négrier [Sun, 26 Apr 2020 19:48:57 +0000 (21:48 +0200)]
Merge branch 'master' of github.com:thecodingmachine/workadventure into map-v0
David Négrier [Sun, 26 Apr 2020 19:48:42 +0000 (21:48 +0200)]
Merge branch 'map-v0' of github.com:thecodingmachine/workadventure into map-v0
gparant [Sun, 26 Apr 2020 18:55:20 +0000 (20:55 +0200)]
Add button to enter un visio
gparant [Sun, 26 Apr 2020 17:59:51 +0000 (19:59 +0200)]
Start visio with user colision
When user enter in colision with other colision, webrtc start visio
gparant [Sun, 26 Apr 2020 17:12:01 +0000 (19:12 +0200)]
Web visio, add and remove video element
kharhamel [Sun, 26 Apr 2020 16:48:41 +0000 (18:48 +0200)]
prettier login page
kharhamel [Sun, 26 Apr 2020 15:54:56 +0000 (17:54 +0200)]
basic login page with a text input and a click button
gparant [Sun, 26 Apr 2020 15:43:21 +0000 (17:43 +0200)]
Fix send message webrtc
gparant [Sun, 26 Apr 2020 15:42:49 +0000 (17:42 +0200)]
Update front mutli peer conncexion
NIP [Sun, 26 Apr 2020 09:46:00 +0000 (11:46 +0200)]
Resize chunksize from 16 to 32 pixels
gparant [Sat, 25 Apr 2020 18:29:03 +0000 (20:29 +0200)]
Fix multi video
gparant [Sat, 25 Apr 2020 15:14:05 +0000 (17:14 +0200)]
Add multi SimplePear connection
gparant [Sat, 25 Apr 2020 14:05:33 +0000 (16:05 +0200)]
Use WebRtc with SimplePeer
David Négrier [Fri, 24 Apr 2020 17:08:08 +0000 (19:08 +0200)]
Merge pull request #44 from thecodingmachine/map-v0
My first map representing TCM office grand floor without KEN office
David Négrier [Fri, 24 Apr 2020 16:55:47 +0000 (18:55 +0200)]
Merge pull request #51 from thecodingmachine/constant_speed
Computing movement amount from framerate
David Négrier [Wed, 22 Apr 2020 21:40:46 +0000 (23:40 +0200)]
Merge pull request #56 from thecodingmachine/enabling_https
Enabling HTTPS in test deployment
David Négrier [Wed, 22 Apr 2020 21:34:56 +0000 (23:34 +0200)]
Switching tests on https too
David Négrier [Wed, 22 Apr 2020 21:27:30 +0000 (23:27 +0200)]
Fixing API link to HTTPS
David Négrier [Wed, 22 Apr 2020 17:16:04 +0000 (19:16 +0200)]
Enabling HTTPS in test deployment
David Négrier [Wed, 22 Apr 2020 10:31:17 +0000 (12:31 +0200)]
Adapting deeployer to new format
gparant [Sun, 19 Apr 2020 23:10:47 +0000 (01:10 +0200)]
Fix webrtc
gparant [Sun, 19 Apr 2020 20:30:42 +0000 (22:30 +0200)]
Fix video call
gparant [Sun, 19 Apr 2020 17:32:38 +0000 (19:32 +0200)]
Create webrtc connexion between two player
David Négrier [Sat, 18 Apr 2020 15:16:39 +0000 (17:16 +0200)]
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.
NIP [Fri, 17 Apr 2020 16:39:54 +0000 (18:39 +0200)]
Add new map with embed tileset
David Négrier [Thu, 16 Apr 2020 20:44:44 +0000 (22:44 +0200)]
Merge branch 'map-v0' of github.com:thecodingmachine/workadventure into map-v0
David Négrier [Thu, 16 Apr 2020 20:44:31 +0000 (22:44 +0200)]
Merge
David Négrier [Thu, 16 Apr 2020 20:42:02 +0000 (22:42 +0200)]
Merge pull request #50 from thecodingmachine/e2e
WIP: implemented basic e2e testing for k8s environment
David Négrier [Thu, 16 Apr 2020 20:31:48 +0000 (22:31 +0200)]
Removing E2E test from running in CI (it is run in K8S now)
NIP [Thu, 16 Apr 2020 19:55:34 +0000 (21:55 +0200)]
MERGE and add floorLayer
NIP [Thu, 16 Apr 2020 19:37:31 +0000 (21:37 +0200)]
Add floorLayer to the map
David Négrier [Wed, 15 Apr 2020 22:13:40 +0000 (00:13 +0200)]
Fixing bad file name
David Négrier [Wed, 15 Apr 2020 22:06:24 +0000 (00:06 +0200)]
Trying to change Cypress basu URL
David Négrier [Wed, 15 Apr 2020 21:57:36 +0000 (23:57 +0200)]
Backporting master changes
David Négrier [Wed, 15 Apr 2020 21:54:55 +0000 (23:54 +0200)]
Running e2e tests on K8S environment
David Négrier [Wed, 15 Apr 2020 21:31:39 +0000 (23:31 +0200)]
First working version of the office map! Yay!
David Négrier [Wed, 15 Apr 2020 21:13:14 +0000 (23:13 +0200)]
Merge pull request #48 from moufmouf/autoload_tiles
Removing all reference to 'Tiles' constant in code
David Négrier [Wed, 15 Apr 2020 21:10:12 +0000 (23:10 +0200)]
Adding automatic loading of layers
David Négrier [Wed, 15 Apr 2020 17:39:26 +0000 (19:39 +0200)]
Removing all reference to 'Tiles' constant in code
David Négrier [Wed, 15 Apr 2020 17:30:49 +0000 (19:30 +0200)]
Merging
David Négrier [Wed, 15 Apr 2020 17:27:40 +0000 (19:27 +0200)]
Merge pull request #47 from moufmouf/autoload_tiles
Autoload tiles
David Négrier [Wed, 15 Apr 2020 17:23:06 +0000 (19:23 +0200)]
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).
kharhamel [Tue, 14 Apr 2020 18:54:27 +0000 (20:54 +0200)]
fixed the version mismatch of cypress between local and ci
kharhamel [Tue, 14 Apr 2020 18:42:57 +0000 (20:42 +0200)]
added artifact download
kharhamel [Tue, 14 Apr 2020 18:16:51 +0000 (20:16 +0200)]
integrate it into the ci
kharhamel [Tue, 14 Apr 2020 18:04:55 +0000 (20:04 +0200)]
implemented basic e2e testing
NIP [Mon, 13 Apr 2020 19:24:48 +0000 (21:24 +0200)]
Fix JS issue regarding multiple tilesets
NIP [Mon, 13 Apr 2020 18:34:19 +0000 (20:34 +0200)]
Change GameScene to import new png, change map name and add missing png files
grégoire parant [Mon, 13 Apr 2020 18:08:33 +0000 (20:08 +0200)]
Merge pull request #45 from Kharhamel/camera
Better camera code
NIP [Mon, 13 Apr 2020 18:05:13 +0000 (20:05 +0200)]
Change calque names into game scene TS file
kharhamel [Mon, 13 Apr 2020 17:56:41 +0000 (19:56 +0200)]
deleted cameraManager, use camera follow code instead
NIP [Mon, 13 Apr 2020 17:52:25 +0000 (19:52 +0200)]
Add tilesets
kharhamel [Mon, 13 Apr 2020 17:40:10 +0000 (19:40 +0200)]
create an env variable for debug mode
NIP [Mon, 13 Apr 2020 17:38:28 +0000 (19:38 +0200)]
My first map representing TCM office grand floor without KEN office
David Négrier [Mon, 13 Apr 2020 16:52:56 +0000 (18:52 +0200)]
Merge pull request #41 from thecodingmachine/one_env_per_branch
Deploying one environment per branch
David Négrier [Mon, 13 Apr 2020 16:34:13 +0000 (18:34 +0200)]
Using tagged version for rlespinasse/github-slug-action
David Négrier [Mon, 13 Apr 2020 16:33:27 +0000 (18:33 +0200)]
Fixing version
David Négrier [Mon, 13 Apr 2020 16:30:22 +0000 (18:30 +0200)]
Adding a message with deployment location at the end of deployment
David Négrier [Mon, 13 Apr 2020 16:15:27 +0000 (18:15 +0200)]
Fixing slugify issue
David Négrier [Mon, 13 Apr 2020 13:45:35 +0000 (15:45 +0200)]
Fixing action
David Négrier [Mon, 13 Apr 2020 13:44:33 +0000 (15:44 +0200)]
Fixing ref slug
David Négrier [Mon, 13 Apr 2020 13:14:16 +0000 (15:14 +0200)]
Fixing libsonnet and changing deployment namespace
David Négrier [Mon, 13 Apr 2020 13:08:36 +0000 (15:08 +0200)]
Triggering build and deploy on every branch
David Négrier [Mon, 13 Apr 2020 13:07:04 +0000 (15:07 +0200)]
Deploying one environment per branch
grégoire parant [Mon, 13 Apr 2020 15:04:33 +0000 (17:04 +0200)]
Merge pull request #42 from gparant/refactor-sizing-character
Refactor sizing hitbox character
gparant [Mon, 13 Apr 2020 14:56:06 +0000 (16:56 +0200)]
Add comment talk when user have a collision & comment collision shwon
gparant [Mon, 13 Apr 2020 14:53:19 +0000 (16:53 +0200)]
Refactor sizing hitbox charactere
grégoire parant [Mon, 13 Apr 2020 14:10:09 +0000 (16:10 +0200)]
Merge pull request #40 from thecodingmachine/kharhamel-interaction
conflict interaction @Kharhamel
gparant [Mon, 13 Apr 2020 13:41:11 +0000 (15:41 +0200)]
Fix move & stop player
gparant [Mon, 13 Apr 2020 13:35:38 +0000 (15:35 +0200)]
Fix, current player say
gparant [Mon, 13 Apr 2020 13:34:09 +0000 (15:34 +0200)]
Fix feadback @Kharhamel
gparant [Mon, 13 Apr 2020 13:15:20 +0000 (15:15 +0200)]
Add feature to move bubble
David Négrier [Mon, 13 Apr 2020 12:53:09 +0000 (14:53 +0200)]
Merge pull request #35 from thecodingmachine/cd
Installing a continuous deployement environement
David Négrier [Mon, 13 Apr 2020 12:46:45 +0000 (14:46 +0200)]
Fixing Dockerfile build path
gparant [Mon, 13 Apr 2020 11:42:21 +0000 (13:42 +0200)]
Merge branch 'interaction' into kharhamel-interaction
# Conflicts:
# front/src/Phaser/Game/CameraManager.ts
# front/src/Phaser/Game/GameScene.ts
# front/src/Phaser/Game/MapManager.ts
# front/src/Phaser/Player/Player.ts
kharhamel [Sun, 12 Apr 2020 17:35:51 +0000 (19:35 +0200)]
added som ebasic speech bubbles
kharhamel [Sun, 12 Apr 2020 17:06:31 +0000 (19:06 +0200)]
the other playes now run away from the player on contact
kharhamel [Sun, 12 Apr 2020 16:28:05 +0000 (18:28 +0200)]
fixed the player animations