libreadventure.git
4 years agoMERGE and add floorLayer
NIP [Thu, 16 Apr 2020 19:55:34 +0000 (21:55 +0200)]
MERGE and add floorLayer

4 years agoAdd floorLayer to the map
NIP [Thu, 16 Apr 2020 19:37:31 +0000 (21:37 +0200)]
Add floorLayer to the map

4 years agoFirst working version of the office map! Yay!
David Négrier [Wed, 15 Apr 2020 21:31:39 +0000 (23:31 +0200)]
First working version of the office map! Yay!

4 years agoMerge pull request #48 from moufmouf/autoload_tiles
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

4 years agoAdding automatic loading of layers
David Négrier [Wed, 15 Apr 2020 21:10:12 +0000 (23:10 +0200)]
Adding automatic loading of layers

4 years agoRemoving all reference to 'Tiles' constant in code
David Négrier [Wed, 15 Apr 2020 17:39:26 +0000 (19:39 +0200)]
Removing all reference to 'Tiles' constant in code

4 years agoMerging
David Négrier [Wed, 15 Apr 2020 17:30:49 +0000 (19:30 +0200)]
Merging

4 years agoMerge pull request #47 from moufmouf/autoload_tiles
David Négrier [Wed, 15 Apr 2020 17:27:40 +0000 (19:27 +0200)]
Merge pull request #47 from moufmouf/autoload_tiles

Autoload tiles

4 years agoAutoload 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).

4 years agoFix JS issue regarding multiple tilesets
NIP [Mon, 13 Apr 2020 19:24:48 +0000 (21:24 +0200)]
Fix JS issue regarding multiple tilesets

4 years agoChange GameScene to import new png, change map name and add missing png files
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

4 years agoMerge pull request #45 from Kharhamel/camera
grégoire parant [Mon, 13 Apr 2020 18:08:33 +0000 (20:08 +0200)]
Merge pull request #45 from Kharhamel/camera

Better camera code

4 years agoChange calque names into game scene TS file
NIP [Mon, 13 Apr 2020 18:05:13 +0000 (20:05 +0200)]
Change calque names into game scene TS file

4 years agodeleted cameraManager, use camera follow code instead
kharhamel [Mon, 13 Apr 2020 17:56:41 +0000 (19:56 +0200)]
deleted cameraManager, use camera follow code instead

4 years agoAdd tilesets
NIP [Mon, 13 Apr 2020 17:52:25 +0000 (19:52 +0200)]
Add tilesets

4 years agocreate an env variable for debug mode
kharhamel [Mon, 13 Apr 2020 17:40:10 +0000 (19:40 +0200)]
create an env variable for debug mode

4 years agoMy first map representing TCM office grand floor without KEN office
NIP [Mon, 13 Apr 2020 17:38:28 +0000 (19:38 +0200)]
My first map representing TCM office grand floor without KEN office

4 years agoMerge pull request #41 from thecodingmachine/one_env_per_branch
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

4 years agoUsing tagged version for rlespinasse/github-slug-action
David Négrier [Mon, 13 Apr 2020 16:34:13 +0000 (18:34 +0200)]
Using tagged version for rlespinasse/github-slug-action

4 years agoFixing version
David Négrier [Mon, 13 Apr 2020 16:33:27 +0000 (18:33 +0200)]
Fixing version

4 years agoAdding a message with deployment location at the end of deployment
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

4 years agoFixing slugify issue
David Négrier [Mon, 13 Apr 2020 16:15:27 +0000 (18:15 +0200)]
Fixing slugify issue

4 years agoFixing action
David Négrier [Mon, 13 Apr 2020 13:45:35 +0000 (15:45 +0200)]
Fixing action

4 years agoFixing ref slug
David Négrier [Mon, 13 Apr 2020 13:44:33 +0000 (15:44 +0200)]
Fixing ref slug

4 years agoFixing libsonnet and changing deployment namespace
David Négrier [Mon, 13 Apr 2020 13:14:16 +0000 (15:14 +0200)]
Fixing libsonnet and changing deployment namespace

4 years agoTriggering build and deploy on every branch
David Négrier [Mon, 13 Apr 2020 13:08:36 +0000 (15:08 +0200)]
Triggering build and deploy on every branch

4 years agoDeploying one environment per branch
David Négrier [Mon, 13 Apr 2020 13:07:04 +0000 (15:07 +0200)]
Deploying one environment per branch

4 years agoMerge pull request #42 from gparant/refactor-sizing-character
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

4 years agoAdd comment talk when user have a collision & comment collision shwon
gparant [Mon, 13 Apr 2020 14:56:06 +0000 (16:56 +0200)]
Add comment talk when user have a collision & comment collision shwon

