Commit graph

73 commits

Author SHA1 Message Date
David Négrier 3b9eb73929 Adding a huge collection of characters to play with 2020-04-27 22:38:21 +02:00
David Négrier cdd18fd5ac
Merge pull request #59 from thecodingmachine/map-v0
Map v0: Resize chunksize from 16 to 32 pixels
2020-04-27 18:22:24 +02:00
David Négrier 0d6c4032d5 Playing with zoom levels 2020-04-27 18:12:36 +02:00
David Négrier e7bbe29123 Merge branch 'master' of github.com:thecodingmachine/workadventure into map-v0 2020-04-26 21:48:57 +02:00
David Négrier a3cabff445 Merge branch 'map-v0' of github.com:thecodingmachine/workadventure into map-v0 2020-04-26 21:48:42 +02:00
kharhamel 25ac579a90 prettier login page 2020-04-26 18:48:41 +02:00
kharhamel d691b58d0b basic login page with a text input and a click button 2020-04-26 17:54:56 +02:00
NIP 5b6c7a9b5f Resize chunksize from 16 to 32 pixels 2020-04-26 11:46:00 +02:00
David Négrier 33bcbd4650
Merge pull request #44 from thecodingmachine/map-v0
My first map representing TCM office grand floor without KEN office
2020-04-24 19:08:08 +02:00
David Négrier 46fcb86b28 Computing movement amount from framerate
Depending on the amount of power a computer has, the framerate will not be the same.
Hence, the amount of movement of a user should be constant on each frame.
If a frame was slow to print, the movement should be higher to keep a constant speed.

This PR takes the framerate into account when moving the players.
2020-04-18 17:16:39 +02:00
NIP 91dd903904 Add new map with embed tileset 2020-04-17 18:39:54 +02:00
David Négrier bccd2efc2e Merge branch 'map-v0' of github.com:thecodingmachine/workadventure into map-v0 2020-04-16 22:44:44 +02:00
David Négrier db605d100e Merge 2020-04-16 22:44:31 +02:00
NIP 95e51c7aa4 MERGE and add floorLayer 2020-04-16 21:55:34 +02:00
NIP 7e8283ddf0 Add floorLayer to the map 2020-04-16 21:37:31 +02:00
David Négrier 9175682f32 Backporting master changes 2020-04-15 23:57:36 +02:00
David Négrier 2037147d18 First working version of the office map! Yay! 2020-04-15 23:31:39 +02:00
David Négrier 8ddd4656e6 Adding automatic loading of layers 2020-04-15 23:10:12 +02:00
David Négrier 5f118c2a4a Removing all reference to 'Tiles' constant in code 2020-04-15 19:39:26 +02:00
David Négrier 1dd66b4998 Merging 2020-04-15 19:30:49 +02:00
David Négrier 482a344f45 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).
2020-04-15 19:23:06 +02:00
kharhamel a2ed7164e4 implemented basic e2e testing 2020-04-14 20:04:55 +02:00
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