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
|
2b2b615e7b
|
added other players models and fixed collision with other entities
|
2020-04-12 17:08:28 +02:00 |
|