e4824fe34d
Merge pull request #81 from thecodingmachine/display_groups
...
Adding the display of a circle around the group
2020-05-08 16:20:56 +02:00
25b7fc5e36
Merge pull request #82 from thecodingmachine/fix/webrtc
...
Fix webrtc
2020-05-08 16:14:49 +02:00
b2a5cb1720
Refactoring display of circle around group
...
The circle is now a sprite and not generated on every frame using a giant "graphics" object
2020-05-08 16:09:50 +02:00
492196b333
Cleanup: renaming "frame" to "character"
...
The "frame" variable actually contains a string pointing to the character selected.
It has nothing to do with a frame which is usually a particular image in an animation.
I'm renaming the variable accross the application to avoid confusion.
2020-05-08 15:18:22 +02:00
8991b6f817
Add layer override
2020-05-08 13:18:34 +02:00
a87cbe4470
Personalization of DAM office
2020-05-08 12:43:02 +02:00
02e6b50b16
Adding the display of a circle around the group
...
This PR adds the display of a circle around groups. This is useful to view where you need to go to speak to someone but also to debug.
Note: implementation is suboptimal, relying on a "graphics" object that is known to be slow. In the future, we need to use a circle as a sprite instead.
2020-05-08 00:35:36 +02:00
05fbcad252
Fixing "none" animation does not exist log
2020-05-07 23:33:21 +02:00
3ec167ee44
Merge branch 'master' into feature/login-page
...
# Conflicts:
# front/src/Phaser/Game/GameScene.ts
# front/src/Phaser/Login/LogincScene.ts
2020-05-06 02:20:28 +02:00
ebbe60f10f
Delete comment
2020-05-06 02:13:00 +02:00
b12d762ffe
Fix to add frame of player user
2020-05-06 02:12:37 +02:00
4e04357b71
Merge branch 'refactoring_messages' into feature/login-page
...
# Conflicts:
# front/src/Phaser/Player/Player.ts
2020-05-06 01:58:04 +02:00
5a6415607d
Send event and play animation with user frame
2020-05-06 01:50:01 +02:00
86abdfe30b
Only sending move events if the player actually moved
...
If the player did not move a pixel (and if it did not change direction), then do not send an event to save bandwidth and processing.
2020-05-04 23:11:59 +02:00
ad3484285b
Fixing Cypress tests
2020-05-04 18:38:04 +02:00
58a1a8a3c9
Add select player in login page
2020-05-04 01:48:14 +02:00
b65e37c468
Name of map users
...
- Add name on user
- Delete NonPlayer class not used
2020-05-03 22:24:14 +02:00
b260dc32b5
Merge from master
2020-05-03 18:04:01 +02:00
fb255140e5
Add feature to mute or switch off cam
2020-05-03 17:19:42 +02:00
df5b183cba
Merge
2020-05-03 15:51:16 +02:00
c4f1aa1811
Removing comment
2020-05-03 15:31:20 +02:00
76b745ebea
Putting the name in GameManager rather than passing it from scene to scene.
2020-05-03 15:29:40 +02:00
5601e5e134
Adding login method back for future use in LogincScene
2020-05-03 15:18:15 +02:00
85ab0a231f
Fix style cam
2020-05-03 14:29:45 +02:00
0d6ce5e6e9
Merge branch 'master' into webrtc
...
# Conflicts:
# front/src/Phaser/Player/Player.ts
2020-05-02 20:51:49 +02:00
fdb40ec3e2
Fix webrtc multi
2020-05-02 20:46:02 +02:00
ad65de75fd
used the vent system to remove the dependency of Player on Connexion
2020-05-02 16:56:36 +02:00
aff77fe074
Merge remote-tracking branch 'github.com/master' into webrtc
...
# Conflicts:
# back/src/Model/Group.ts
# back/src/Model/World.ts
2020-05-02 00:36:04 +02:00
c7f8f92e85
Fix webrtc
2020-05-02 00:31:44 +02:00
d72741ce0c
Fixing linting
2020-05-01 23:48:30 +02:00
0c04d4305b
Displaying the name of a player above its head (names are not passed through the network yet)
2020-05-01 23:38:09 +02:00
42ddd8b858
Changed font from text
...
Input name can only be 4 characters long
Passing name to next scene
2020-05-01 23:19:51 +02:00
85f84517f6
Adding logo in the bottom right corner and placing help text in function of height
2020-05-01 22:23:41 +02:00
e06b20fe96
Update video style and start peer connexion
2020-05-01 21:15:00 +02:00
dd0744387f
reenabled diagonal movement
2020-04-30 19:36:28 +02:00
62d2498e34
remove the GameSceneInterface from LoginScene
2020-04-30 19:18:35 +02:00
dbf0bef149
Delete file
2020-04-29 17:55:55 +02:00
58df4118d1
Refactor
2020-04-29 17:49:40 +02:00
91851c95f3
Merge remote-tracking branch 'github.com/master' into webrtc
...
# Conflicts:
# front/src/Connexion.ts
# front/src/Phaser/Game/GameManager.ts
# front/src/Phaser/Game/GameScene.ts
# front/src/index.ts
2020-04-29 17:37:17 +02:00
a286d57a33
Merge pull request #61 from thecodingmachine/simplify
...
first step in simplification: remove the concept of room in the front…
2020-04-29 17:11:22 +02:00
2bfa57b0ba
Merge world and webrtc conexion
2020-04-29 01:40:32 +02:00
3151113db3
Merge branch 'master' into webrtc
...
# Conflicts:
# back/src/Model/Websocket/MessageUserPosition.ts
2020-04-29 00:05:16 +02:00
4e556782af
Fix integration login scene in game manager
2020-04-29 00:01:37 +02:00
8c935e8b27
Merge branch 'master' into webrtc
...
# Conflicts:
# front/src/Phaser/Game/GameManager.ts
2020-04-28 20:50:51 +02:00
edc1136401
Merge branch 'master' of github.com:thecodingmachine/workadventure into simplify
2020-04-27 22:39:46 +02:00
3b9eb73929
Adding a huge collection of characters to play with
2020-04-27 22:38:21 +02:00
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
0d6c4032d5
Playing with zoom levels
2020-04-27 18:12:36 +02:00
ee4a59578a
first step in simplification: remove the concept of room in the front end
2020-04-27 15:03:05 +02:00
ecdbf4269a
Merge branch 'master' into webrtc
2020-04-26 23:22:40 +02:00
3f975171c2
Fix import
2020-04-26 23:22:13 +02:00
e7bbe29123
Merge branch 'master' of github.com:thecodingmachine/workadventure into map-v0
2020-04-26 21:48:57 +02:00
a3cabff445
Merge branch 'map-v0' of github.com:thecodingmachine/workadventure into map-v0
2020-04-26 21:48:42 +02:00
b49c012319
Add button to enter un visio
2020-04-26 20:55:20 +02:00
707931724f
Start visio with user colision
...
When user enter in colision with other colision, webrtc start visio
2020-04-26 19:59:51 +02:00
d7d7be9ed0
Web visio, add and remove video element
2020-04-26 19:12:01 +02:00
25ac579a90
prettier login page
2020-04-26 18:48:41 +02:00
d691b58d0b
basic login page with a text input and a click button
2020-04-26 17:54:56 +02:00
e178712457
Fix send message webrtc
2020-04-26 17:43:21 +02:00
e4a30712b5
Update front mutli peer conncexion
2020-04-26 17:42:49 +02:00
5b6c7a9b5f
Resize chunksize from 16 to 32 pixels
2020-04-26 11:46:00 +02:00
575054fe4f
Fix multi video
2020-04-25 20:29:03 +02:00
89db8558f6
Add multi SimplePear connection
2020-04-25 17:14:05 +02:00
c28108f6c9
Use WebRtc with SimplePeer
2020-04-25 16:05:33 +02:00
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
a5b5072de1
Fix webrtc
2020-04-20 01:10:47 +02:00
89816a13e4
Fix video call
2020-04-19 22:30:42 +02:00
5b62ac39fb
Create webrtc connexion between two player
2020-04-19 19:32:38 +02:00
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
91dd903904
Add new map with embed tileset
2020-04-17 18:39:54 +02:00
bccd2efc2e
Merge branch 'map-v0' of github.com:thecodingmachine/workadventure into map-v0
2020-04-16 22:44:44 +02:00
db605d100e
Merge
2020-04-16 22:44:31 +02:00
95e51c7aa4
MERGE and add floorLayer
2020-04-16 21:55:34 +02:00
7e8283ddf0
Add floorLayer to the map
2020-04-16 21:37:31 +02:00
9175682f32
Backporting master changes
2020-04-15 23:57:36 +02:00
2037147d18
First working version of the office map! Yay!
2020-04-15 23:31:39 +02:00
8ddd4656e6
Adding automatic loading of layers
2020-04-15 23:10:12 +02:00
5f118c2a4a
Removing all reference to 'Tiles' constant in code
2020-04-15 19:39:26 +02:00
1dd66b4998
Merging
2020-04-15 19:30:49 +02:00
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
a2ed7164e4
implemented basic e2e testing
2020-04-14 20:04:55 +02:00
c42dbc3f95
Fix JS issue regarding multiple tilesets
2020-04-13 21:24:48 +02:00
84f0420694
Change GameScene to import new png, change map name and add missing png files
2020-04-13 20:34:19 +02:00
f00d10d56a
Change calque names into game scene TS file
2020-04-13 20:05:13 +02:00
1774594e76
deleted cameraManager, use camera follow code instead
2020-04-13 19:57:14 +02:00
7b41a9ee2f
Add tilesets
2020-04-13 19:52:25 +02:00
33c58874e0
create an env variable for debug mode
2020-04-13 19:40:10 +02:00
7f2f977a81
My first map representing TCM office grand floor without KEN office
2020-04-13 19:38:28 +02:00
d6653c61cc
Add comment talk when user have a collision & comment collision shwon
2020-04-13 16:56:06 +02:00
ba3f0e07f8
Refactor sizing hitbox charactere
2020-04-13 16:53:19 +02:00
2ce6ed2d48
Merge pull request #40 from thecodingmachine/kharhamel-interaction
...
conflict interaction @Kharhamel
2020-04-13 16:10:09 +02:00
b391ee271a
Fix move & stop player
2020-04-13 15:41:11 +02:00
ab70b28bb3
Fix, current player say
2020-04-13 15:35:38 +02:00
2afe6b4b6e
Fix feadback @Kharhamel
2020-04-13 15:34:09 +02:00
48fe86634f
Add feature to move bubble
2020-04-13 15:15:20 +02:00
d826668273
Merge pull request #35 from thecodingmachine/cd
...
Installing a continuous deployement environement
2020-04-13 14:53:09 +02:00
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
c51f5f4aa9
added som ebasic speech bubbles
2020-04-12 19:35:51 +02:00
05379c8001
the other playes now run away from the player on contact
2020-04-12 19:06:31 +02:00
97a55ab66c
fixed the player animations
2020-04-12 18:28:05 +02:00
d1106d757d
made the player pushable by other models
2020-04-12 17:13:33 +02:00
2b2b615e7b
added other players models and fixed collision with other entities
2020-04-12 17:08:28 +02:00
6e27377b07
rewrote the app code to more easily allow for collisions
2020-04-12 16:12:08 +02:00
bbc3935d60
Fix feedback @kharhamel
2020-04-12 13:57:00 +02:00
241cbd720a
added a rock
2020-04-11 18:17:36 +02:00
793e5318f7
created a class to centralize all user inputs catching and expose user events
2020-04-11 16:46:28 +02:00
d979636a19
Fixing Dockerfiles
2020-04-11 15:11:22 +02:00
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
bc7b5fc6c9
Setting up continuous deployment
2020-04-09 11:00:30 +02:00
9d83ba22d5
Fix play anim
2020-04-07 23:56:16 +02:00
25895e51f7
Fix and refactor with comments of @moumoug
2020-04-07 22:38:53 +02:00
77780bd27b
Change comment with new message strategy
2020-04-07 21:03:33 +02:00
67c3eaa7f4
Fix Message send to add direction
2020-04-07 21:02:23 +02:00
aba3322188
Fix CI
2020-04-07 20:46:30 +02:00
bac1e804ad
Refactor to include connexion
2020-04-07 20:41:35 +02:00
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
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
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
406b299f91
allow player movement with proper animation
2020-04-06 19:53:07 +02:00
cf7125301a
Merge branch 'master' of github.com:thecodingmachine/workadventure
2020-04-06 17:59:06 +02:00
d0c09ecd4f
added a way do speed up the camera movement
2020-04-06 16:59:14 +02:00
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
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
b10f8d9069
Loading first sprite
2020-04-05 16:20:53 +02:00
08989d6ec0
Merge pull request #20 from thecodingmachine/noemie_nguyen/ajout_logos_tcm
...
Ajout des logos TCM
2020-04-04 16:38:09 +02:00
ca3d113cad
Adding ESLint for front part
2020-04-04 16:16:20 +02:00
531899ea6b
Fixing missing closing parenthesis
2020-04-04 16:06:38 +02:00
25841b51c0
ajout des logos TCM
2020-04-04 15:42:45 +02:00
c0e75ae07e
Merge pull request #16 from moufmouf/docker-compose
...
Adding docker-compose
2020-04-03 18:48:36 +02:00
9290dfd6c5
Automatically resizing game when window is resized
2020-04-03 18:41:06 +02:00
f1ab9705c9
Adding docker-compose
...
This first commit contains a docker-compose with:
- front container
- traefik for reverse proxy
back container will be added when ready.
2020-04-03 18:31:11 +02:00
26b8412f3c
Initial commit
2020-04-03 14:56:21 +02:00
David Négrier