Commit Graph

1901 Commits

Author SHA1 Message Date
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
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
NIP
7b41a9ee2f Add tilesets 2020-04-13 19:52:25 +02:00
kharhamel
33c58874e0 create an env variable for debug mode 2020-04-13 19:40:10 +02:00
NIP
7f2f977a81 My first map representing TCM office grand floor without KEN office 2020-04-13 19:38:28 +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
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
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
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 Négrier
bc7b5fc6c9 Setting up continuous deployment 2020-04-09 11:00:30 +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
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
gparant
ddc39d6e50 Fix to move the camera only in the map. The camera stops on the border map. 2020-04-06 22:55:09 +02:00
kharhamel
406b299f91 allow player movement with proper animation 2020-04-06 19:53:07 +02:00
David Négrier
cf7125301a Merge branch 'master' of github.com:thecodingmachine/workadventure 2020-04-06 17:59:06 +02:00
kharhamel
d0c09ecd4f added a way do speed up the camera movement 2020-04-06 16:59:14 +02:00
kharhamel
7146decb5b added code to freely move the camera using the arrow keys or z,q,s,d 2020-04-06 16:52:18 +02:00
gparant
7e08e7f133 Front : create class to connect, send and receive message
- Create environment class
 - Create Connexion class to connect and save data
 - Refactor back api
2020-04-05 20:57:14 +02:00
David Négrier
b10f8d9069 Loading first sprite 2020-04-05 16:20:53 +02:00
David Négrier
08989d6ec0
Merge pull request #20 from thecodingmachine/noemie_nguyen/ajout_logos_tcm
Ajout des logos TCM
2020-04-04 16:38:09 +02:00
David Négrier
ca3d113cad Adding ESLint for front part 2020-04-04 16:16:20 +02:00
David Négrier
531899ea6b Fixing missing closing parenthesis 2020-04-04 16:06:38 +02:00
kevin
25841b51c0 ajout des logos TCM 2020-04-04 15:42:45 +02:00
David Négrier
c0e75ae07e
Merge pull request #16 from moufmouf/docker-compose
Adding docker-compose
2020-04-03 18:48:36 +02:00
David Négrier
9290dfd6c5 Automatically resizing game when window is resized 2020-04-03 18:41:06 +02:00
David Négrier
f1ab9705c9 Adding docker-compose
This first commit contains a docker-compose with:

- front container
- traefik for reverse proxy

back container will be added when ready.
2020-04-03 18:31:11 +02:00
David Négrier
26b8412f3c Initial commit 2020-04-03 14:56:21 +02:00