4 years agoRefactor sizing hitbox charactere
gparant [Mon, 13 Apr 2020 14:53:19 +0000 (16:53 +0200)]
Refactor sizing hitbox charactere

4 years agoMerge pull request #40 from thecodingmachine/kharhamel-interaction
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

4 years agoFix move & stop player
gparant [Mon, 13 Apr 2020 13:41:11 +0000 (15:41 +0200)]
Fix move & stop player

4 years agoFix, current player say
gparant [Mon, 13 Apr 2020 13:35:38 +0000 (15:35 +0200)]
Fix, current player say

4 years agoFix feadback @Kharhamel
gparant [Mon, 13 Apr 2020 13:34:09 +0000 (15:34 +0200)]
Fix feadback @Kharhamel

4 years agoAdd feature to move bubble
gparant [Mon, 13 Apr 2020 13:15:20 +0000 (15:15 +0200)]
Add feature to move bubble

4 years agoMerge pull request #35 from thecodingmachine/cd
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

4 years agoFixing Dockerfile build path
David Négrier [Mon, 13 Apr 2020 12:46:45 +0000 (14:46 +0200)]
Fixing Dockerfile build path

4 years agoMerge branch 'interaction' into kharhamel-interaction
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

4 years agoadded som ebasic speech bubbles
kharhamel [Sun, 12 Apr 2020 17:35:51 +0000 (19:35 +0200)]
added som ebasic speech bubbles

4 years agothe other playes now run away from the player on contact
kharhamel [Sun, 12 Apr 2020 17:06:31 +0000 (19:06 +0200)]
the other playes now run away from the player on contact

4 years agofixed the player animations
kharhamel [Sun, 12 Apr 2020 16:28:05 +0000 (18:28 +0200)]
fixed the player animations

4 years agomade the player pushable by other models
kharhamel [Sun, 12 Apr 2020 15:13:33 +0000 (17:13 +0200)]
made the player pushable by other models

4 years agoadded other players models and fixed collision with other entities
kharhamel [Sun, 12 Apr 2020 15:08:28 +0000 (17:08 +0200)]
added other players models and fixed collision with other entities

4 years agorewrote the app code to more easily allow for collisions
kharhamel [Sun, 12 Apr 2020 14:12:08 +0000 (16:12 +0200)]
rewrote the app code to more easily allow for collisions

4 years agoTriggerring CI rerun
David Négrier [Sun, 12 Apr 2020 13:50:14 +0000 (15:50 +0200)]
Triggerring CI rerun

4 years agoMerge pull request #36 from thecodingmachine/multi-players-on-map
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

4 years agoFix feedback @kharhamel
gparant [Sun, 12 Apr 2020 11:57:00 +0000 (13:57 +0200)]
Fix feedback @kharhamel

4 years agoadded a rock
kharhamel [Sat, 11 Apr 2020 16:17:36 +0000 (18:17 +0200)]
added a rock

4 years agocreated a class to centralize all user inputs catching and expose user events
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

4 years agoFixing Dockerfiles
David Négrier [Sat, 11 Apr 2020 13:11:22 +0000 (15:11 +0200)]
Fixing Dockerfiles

4 years agoFixing hosts in deeployer config
David Négrier [Sat, 11 Apr 2020 10:27:03 +0000 (12:27 +0200)]
Fixing hosts in deeployer config

4 years agoMulti players on the map
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

4 years agoFixing deeployer file
David Négrier [Thu, 9 Apr 2020 13:10:44 +0000 (15:10 +0200)]
Fixing deeployer file

4 years agoTesting
David Négrier [Thu, 9 Apr 2020 12:50:43 +0000 (14:50 +0200)]
Testing

4 years agoSetting Kube config in deeployer
David Négrier [Thu, 9 Apr 2020 12:21:43 +0000 (14:21 +0200)]
Setting Kube config in deeployer

4 years agoAdding namespace to deeployer
David Négrier [Thu, 9 Apr 2020 10:14:06 +0000 (12:14 +0200)]
Adding namespace to deeployer

4 years agoFixing push action
David Négrier [Thu, 9 Apr 2020 09:57:19 +0000 (11:57 +0200)]
Fixing push action

4 years agoFixing push action
David Négrier [Thu, 9 Apr 2020 09:56:29 +0000 (11:56 +0200)]
Fixing push action

4 years agoFixing action file
David Négrier [Thu, 9 Apr 2020 09:03:24 +0000 (11:03 +0200)]
Fixing action file

4 years agoSetting up continuous deployment
David Négrier [Thu, 9 Apr 2020 09:00:30 +0000 (11:00 +0200)]
Setting up continuous deployment

4 years agoMerge pull request #34 from thecodingmachine/Refactoring-Phaser-Class
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

