Gregoire Parant
|
89064d23f9
|
Fix style
|
2020-12-18 00:09:07 +01:00 |
|
David Négrier
|
0984e7eaad
|
Fix linting
|
2020-12-17 22:35:38 +01:00 |
|
|
Gregoire Parant
|
ed214f2b41
|
Fix style menu
|
2020-12-17 22:10:36 +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 |
|
|
Gregoire Parant
|
ca1cd388e8
|
Fix lint
|
2020-12-17 16:39:11 +01:00 |
|
|
Gregoire Parant
|
08ce954f56
|
Add new click event to close co website
|
2020-12-17 16:36:01 +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
|
6a21436c9e
|
Update menu
|
2020-12-16 18:56:02 +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 |
|
|
Gregoire Parant
|
af89965db8
|
Fix style button
|
2020-12-16 16:32:28 +01:00 |
|
Kharhamel
|
c93d1794b7
|
Merge pull request #496 from thecodingmachine/fixSkinChangeCrash
FIX: going back a 2nd time to SelectCharacterScene used to crash the game
|
2020-12-16 15:25:36 +01:00 |
|
|
Gregoire Parant
|
8bf72e1ffd
|
Change out notification sound
|
2020-12-16 15:10:46 +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
|
1f3c738cd0
|
Merge pull request #491 from thecodingmachine/updateStyleCss
update pointer style
|
2020-12-16 12:58:37 +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 |
|
|
Gregoire Parant
|
bb8980e1d2
|
update pointer style
|
2020-12-15 17:34:47 +01:00 |
|
|
Gregoire Parant
|
8947e1b781
|
update pointer style
|
2020-12-15 17:31:55 +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
|
708790c570
|
Merge pull request #482 from thecodingmachine/dependabot/npm_and_yarn/front/ini-1.3.7
Bump ini from 1.3.5 to 1.3.7 in /front
|
2020-12-11 16:57:23 +01:00 |
|
|
kharhamel
|
a1aedaa594
|
FEAT: now play a sound when a user quit the webrtc group
|
2020-12-11 16:01:31 +01:00 |
|
dependabot[bot]
|
37fba17c20
|
Bump ini from 1.3.5 to 1.3.7 in /front
Bumps [ini](https://github.com/isaacs/ini) from 1.3.5 to 1.3.7.
- [Release notes](https://github.com/isaacs/ini/releases)
- [Commits](https://github.com/isaacs/ini/compare/v1.3.5...v1.3.7)
Signed-off-by: dependabot[bot] <support@github.com>
|
2020-12-11 13:25:44 +00: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 |
|
|
David Négrier
|
bf797085e6
|
Extracting FileController into a Uploader container
|
2020-12-09 21:29:29 +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 |
|
|
kharhamel
|
28b0229c76
|
FIX: disabled pingCameraStatus and reduced the amount of errors thrown in console
|
2020-11-27 17:06:47 +01:00 |
|
|
Gregoire Parant
|
27634a61ee
|
Create menu to set your quality video and game
|
2020-11-27 16:24:07 +01:00 |
|
|
Gregoire Parant
|
26b81cc788
|
Decrease fps
|
2020-11-27 12:44:32 +01:00 |
|
|
Gregoire Parant
|
961e4d3f57
|
Decrease fps
|
2020-11-27 12:13:46 +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 |
|
|
Gregoire Parant
|
f596f613e8
|
Try to decrease phaser config fps
|
2020-11-25 01:35:42 +01:00 |
|
|
Gregoire Parant
|
4aca04d03a
|
Try to decrease phaser config fps
|
2020-11-25 01:19:19 +01:00 |
|
|
Gregoire Parant
|
08d8222ed5
|
level up fps to decrease GPU use in the browser
|
2020-11-25 00:47:21 +01:00 |
|
yourcoke
|
8ff24c38b0
|
added: engelbert hose + mask
|
2020-11-24 20:23:20 +01:00 |
|
|
kharhamel
|
540f69267b
|
FIX: maps/dist directory is now gitignored
|
2020-11-24 14:43:21 +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 |
|
|
grégoire parant
|
c5af6df7fa
|
Merge pull request #448 from thecodingmachine/report-button
Report button discussion
|
2020-11-23 20:48:52 +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
|
fd3b8dda2c
|
Fix report button on anonymous connection
|
2020-11-22 12:40:03 +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
|
f656d2edef
|
Update gitignore
|
2020-11-21 15:41:23 +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 |
|
|
Gregoire Parant
|
64d00bda56
|
Add function to show when message received
|
2020-11-17 16:46:46 +01:00 |
|
|
Kharhamel
|
eed292b707
|
Merge pull request #428 from thecodingmachine/master
Hotfixes from master
|
2020-11-17 15:26:11 +01:00 |
|
|
Kharhamel
|
ff8ebc3912
|
Merge pull request #425 from thecodingmachine/fix/teleportExit
FIX: creating an exit to the current map should not cause a crash anymore
|
2020-11-17 15:13:04 +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 |
|
|
Kharhamel
|
f70f0a58a9
|
Merge pull request #424 from thecodingmachine/fix/coWebsiteBlocking
FIX: more cowebsite fixes
|
2020-11-17 14:58:13 +01:00 |
|
|
kharhamel
|
3d8d8cc3a9
|
FIX: more cowebsite fixes
|
2020-11-16 16:15: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
|
0fc57f3548
|
Change resolution
|
2020-11-14 14:04:11 +01:00 |
|
|
Kharhamel
|
40e9570cdc
|
Merge pull request #418 from thecodingmachine/fix/coWebsiteBlocking
FIX: the jitsi iframe promise now throw an error if it cannot load in 10 secondes
|
2020-11-13 18:28:31 +01:00 |
|
|
kharhamel
|
2a6b2e0cbf
|
FIX: the jitsi iframe promise now throw an error if it cannot load in 10 secondes
|
2020-11-13 18:08:43 +01:00 |
|
|
Gregoire Parant
|
733efd4a03
|
Add env admin url in webpack
|
2020-11-13 12:41:49 +01:00 |
|
|
Gregoire Parant
|
ebfe08fb92
|
Create new env admin url
|
2020-11-13 12:15:33 +01:00 |
|
|
Kharhamel
|
6c6d046891
|
Merge pull request #401 from kidager/qwerty-support
Add support for QWERTY keyboards
|
2020-11-12 10:32:58 +01:00 |
|
|
Kharhamel
|
b468f03603
|
Merge pull request #412 from thecodingmachine/fix/iHatePong
FIX: remove the ping and pong overrides server side
|
2020-11-12 10:28:02 +01:00 |
|
|
kharhamel
|
9b64a970b5
|
FIX: remove the ping and pong overrides server side in favor of and idleTimeout and added a manual ping client side
|
2020-11-10 18:26:46 +01:00 |
|
|
Gregoire Parant
|
73fa0ecbfc
|
Fix init position and trigger layers properties
|
2020-11-10 17:00:23 +01:00 |
|
|
David Négrier
|
ed527f5e72
|
Merge pull request #409 from thecodingmachine/fix/cowebsiteConflicts
Fix/cowebsite conflicts
|
2020-11-10 15:54:27 +01:00 |
|
|
Gregoire Parant
|
8412575c40
|
Merge branch 'develop' into windows-focus-blur-camera
# Conflicts:
# front/src/WebRtc/MediaManager.ts
|
2020-11-10 15:27:22 +01:00 |
|
|
kharhamel
|
1080328afa
|
FIX: cowebsite transitions are now queued to prevent conflicts
|
2020-11-10 15:22:30 +01:00 |
|
|
Gregoire Parant
|
b75f28d3ca
|
Merge branch 'develop' into feature-discussion
# Conflicts:
# front/src/WebRtc/MediaManager.ts
|
2020-11-10 15:15:24 +01:00 |
|
|
Gregoire Parant
|
142566dfde
|
Fix error get media stream camera
Fix error camera when user have not cam on computer
|
2020-11-10 14:03:29 +01:00 |
|
|
Gregoire Parant
|
694f5d692f
|
Merge branch 'develop' into windows-focus-blur-camera
|
2020-11-10 13:07:08 +01:00 |
|
|
Gregoire Parant
|
76014e3dc1
|
Merge branch 'develop' into action-button
|
2020-11-10 13:06:47 +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 |
|
|
Gregoire Parant
|
f837f1a31f
|
Merge branch 'develop' into feature-discussion
|
2020-11-10 11:50:41 +01:00 |
|
Jacem Chaieb
|
c4f28a0a8d
|
Add support for QWERTY keyboards
|
2020-11-09 12:24:45 +01:00 |
|
|
kharhamel
|
760708948f
|
FIX: close the coWebSite on network error
|
2020-11-09 11:16:54 +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 |
|