_Bastler/partey_workadventure
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
71 Commits 2 Branches 0 Tags 47 MiB
01dbff7aee
Commit Graph

71 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
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 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
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
David Négrier
8c3d62496b
Merge pull request #30 from Kharhamel/fixPlayerAnimation 
allow player movement with proper animation
 2020-04-06 21:43:03 +02:00
kharhamel
406b299f91 allow player movement with proper animation 2020-04-06 19:53:07 +02:00
David Négrier
619f7a6bf6 Fixing CI file 2020-04-06 17:59:35 +02:00
David Négrier
cf7125301a Merge branch 'master' of github.com:thecodingmachine/workadventure 2020-04-06 17:59:06 +02:00
David Négrier
33217a001e
Merge pull request #28 from Kharhamel/cameraMovment 
added code to freely move the camera
 2020-04-06 17:55:42 +02:00
David Négrier
1b803cad20
Merge pull request #27 from Kharhamel/jasmine 
added jasmine in the back
 2020-04-06 17:51:00 +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
kharhamel
ded19549c7 added jasmine in the back 2020-04-06 15:48:19 +02:00
David Négrier
f7434ba64a
Merge pull request #24 from thecodingmachine/Share-players-position-using-Socket.IO 
Share players position using socket.io
 2020-04-06 09:20: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
gparant
b4f77ba51a Refactor to create interface rooms. 
The ExtRooms permit to refresh position of all users in the map and create data to share.
 2020-04-05 15:51:47 +02:00
gparant
72730a0abe Refactor & Typo 2020-04-05 14:31:49 +02:00
gparant
ac9ccf6c67 Fix typo 2020-04-04 23:29:36 +02:00
gparant
5bfedb04fd Merge branch 'master' into Share-players-position-using-Socket.IO 
# Conflicts:
#	back/src/Controller/IoSocketController.ts
 2020-04-04 22:46:42 +02:00
gparant
1100edecb7 Add readme of features and communication in back 2020-04-04 22:43:07 +02:00
David Négrier
dc1a92f086
Merge pull request #19 from gparant/Setup-web-socket-connection 
Setup web-socket connection
 2020-04-04 22:40:18 +02:00
David Négrier
d064aca525
Fixing typo in comment 2020-04-04 22:35:20 +02:00
gparant
fbcb48f9ad 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.
 2020-04-04 19:25:08 +02:00
gparant
f04d1342b5 Refactor error message 2020-04-04 17:56:43 +02:00
gparant
53e1600e67 Add authenticate 
- Create new controller authenticate with login root..
 - Update and manage error message socket io.
 - Create enum for environment variables
 2020-04-04 17:22:02 +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
gparant
e8da727cae 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.
 2020-04-04 16:25:03 +02:00
David Négrier
8cc8e2d554
Merge pull request #23 from moufmouf/eslint_front 
Adding ESLint for front part
 2020-04-04 16:18:13 +02:00
David Négrier
ca3d113cad Adding ESLint for front part 2020-04-04 16:16:20 +02:00