Commit Graph

1556 Commits

Author SHA1 Message Date
David Négrier b5901b253a Deploying one environment per branch 2020-04-13 18:44:12 +02:00
grégoire parant 1c833f6114
Merge pull request #42 from gparant/refactor-sizing-character
Refactor sizing hitbox character
2020-04-13 17:04:33 +02:00
gparant d6653c61cc Add comment talk when user have a collision & comment collision shwon 2020-04-13 16:56:06 +02:00
gparant ba3f0e07f8 Refactor sizing hitbox charactere 2020-04-13 16:53:19 +02:00
grégoire parant 2ce6ed2d48
Merge pull request #40 from thecodingmachine/kharhamel-interaction
conflict interaction @Kharhamel
2020-04-13 16:10:09 +02:00
gparant b391ee271a Fix move & stop player 2020-04-13 15:41:11 +02:00
gparant ab70b28bb3 Fix, current player say 2020-04-13 15:35:38 +02:00
gparant 2afe6b4b6e Fix feadback @Kharhamel 2020-04-13 15:34:09 +02:00
gparant 48fe86634f Add feature to move bubble 2020-04-13 15:15:20 +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 877a47e2dd Fixing Dockerfile build path 2020-04-13 14:46:45 +02:00
gparant 01dbff7aee 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
2020-04-13 13:42:21 +02:00
kharhamel c51f5f4aa9 added som ebasic speech bubbles 2020-04-12 19:35:51 +02:00
kharhamel 05379c8001 the other playes now run away from the player on contact 2020-04-12 19:06:31 +02:00
kharhamel 97a55ab66c fixed the player animations 2020-04-12 18:28:05 +02:00
kharhamel d1106d757d made the player pushable by other models 2020-04-12 17:13:33 +02:00
kharhamel 2b2b615e7b added other players models and fixed collision with other entities 2020-04-12 17:08:28 +02:00
kharhamel 6e27377b07 rewrote the app code to more easily allow for collisions 2020-04-12 16:12:08 +02:00
David Négrier 62dd34b591 Triggerring CI rerun 2020-04-12 15:50:14 +02:00
grégoire parant b3afc877c7
Merge pull request #36 from thecodingmachine/multi-players-on-map
Multi player on the map
2020-04-12 14:00:28 +02:00
gparant bbc3935d60 Fix feedback @kharhamel 2020-04-12 13:57:00 +02:00
kharhamel 241cbd720a added a rock 2020-04-11 18:17:36 +02:00
kharhamel 793e5318f7 created a class to centralize all user inputs catching and expose user events 2020-04-11 16:46:28 +02:00
David Négrier d979636a19 Fixing Dockerfiles 2020-04-11 15:11:22 +02:00
David Négrier 7b51f734c5 Fixing hosts in deeployer config 2020-04-11 12:27:03 +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 fd4d8dc651 Fixing deeployer file 2020-04-09 15:10:44 +02:00
David Négrier d68e39f2e3 Testing 2020-04-09 14:50:43 +02:00
David Négrier 3038141070 Setting Kube config in deeployer 2020-04-09 14:21:43 +02:00
David Négrier 8eba5276dd Adding namespace to deeployer 2020-04-09 12:14:06 +02:00
David Négrier 1376d5b24c Fixing push action 2020-04-09 11:57:19 +02:00
David Négrier 3b3e615e37 Fixing push action 2020-04-09 11:56:29 +02:00
David Négrier c6770042b3 Fixing action file 2020-04-09 11:03:24 +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
David Négrier 6bec8b3703
Merge pull request #34 from thecodingmachine/Refactoring-Phaser-Class
Refactoring Phaser Game
2020-04-08 18:38:28 +02:00
gparant 9d83ba22d5 Fix play anim 2020-04-07 23:56:16 +02:00
gparant 25895e51f7 Fix and refactor with comments of @moumoug 2020-04-07 22:38:53 +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
gparant aba3322188 Fix CI 2020-04-07 20:46:30 +02:00
gparant bac1e804ad Refactor to include connexion 2020-04-07 20:41:35 +02:00
gparant 5d463d097a Refactor Class
- Add MapManager permit to create map, camera and player.
 - Add CameraManager permit to move and update camera.
 - Add player Call extended of Phaser.GameObjects.Sprite. Permit to manager player data and moving in the map.
 - Add Animation class permit to manage the player animations.
2020-04-07 19:23:21 +02:00
David MAECHLER 6cca64e62e Merge branch 'master' of https://github.com/thecodingmachine/workadventure into feature/back-players-proximity 2020-04-07 10:08:16 +02:00
David MAECHLER fbfc208129 BIG WIP of refactoring my work in TS 2020-04-07 10:08:04 +02:00
David Négrier 833e7554f4
Merge pull request #32 from gparant/Camero-follow-player
The camera follows the player
2020-04-07 08:31:44 +02:00
gparant e52183830d Camera following player.
- Add condition to follow the player.
 - Add condition for the player never out map border.
2020-04-07 01:28:36 +02:00
David Négrier 2b42735018
Merge pull request #31 from gparant/Camera-move-only-in-map
Fix to move the camera only in the map
2020-04-06 23:29:22 +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