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
|
85ab0a231f
|
Fix style cam
|
2020-05-03 14:29:45 +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 |
|
|
gparant
|
c7f8f92e85
|
Fix webrtc
|
2020-05-02 00:31:44 +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
|
dbf0bef149
|
Delete file
|
2020-04-29 17:55:55 +02:00 |
|
|
gparant
|
58df4118d1
|
Refactor
|
2020-04-29 17:49:40 +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 |
|
|
David Négrier
|
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 |
|
|
gparant
|
2bfa57b0ba
|
Merge world and webrtc conexion
|
2020-04-29 01:40:32 +02:00 |
|
|
gparant
|
3151113db3
|
Merge branch 'master' into webrtc
# Conflicts:
# back/src/Model/Websocket/MessageUserPosition.ts
|
2020-04-29 00:05:16 +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
|
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 |
|
|
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 |
|
|
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 |
|
|
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 |
|
|
gparant
|
d7d7be9ed0
|
Web visio, add and remove video element
|
2020-04-26 19:12:01 +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
|
e178712457
|
Fix send message webrtc
|
2020-04-26 17:43:21 +02:00 |
|
|
gparant
|
e4a30712b5
|
Update front mutli peer conncexion
|
2020-04-26 17:42:49 +02:00 |
|
NIP
|
5b6c7a9b5f
|
Resize chunksize from 16 to 32 pixels
|
2020-04-26 11:46:00 +02:00 |
|
|
gparant
|
575054fe4f
|
Fix multi video
|
2020-04-25 20:29:03 +02:00 |
|
|
gparant
|
89db8558f6
|
Add multi SimplePear connection
|
2020-04-25 17:14:05 +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
|
a5b5072de1
|
Fix webrtc
|
2020-04-20 01:10:47 +02:00 |
|
|
gparant
|
89816a13e4
|
Fix video call
|
2020-04-19 22:30:42 +02:00 |
|