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).
grégoire parant [Mon, 13 Apr 2020 18:08:33 +0000 (20:08 +0200)]
Merge pull request #45 from Kharhamel/camera
Better camera code
kharhamel [Mon, 13 Apr 2020 17:56:41 +0000 (19:56 +0200)]
deleted cameraManager, use camera follow code instead
kharhamel [Mon, 13 Apr 2020 17:40:10 +0000 (19:40 +0200)]
create an env variable for debug mode
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
kharhamel [Sun, 12 Apr 2020 15:13:33 +0000 (17:13 +0200)]
made the player pushable by other models
kharhamel [Sun, 12 Apr 2020 15:08:28 +0000 (17:08 +0200)]
added other players models and fixed collision with other entities
kharhamel [Sun, 12 Apr 2020 14:12:08 +0000 (16:12 +0200)]
rewrote the app code to more easily allow for collisions
David Négrier [Sun, 12 Apr 2020 13:50:14 +0000 (15:50 +0200)]
Triggerring CI rerun
grégoire parant [Sun, 12 Apr 2020 12:00:28 +0000 (14:00 +0200)]
Merge pull request #36 from thecodingmachine/multi-players-on-map
Multi player on the map
gparant [Sun, 12 Apr 2020 11:57:00 +0000 (13:57 +0200)]
Fix feedback @kharhamel
kharhamel [Sat, 11 Apr 2020 16:17:36 +0000 (18:17 +0200)]
added a rock
kharhamel [Sat, 11 Apr 2020 14:46:28 +0000 (16:46 +0200)]
created a class to centralize all user inputs catching and expose user events
David Négrier [Sat, 11 Apr 2020 13:11:22 +0000 (15:11 +0200)]
Fixing Dockerfiles
David Négrier [Sat, 11 Apr 2020 10:27:03 +0000 (12:27 +0200)]
Fixing hosts in deeployer config
gparant [Fri, 10 Apr 2020 10:54:05 +0000 (12:54 +0200)]
Multi players on the map
- Fix share user position
- Fix initialise map
- Create function to add user on the map with back end data
David Négrier [Thu, 9 Apr 2020 13:10:44 +0000 (15:10 +0200)]
Fixing deeployer file
David Négrier [Thu, 9 Apr 2020 12:50:43 +0000 (14:50 +0200)]
Testing
David Négrier [Thu, 9 Apr 2020 12:21:43 +0000 (14:21 +0200)]
Setting Kube config in deeployer
David Négrier [Thu, 9 Apr 2020 10:14:06 +0000 (12:14 +0200)]
Adding namespace to deeployer
David Négrier [Thu, 9 Apr 2020 09:57:19 +0000 (11:57 +0200)]
Fixing push action
David Négrier [Thu, 9 Apr 2020 09:56:29 +0000 (11:56 +0200)]
Fixing push action
David Négrier [Thu, 9 Apr 2020 09:03:24 +0000 (11:03 +0200)]
Fixing action file
David Négrier [Thu, 9 Apr 2020 09:00:30 +0000 (11:00 +0200)]
Setting up continuous deployment
David Négrier [Wed, 8 Apr 2020 16:38:28 +0000 (18:38 +0200)]
Merge pull request #34 from thecodingmachine/Refactoring-Phaser-Class
Refactoring Phaser Game
gparant [Tue, 7 Apr 2020 21:56:16 +0000 (23:56 +0200)]
Fix play anim
gparant [Tue, 7 Apr 2020 20:38:53 +0000 (22:38 +0200)]
Fix and refactor with comments of @moumoug
gparant [Tue, 7 Apr 2020 19:03:33 +0000 (21:03 +0200)]
Change comment with new message strategy
gparant [Tue, 7 Apr 2020 19:02:23 +0000 (21:02 +0200)]
Fix Message send to add direction
gparant [Tue, 7 Apr 2020 18:46:30 +0000 (20:46 +0200)]
Fix CI
gparant [Tue, 7 Apr 2020 18:41:35 +0000 (20:41 +0200)]
Refactor to include connexion
gparant [Tue, 7 Apr 2020 17:23:21 +0000 (19:23 +0200)]
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.
David Négrier [Tue, 7 Apr 2020 06:31:44 +0000 (08:31 +0200)]
Merge pull request #32 from gparant/Camero-follow-player
The camera follows the player
gparant [Mon, 6 Apr 2020 23:28:36 +0000 (01:28 +0200)]
Camera following player.
- Add condition to follow the player.
- Add condition for the player never out map border.
David Négrier [Mon, 6 Apr 2020 21:29:22 +0000 (23:29 +0200)]
Merge pull request #31 from gparant/Camera-move-only-in-map
Fix to move the camera only in the map
gparant [Mon, 6 Apr 2020 20:55:09 +0000 (22:55 +0200)]
Fix to move the camera only in the map. The camera stops on the border map.
David Négrier [Mon, 6 Apr 2020 19:43:03 +0000 (21:43 +0200)]
Merge pull request #30 from Kharhamel/fixPlayerAnimation
allow player movement with proper animation
kharhamel [Mon, 6 Apr 2020 17:43:10 +0000 (19:43 +0200)]
allow player movement with proper animation
David Négrier [Mon, 6 Apr 2020 15:59:35 +0000 (17:59 +0200)]
Fixing CI file
David Négrier [Mon, 6 Apr 2020 15:59:06 +0000 (17:59 +0200)]
Merge branch 'master' of github.com:thecodingmachine/workadventure
David Négrier [Mon, 6 Apr 2020 15:55:42 +0000 (17:55 +0200)]
Merge pull request #28 from Kharhamel/cameraMovment
added code to freely move the camera
David Négrier [Mon, 6 Apr 2020 15:51:00 +0000 (17:51 +0200)]
Merge pull request #27 from Kharhamel/jasmine
added jasmine in the back
kharhamel [Mon, 6 Apr 2020 14:59:14 +0000 (16:59 +0200)]
added a way do speed up the camera movement
kharhamel [Mon, 6 Apr 2020 14:52:18 +0000 (16:52 +0200)]
added code to freely move the camera using the arrow keys or z,q,s,d
kharhamel [Mon, 6 Apr 2020 13:48:19 +0000 (15:48 +0200)]
added jasmine in the back
David Négrier [Mon, 6 Apr 2020 07:20:18 +0000 (09:20 +0200)]
Merge pull request #24 from thecodingmachine/Share-players-position-using-Socket.IO
Share players position using socket.io
gparant [Sun, 5 Apr 2020 18:57:14 +0000 (20:57 +0200)]
Front : create class to connect, send and receive message
- Create environment class
- Create Connexion class to connect and save data
- Refactor back api
David Négrier [Sun, 5 Apr 2020 14:20:53 +0000 (16:20 +0200)]
Loading first sprite
gparant [Sun, 5 Apr 2020 13:51:47 +0000 (15:51 +0200)]
Refactor to create interface rooms.
The ExtRooms permit to refresh position of all users in the map and create data to share.
gparant [Sun, 5 Apr 2020 12:31:49 +0000 (14:31 +0200)]
Refactor & Typo
gparant [Sat, 4 Apr 2020 21:29:36 +0000 (23:29 +0200)]
Fix typo
gparant [Sat, 4 Apr 2020 20:46:42 +0000 (22:46 +0200)]
Merge branch 'master' into Share-players-position-using-Socket.IO
# Conflicts:
# back/src/Controller/IoSocketController.ts
gparant [Sat, 4 Apr 2020 20:43:07 +0000 (22:43 +0200)]
Add readme of features and communication in back
David Négrier [Sat, 4 Apr 2020 20:40:18 +0000 (22:40 +0200)]
Merge pull request #19 from gparant/Setup-web-socket-connection
Setup web-socket connection
David Négrier [Sat, 4 Apr 2020 20:35:20 +0000 (22:35 +0200)]
Fixing typo in comment
gparant [Sat, 4 Apr 2020 17:25:08 +0000 (19:25 +0200)]
Share players position using Socket.IO
- I stocked information user (id, room and position) in socket client.
- I created function to send all information every few 10 milliseconds.
Note : when the front will be available, we must check the performance of back server.
gparant [Sat, 4 Apr 2020 15:56:43 +0000 (17:56 +0200)]
Refactor error message
gparant [Sat, 4 Apr 2020 15:22:02 +0000 (17:22 +0200)]
Add authenticate
- Create new controller authenticate with login root..
- Update and manage error message socket io.
- Create enum for environment variables
David Négrier [Sat, 4 Apr 2020 14:38:09 +0000 (16:38 +0200)]
Merge pull request #20 from thecodingmachine/noemie_nguyen/ajout_logos_tcm
Ajout des logos TCM
gparant [Sat, 4 Apr 2020 14:25:03 +0000 (16:25 +0200)]
Refactor and fix error hydration message socket io
- Position message send will be on format :
message :
userId : user identification
roomId: room identification
position: position of user in map
x: user x position on map
y: user y position on map
- Create Point object and interface to have position x and y of user in map.
David Négrier [Sat, 4 Apr 2020 14:18:13 +0000 (16:18 +0200)]
Merge pull request #23 from moufmouf/eslint_front
Adding ESLint for front part
David Négrier [Sat, 4 Apr 2020 14:16:20 +0000 (16:16 +0200)]
Adding ESLint for front part
David Négrier [Sat, 4 Apr 2020 14:08:31 +0000 (16:08 +0200)]
Merge pull request #22 from moufmouf/fix-ci
Fixing CI
David Négrier [Sat, 4 Apr 2020 14:06:38 +0000 (16:06 +0200)]
Fixing missing closing parenthesis
David Négrier [Sat, 4 Apr 2020 14:05:31 +0000 (16:05 +0200)]
Adding build badge to README
David Négrier [Sat, 4 Apr 2020 14:02:41 +0000 (16:02 +0200)]
Adding fake API_URL for tests
David Négrier [Sat, 4 Apr 2020 13:58:59 +0000 (15:58 +0200)]
Fixing CI
David Négrier [Sat, 4 Apr 2020 13:57:39 +0000 (15:57 +0200)]
Merge pull request #21 from moufmouf/ci
Adding continuous integration
David Négrier [Sat, 4 Apr 2020 13:55:20 +0000 (15:55 +0200)]
Adding continuous integration
kevin [Sat, 4 Apr 2020 13:42:45 +0000 (15:42 +0200)]
ajout des logos TCM
gparant [Sat, 4 Apr 2020 12:05:18 +0000 (14:05 +0200)]
Setup web-socket connection
- Add authentification socket.io with jwt token
David Négrier [Sat, 4 Apr 2020 11:19:40 +0000 (13:19 +0200)]
Merge pull request #18 from gparant/create-backend
Create backend
David Négrier [Sat, 4 Apr 2020 11:18:45 +0000 (13:18 +0200)]
Fixing typos
gparant [Sat, 4 Apr 2020 10:42:02 +0000 (12:42 +0200)]
Add io socket message to share user position.
- Add message 'user-position' to share position in a room.
- Change JoinRoomMessage to MessageUserPosition to have all data to share position and user information
- Fix error alias to build
gparant [Sat, 4 Apr 2020 09:36:18 +0000 (11:36 +0200)]
Add Vagarnt in project RADME and fix feeback @moufmouf
gparant [Sat, 4 Apr 2020 02:33:57 +0000 (04:33 +0200)]
Add Vagrantfile
gparant [Sat, 4 Apr 2020 02:08:12 +0000 (04:08 +0200)]
Create backend
- NodeJs
- Express
- Socket.io
- Eslint
- TypeScript