Gregoire Parant
|
f5dd5efc0e
|
Manage Local Storage customers player error
|
2020-12-18 13:56:25 +01:00 |
|
David Négrier
|
0984e7eaad
|
Fix linting
|
2020-12-17 22:35:38 +01:00 |
|
Gregoire Parant
|
ed8232b0f5
|
Fix style menu
|
2020-12-17 21:58:18 +01:00 |
|
Gregoire Parant
|
e77eb6d5be
|
Typo fixes
|
2020-12-17 18:19:47 +01:00 |
|
David Négrier
|
055131ac66
|
Typo fixes
|
2020-12-17 15:20:42 +01:00 |
|
Gregoire Parant
|
faf32bfa01
|
Fix event click listner
|
2020-12-17 14:16:10 +01:00 |
|
Gregoire Parant
|
2d4193a917
|
Merge branch 'develop' into notifOutSound
|
2020-12-17 13:56:21 +01:00 |
|
kharhamel
|
9fbcf0dc12
|
FIX: spark button open in a new window
|
2020-12-16 19:02:10 +01:00 |
|
Gregoire Parant
|
a2d56ef56a
|
Update admin menu
|
2020-12-16 18:52:11 +01:00 |
|
Gregoire Parant
|
1a27b7d2ee
|
Update menu
|
2020-12-16 17:17:31 +01:00 |
|
kharhamel
|
eb88db92be
|
FIX: going back a 2nd time to SelectCharacterScene used to crash the game
|
2020-12-16 15:09:58 +01:00 |
|
kharhamel
|
f5e77ad749
|
FIX: menu flicker
|
2020-12-16 12:49:34 +01:00 |
|
kharhamel
|
de9d6756b4
|
FIX: going to loginScene or customizeScene and then clicking next bring you back directly to the gameScene
|
2020-12-15 18:00:04 +01:00 |
|
kharhamel
|
069f2f1cec
|
FEAT: prototype game menu using html elements, better icon for text chat
|
2020-12-15 16:37:57 +01:00 |
|
David Négrier
|
855b55903b
|
Merge pull request #440 from psy/develop
center spawn position in the middle of a tile
|
2020-12-11 17:36:10 +01:00 |
|
David Négrier
|
2122014947
|
Merge branch 'develop' of github.com:thecodingmachine/workadventure into scaling
# Conflicts:
# front/src/Phaser/Game/GameScene.ts
|
2020-12-11 13:06:10 +01:00 |
|
David Négrier
|
6f2c319785
|
Merge branch 'master' of github.com:thecodingmachine/workadventure into scaling
# Conflicts:
# back/src/Services/SocketManager.ts
# deeployer.libsonnet
# docker-compose.yaml
# front/src/Connexion/RoomConnection.ts
# front/src/Enum/EnvironmentVariable.ts
# front/src/Phaser/Game/GameScene.ts
# front/webpack.config.js
# pusher/src/Controller/IoSocketController.ts
|
2020-12-11 13:00:11 +01:00 |
|
Kharhamel
|
57a59cba8e
|
Merge pull request #473 from thecodingmachine/master
hotfixes from master
|
2020-12-03 18:48:43 +01:00 |
|
David Négrier
|
a19edd4dc1
|
Fixing reconnection to server on back failure
|
2020-12-03 16:39:44 +01:00 |
|
Kharhamel
|
95665a28d5
|
Merge pull request #456 from thecodingmachine/performance
Performance settings
|
2020-12-03 14:33:12 +01:00 |
|
kharhamel
|
1971d26dc0
|
FIX: couldn't access to an anonymous private map
|
2020-12-01 19:34:36 +01:00 |
|
Kharhamel
|
5f372e485d
|
Merge pull request #468 from thecodingmachine/master
hotfixes from master
|
2020-11-30 13:49:35 +01:00 |
|
Gregoire Parant
|
27634a61ee
|
Create menu to set your quality video and game
|
2020-11-27 16:24:07 +01:00 |
|
David Négrier
|
4c1e566a6c
|
Adding a Pusher container as a middleware/dispatcher between front and back
|
2020-11-26 17:53:30 +01:00 |
|
Kharhamel
|
17e633ae45
|
Merge pull request #442 from cbluoss/develop
Adding more clothing options
|
2020-11-26 10:30:54 +01:00 |
|
kharhamel
|
65785240e1
|
FIX: room id is now pushed to the url
|
2020-11-25 17:17:48 +01:00 |
|
psy
|
f08aec28c0
|
use tilewidth and tileheight to center spawn position dynamically
|
2020-11-25 15:58:10 +01:00 |
|
yourcoke
|
8ff24c38b0
|
added: engelbert hose + mask
|
2020-11-24 20:23:20 +01:00 |
|
kharhamel
|
8d8b879ed6
|
FIX: the game now uses the url hash to choose the start layer
|
2020-11-24 14:43:21 +01:00 |
|
kharhamel
|
09d6d22a5d
|
FIX: rewrote the way scene exits are triggered
|
2020-11-24 14:43:21 +01:00 |
|
Gregoire Parant
|
3d32fb90dc
|
Add constant
|
2020-11-23 20:34:05 +01:00 |
|
Gregoire Parant
|
2812387650
|
Merge branch 'develop' into action-button
|
2020-11-23 20:08:19 +01:00 |
|
Gregoire Parant
|
26cfae7136
|
Merge branch 'develop' into firefox-error-jitsi
# Conflicts:
# front/src/WebRtc/MediaManager.ts
|
2020-11-23 15:46:19 +01:00 |
|
Gregoire Parant
|
39cdc3fbd9
|
Fix trgger stream and update scene record
|
2020-11-21 18:47:38 +01:00 |
|
Gregoire Parant
|
a6876658ab
|
Merge branch 'develop' into windows-focus-blur-camera
# Conflicts:
# front/src/WebRtc/MediaManager.ts
|
2020-11-21 15:57:55 +01:00 |
|
yourcoke
|
bbd3d9efae
|
added: hoodies
|
2020-11-21 15:46:04 +01:00 |
|
Gregoire Parant
|
3aaeda6f80
|
Merge branch 'develop' into action-button
# Conflicts:
# front/dist/resources/style/style.css
# front/src/Phaser/Game/GameScene.ts
|
2020-11-21 15:40:24 +01:00 |
|
yourcoke
|
f5e41cc285
|
added: pride shirt
|
2020-11-20 15:56:58 +01:00 |
|
yourcoke
|
62f13f6b30
|
added: mate bottle accessorie
|
2020-11-20 11:49:08 +01:00 |
|
yourcoke
|
a6c8132f0a
|
added: tinfoil hat1
|
2020-11-20 10:59:22 +01:00 |
|
psy
|
9e835620f1
|
center spawn position in the middle of a tile, instead of the upper left corner
|
2020-11-19 13:19:56 +01:00 |
|
Gregoire Parant
|
1bff2addf1
|
Merge branch 'develop' into firefox-error-jitsi
# Conflicts:
# front/src/WebRtc/MediaManager.ts
|
2020-11-17 18:54:51 +01:00 |
|
Gregoire Parant
|
11def280cb
|
Merge branch 'develop' into feature-discussion
|
2020-11-17 18:08:53 +01:00 |
|
Gregoire Parant
|
0a7063a478
|
Add close button
|
2020-11-17 18:03:44 +01:00 |
|
Kharhamel
|
eed292b707
|
Merge pull request #428 from thecodingmachine/master
Hotfixes from master
|
2020-11-17 15:26:11 +01:00 |
|
kharhamel
|
b6b76cbfaf
|
FIX: creating an exit to the current map should not cause a crash anymore
|
2020-11-17 15:02:21 +01:00 |
|
Gregoire Parant
|
1570ef9663
|
Merge branch 'develop' into windows-focus-blur-camera
# Conflicts:
# front/src/Phaser/Game/GameScene.ts
|
2020-11-16 15:46:52 +01:00 |
|
Gregoire Parant
|
b0bd4c5f40
|
Merge remote-tracking branch 'github.com/develop' into feature-discussion
|
2020-11-16 15:43:28 +01:00 |
|
David Négrier
|
c7031c7c54
|
Merge pull request #411 from thecodingmachine/fix-#314
Fix init position and trigger layers properties
|
2020-11-16 15:24:21 +01:00 |
|
Gregoire Parant
|
2d0fc1072f
|
Fix feedback
|
2020-11-16 15:05:51 +01:00 |
|
Gregoire Parant
|
73fa0ecbfc
|
Fix init position and trigger layers properties
|
2020-11-10 17:00:23 +01:00 |
|
Gregoire Parant
|
0acbe20bbf
|
Fix name send in message
|
2020-11-10 13:00:14 +01:00 |
|
Gregoire Parant
|
3333b3cee3
|
Fix feedback moufmouf
|
2020-11-10 12:38:32 +01:00 |
|
Jacem Chaieb
|
c4f28a0a8d
|
Add support for QWERTY keyboards
|
2020-11-09 12:24:45 +01:00 |
|
David Négrier
|
00b83ae349
|
Merge branch 'develop' of github.com:thecodingmachine/workadventure into windows-focus-blur-camera
|
2020-11-06 17:36:43 +01:00 |
|
Gregoire Parant
|
a1d3b01619
|
Fix typo
|
2020-11-04 16:30:01 +01:00 |
|
Gregoire Parant
|
968787555f
|
Update feedback @moufmouf
|
2020-11-04 13:33:58 +01:00 |
|
Gregoire Parant
|
6051e5f46a
|
Fix when user have activated action button
|
2020-11-01 11:53:24 +01:00 |
|
Gregoire Parant
|
fcb7f364b6
|
Fix button action when user have activated
|
2020-11-01 11:49:09 +01:00 |
|
Gregoire Parant
|
74de2746c2
|
Create action button
|
2020-10-31 14:04:55 +01:00 |
|
Gregoire Parant
|
724bb7f288
|
Merge branch 'develop' into feature-discussion
|
2020-10-30 20:04:12 +01:00 |
|
Gregoire Parant
|
80355e6b85
|
fix layout mode click when discussion is activated
|
2020-10-27 20:46:53 +01:00 |
|
kharhamel
|
67aa2f4b6c
|
opening and closing jitsi windows now trigger some transitions
|
2020-10-27 17:44:57 +01:00 |
|
Gregoire Parant
|
997acd17ad
|
Update to use update function scene
|
2020-10-26 22:39:52 +01:00 |
|
Gregoire Parant
|
1945c24704
|
Create send data discussion
|
2020-10-25 21:59:14 +01:00 |
|
Gregoire Parant
|
f344adc48b
|
Create discussion
- Add new discussion class
- Feature to discuss and report user
|
2020-10-25 19:39:15 +01:00 |
|
Gregoire Parant
|
b6fe9e72e1
|
Fix style and refactor
|
2020-10-25 19:38:00 +01:00 |
|
kharhamel
|
3fdca94afb
|
refactor: move jitsi creation to a dedicated and cleaned some type in mediaManager
|
2020-10-23 17:19:14 +02:00 |
|
Gregoire Parant
|
cfb6ad581e
|
Fix red circle created
|
2020-10-21 23:08:05 +02:00 |
|
Gregoire Parant
|
e973921390
|
Fix admin tags
- Fix get size group
- Fix admin tags
- Fix texture already used
|
2020-10-21 17:22:17 +02:00 |
|
Gregoire Parant
|
1df4cb3e17
|
Red circle when have 4 users during webrtc meet
|
2020-10-21 16:07:42 +02:00 |
|
David Négrier
|
45c6e13cad
|
Fixing loading of same custom texture several time
Phaser 3 does not trigger oncomplete event if the resource is already loaded.
|
2020-10-21 10:34:55 +02:00 |
|
David Négrier
|
c03dd4c551
|
Jitsi room names don't have /
|
2020-10-20 19:47:28 +02:00 |
|
David Négrier
|
78a4bf3189
|
Adding custom character textures
|
2020-10-20 17:42:36 +02:00 |
|
David Négrier
|
a3816cd725
|
Merge pull request #346 from thecodingmachine/customUserStore
improved the local storage of the the selectcharacterScene
|
2020-10-20 17:38:54 +02:00 |
|
arp
|
dff189b223
|
local storage of the custom layers
|
2020-10-20 17:25:08 +02:00 |
|
arp
|
f5aa70ddc2
|
improved the local storage of the the selectcharacterScene
|
2020-10-20 13:44:57 +02:00 |
|
Gregoire Parant
|
bf9dfcc835
|
Ban mesage
- Create type message could be use to send private message at any user
- Create SendMessageUser message
- Add sound when user receive ban message
|
2020-10-19 19:32:47 +02:00 |
|
arp
|
75d9ed8dfa
|
implemented the admin websocket
now send data
|
2020-10-19 14:23:50 +02:00 |
|
David Négrier
|
bf01116f63
|
Removing useless features of Jitsi meet
|
2020-10-19 12:36:05 +02:00 |
|
David Négrier
|
16d1c2354e
|
Adding fallback to unauthenticated Jitsi
|
2020-10-19 11:07:49 +02:00 |
|
David Négrier
|
260b0ea408
|
Adding JWT authentication to Jitsi
|
2020-10-16 19:23:28 +02:00 |
|
David Négrier
|
c259dd582c
|
Fixing change of map with relative URLs
|
2020-10-16 09:29:18 +02:00 |
|
David Négrier
|
c75f1edc40
|
Merge branch 'develop' of github.com:thecodingmachine/workadventure into player-report
# Conflicts:
# back/src/Controller/AuthenticateController.ts
|
2020-10-15 18:01:44 +02:00 |
|
David Négrier
|
c59a335a1a
|
Removing useless resource
|
2020-10-15 18:00:34 +02:00 |
|
David Négrier
|
0ea7240834
|
Adding condition to enable reporting only on private rooms
|
2020-10-15 17:58:27 +02:00 |
|
David Négrier
|
702084b00a
|
Merge pull request #330 from thecodingmachine/exiturl
Adding exitUrl property
|
2020-10-15 16:00:50 +02:00 |
|
David Négrier
|
2fe61ce11b
|
Merge pull request #329 from thecodingmachine/fixhistory
Fixing URL not being rewritten when changing maps
|
2020-10-15 15:52:01 +02:00 |
|
David Négrier
|
36d73333f5
|
Adding exitUrl property
The exitUrl property can be applied on a layer to link to any kind of room (private or public)
|
2020-10-15 15:50:51 +02:00 |
|
David Négrier
|
517b3a644b
|
Fixing URL not being rewritten when changing maps
|
2020-10-15 14:35:09 +02:00 |
|
arp
|
67a9bd2520
|
improved textField component and allowed 8 caracter names
|
2020-10-15 14:23:39 +02:00 |
|
Gregoire Parant
|
4799460064
|
Merge branch 'develop' into player-report
# Conflicts:
# front/src/Connexion/RoomConnection.ts
|
2020-10-14 15:06:10 +02:00 |
|
David Négrier
|
98bda49d7e
|
Get tags from the admin
And uses tag "admin" to choose whether to display the console or not
|
2020-10-14 11:07:34 +02:00 |
|
Gregoire Parant
|
047fa7b594
|
Merge branch 'player-report-fix-conflict' into player-report
# Conflicts:
# back/src/Controller/IoSocketController.ts
|
2020-10-13 21:16:57 +02:00 |
|
Gregoire Parant
|
9c44d37020
|
Merge remote-tracking branch 'github.com/develop' into player-report
# Conflicts:
# back/src/Controller/IoSocketController.ts
# front/src/Phaser/Game/GameScene.ts
# front/src/index.ts
# messages/messages.proto
|
2020-10-13 21:14:46 +02:00 |
|
Gregoire Parant
|
05a1ea8469
|
Merge branch 'develop' into player-report
# Conflicts:
# back/src/Controller/IoSocketController.ts
# front/src/Phaser/Game/GameScene.ts
# front/src/index.ts
# messages/messages.proto
|
2020-10-13 20:39:29 +02:00 |
|
Gregoire Parant
|
dbaf44e814
|
Change report flag
- Add icon on video
- Permit to have a modal with comment
|
2020-10-13 19:56:42 +02:00 |
|
David Négrier
|
cb159350e9
|
Fixed room switching
|
2020-10-13 18:44:50 +02:00 |
|
David Négrier
|
ec93891c6b
|
Using Room class to load GameScene
|
2020-10-13 17:10:07 +02:00 |
|
David Négrier
|
aee06da7f9
|
Refactoring Room.ts to fetch map url automatically from ID
|
2020-10-13 17:10:07 +02:00 |
|