4 years agoFix play anim
gparant [Tue, 7 Apr 2020 21:56:16 +0000 (23:56 +0200)]
Fix play anim

4 years agoFix and refactor with comments of @moumoug
gparant [Tue, 7 Apr 2020 20:38:53 +0000 (22:38 +0200)]
Fix and refactor with comments of @moumoug

4 years agoChange comment with new message strategy
gparant [Tue, 7 Apr 2020 19:03:33 +0000 (21:03 +0200)]
Change comment with new message strategy

4 years agoFix Message send to add direction
gparant [Tue, 7 Apr 2020 19:02:23 +0000 (21:02 +0200)]
Fix Message send to add direction

4 years agoFix CI
gparant [Tue, 7 Apr 2020 18:46:30 +0000 (20:46 +0200)]
Fix CI

4 years agoRefactor to include connexion
gparant [Tue, 7 Apr 2020 18:41:35 +0000 (20:41 +0200)]
Refactor to include connexion

4 years agoRefactor Class
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.

4 years agoMerge pull request #32 from gparant/Camero-follow-player
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

4 years agoCamera following 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.

4 years agoMerge pull request #31 from gparant/Camera-move-only-in-map
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

4 years agoFix to move the camera only in the map. The camera stops on the border 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.

4 years agoMerge pull request #30 from Kharhamel/fixPlayerAnimation
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

4 years agoallow player movement with proper animation
kharhamel [Mon, 6 Apr 2020 17:43:10 +0000 (19:43 +0200)]
allow player movement with proper animation

4 years agoFixing CI file
David Négrier [Mon, 6 Apr 2020 15:59:35 +0000 (17:59 +0200)]
Fixing CI file

4 years agoMerge branch 'master' of github.com:thecodingmachine/workadventure
David Négrier [Mon, 6 Apr 2020 15:59:06 +0000 (17:59 +0200)]
Merge branch 'master' of github.com:thecodingmachine/workadventure

4 years agoMerge pull request #28 from Kharhamel/cameraMovment
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

4 years agoMerge pull request #27 from Kharhamel/jasmine
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

4 years agoadded a way do speed up the camera movement
kharhamel [Mon, 6 Apr 2020 14:59:14 +0000 (16:59 +0200)]
added a way do speed up the camera movement

4 years agoadded code to freely move the camera using the arrow keys or z,q,s,d
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

4 years agoadded jasmine in the back
kharhamel [Mon, 6 Apr 2020 13:48:19 +0000 (15:48 +0200)]
added jasmine in the back

4 years agoMerge pull request #24 from thecodingmachine/Share-players-position-using-Socket.IO
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

4 years agoFront : create class to connect, send and receive message
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

4 years agoLoading first sprite
David Négrier [Sun, 5 Apr 2020 14:20:53 +0000 (16:20 +0200)]
Loading first sprite

4 years agoRefactor to create interface rooms.
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.

4 years agoRefactor & Typo
gparant [Sun, 5 Apr 2020 12:31:49 +0000 (14:31 +0200)]
Refactor & Typo

4 years agoFix typo
gparant [Sat, 4 Apr 2020 21:29:36 +0000 (23:29 +0200)]
Fix typo

4 years agoMerge branch 'master' into Share-players-position-using-Socket.IO
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

4 years agoAdd readme of features and communication in back
gparant [Sat, 4 Apr 2020 20:43:07 +0000 (22:43 +0200)]
Add readme of features and communication in back

4 years agoMerge pull request #19 from gparant/Setup-web-socket-connection
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

4 years agoFixing typo in comment
David Négrier [Sat, 4 Apr 2020 20:35:20 +0000 (22:35 +0200)]
Fixing typo in comment

4 years agoShare players position using Socket.IO
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.

4 years agoRefactor error message
gparant [Sat, 4 Apr 2020 15:56:43 +0000 (17:56 +0200)]
Refactor error message

4 years agoAdd authenticate
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

4 years agoMerge pull request #20 from thecodingmachine/noemie_nguyen/ajout_logos_tcm
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

4 years agoRefactor and fix error hydration message socket io
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.

4 years agoMerge pull request #23 from moufmouf/eslint_front
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

4 years agoAdding ESLint for front part
David Négrier [Sat, 4 Apr 2020 14:16:20 +0000 (16:16 +0200)]
Adding ESLint for front part

4 years agoMerge pull request #22 from moufmouf/fix-ci
David Négrier [Sat, 4 Apr 2020 14:08:31 +0000 (16:08 +0200)]
Merge pull request #22 from moufmouf/fix-ci

Fixing CI

4 years agoFixing missing closing parenthesis
David Négrier [Sat, 4 Apr 2020 14:06:38 +0000 (16:06 +0200)]
Fixing missing closing parenthesis