Commit graph

3833 commits

Author SHA1 Message Date
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
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
David MAECHLER 60c0188e9e Merge branch 'master' of https://github.com/thecodingmachine/workadventure into feature/back-players-proximity 2020-04-06 17:35:58 +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
David MAECHLER 3bcb12b3ef add stub method for recheck on group members proximity 2020-04-06 02:00:21 +02:00
David MAECHLER 886477cddf fix stupid error in for loop 2020-04-06 01:45:51 +02:00
David MAECHLER 21d7fb733a Fix logic in group creation since i only checked the distance between the two first users and not rechecked the distance between a new memember with the ones already present in the group. Also sort the array of distances to group the ones closer first. 2020-04-06 01:27:20 +02:00
David MAECHLER bb2315e7ac Merge branch 'master' of https://github.com/thecodingmachine/workadventure into feature/back-players-proximity 2020-04-06 00:47:20 +02:00
David MAECHLER 88f231bd1f fix conditions logic and make the script work. Needs to implement it in node/TS now. 2020-04-06 00:39:36 +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