lbehm/workadventure
1
0
Fork 0
Code Issues Pull requests Releases Activity
253 commits 21 branches 1 tag 50 MiB
Commit graph

81 commits

Author SHA1 Message Date
David Négrier 05fbcad252 Fixing "none" animation does not exist log 2020-05-07 23:33:21 +02:00
gparant 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
gparant ebbe60f10f Delete comment 2020-05-06 02:13:00 +02:00
gparant b12d762ffe Fix to add frame of player user 2020-05-06 02:12:37 +02:00
gparant 4e04357b71 Merge branch 'refactoring_messages' into feature/login-page 
# Conflicts:
#	front/src/Phaser/Player/Player.ts
 2020-05-06 01:58:04 +02:00
gparant 5a6415607d Send event and play animation with user frame 2020-05-06 01:50:01 +02:00
David Négrier 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
David Négrier ad3484285b Fixing Cypress tests 2020-05-04 18:38:04 +02:00
gparant 58a1a8a3c9 Add select player in login page 2020-05-04 01:48:14 +02:00
gparant b65e37c468 Name of map users 
- Add name on user
 - Delete NonPlayer class not used
 2020-05-03 22:24:14 +02:00
David Négrier b260dc32b5 Merge from master 2020-05-03 18:04:01 +02:00
gparant fb255140e5 Add feature to mute or switch off cam 2020-05-03 17:19:42 +02:00
David Négrier df5b183cba Merge 2020-05-03 15:51:16 +02:00
David Négrier c4f1aa1811 Removing comment 2020-05-03 15:31:20 +02:00
David Négrier 76b745ebea Putting the name in GameManager rather than passing it from scene to scene. 2020-05-03 15:29:40 +02:00
David Négrier 5601e5e134 Adding login method back for future use in LogincScene 2020-05-03 15:18:15 +02:00
gparant 0d6ce5e6e9 Merge branch 'master' into webrtc 
# Conflicts:
#	front/src/Phaser/Player/Player.ts
 2020-05-02 20:51:49 +02:00
gparant fdb40ec3e2 Fix webrtc multi 2020-05-02 20:46:02 +02:00
kharhamel ad65de75fd used the vent system to remove the dependency of Player on Connexion 2020-05-02 16:56:36 +02:00
gparant 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
David Négrier d72741ce0c Fixing linting 2020-05-01 23:48:30 +02:00
David Négrier 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
David Négrier 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
David Négrier 85f84517f6 Adding logo in the bottom right corner and placing help text in function of height 2020-05-01 22:23:41 +02:00
gparant e06b20fe96 Update video style and start peer connexion 2020-05-01 21:15:00 +02:00
kharhamel dd0744387f reenabled diagonal movement 2020-04-30 19:36:28 +02:00
kharhamel 62d2498e34 remove the GameSceneInterface from LoginScene 2020-04-30 19:18:35 +02:00
gparant 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
gparant 2bfa57b0ba Merge world and webrtc conexion 2020-04-29 01:40:32 +02:00
gparant 4e556782af Fix integration login scene in game manager 2020-04-29 00:01:37 +02:00
gparant 8c935e8b27 Merge branch 'master' into webrtc 
# Conflicts:
#	front/src/Phaser/Game/GameManager.ts
 2020-04-28 20:50:51 +02:00
David Négrier edc1136401 Merge branch 'master' of github.com:thecodingmachine/workadventure into simplify 2020-04-27 22:39:46 +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
kharhamel ee4a59578a first step in simplification: remove the concept of room in the front end 2020-04-27 15:03:05 +02:00
gparant ecdbf4269a Merge branch 'master' into webrtc 2020-04-26 23:22:40 +02:00
gparant 3f975171c2 Fix import 2020-04-26 23:22:13 +02:00
gparant b49c012319 Add button to enter un visio 2020-04-26 20:55:20 +02:00
gparant 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
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
gparant c28108f6c9 Use WebRtc with SimplePeer 2020-04-25 16:05:33 +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
gparant 5b62ac39fb Create webrtc connexion between two player 2020-04-19 19:32:38 +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
David Négrier db605d100e Merge 2020-04-16 22:44: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