grégoire parant
|
b0c54776b1
|
Merge pull request #376 from thecodingmachine/windows-focus-blur-camera
Switch off camera when user is not focused on WorkAdventure windows
|
2020-11-23 15:35:45 +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
|
430201061d
|
added: tinfoil hat1
|
2020-11-20 11:00:31 +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
|
92137dc0a3
|
Merge branch 'master' into develop
|
2020-11-18 16:57:14 +01:00 |
|
Gregoire Parant
|
c956e27bc8
|
Add tenue sg
|
2020-11-18 16:55:58 +01:00 |
|
David Négrier
|
e47ec5dd87
|
Merge pull request #436 from thecodingmachine/website-typos-changes
Website typos changes
|
2020-11-18 14:23:56 +01:00 |
|
kevin
|
54703c77e4
|
fix conflicts
|
2020-11-18 13:04:16 +01:00 |
|
kevin
|
a969e33bee
|
fix email
|
2020-11-18 12:21:42 +01:00 |
|
David Négrier
|
9db30a44b3
|
Merge pull request #434 from thecodingmachine/website-typos-changes
Wording changes
|
2020-11-18 09:37:40 +01:00 |
|
kevin
|
55ce1eee03
|
wording changes
|
2020-11-18 09:11:28 +01:00 |
|
kevin
|
62a1732e53
|
wording changes
|
2020-11-18 08:40:42 +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 |
|
David Négrier
|
73968bab94
|
Merge pull request #377 from thecodingmachine/feature-discussion
Feature discussion
|
2020-11-17 18:38:09 +01:00 |
|
David Négrier
|
25f6fa7d2a
|
Migrating to rlespinasse/github-slug-action@3.1.0
|
2020-11-17 18:27:33 +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 |
|
dependabot[bot]
|
b8bafe9c7e
|
Bump dot-prop from 4.2.0 to 4.2.1 in /website
Bumps [dot-prop](https://github.com/sindresorhus/dot-prop) from 4.2.0 to 4.2.1.
- [Release notes](https://github.com/sindresorhus/dot-prop/releases)
- [Commits](https://github.com/sindresorhus/dot-prop/compare/v4.2.0...v4.2.1)
Signed-off-by: dependabot[bot] <support@github.com>
|
2020-11-17 14:26:58 +00: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 |
|
David Négrier
|
1b58356919
|
Merge pull request #419 from thecodingmachine/update-resolution
Update resolution
|
2020-11-16 15:47:22 +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 |
|
David Négrier
|
6ece5e543b
|
Merge pull request #417 from gparant/webpack-env
Webpack env
|
2020-11-13 12:47:23 +01:00 |
|
Gregoire Parant
|
733efd4a03
|
Add env admin url in webpack
|
2020-11-13 12:41:49 +01:00 |
|
David Négrier
|
a5024650c9
|
Merge pull request #416 from gparant/env-admin-url
Create new env admin url
|
2020-11-13 12:23:13 +01:00 |
|
David Négrier
|
b888acdc15
|
Merge pull request #415 from thecodingmachine/hotfix/adminSocket
HOTFIX: fixed server crash on /map
|
2020-11-13 12:18:46 +01:00 |
|
kharhamel
|
0a2e967eca
|
HOTFIX: fixed a server when trying to connect to the adminRoomSocket
|
2020-11-13 12:15:58 +01:00 |
|
Gregoire Parant
|
ebfe08fb92
|
Create new env admin url
|
2020-11-13 12:15:33 +01:00 |
|
kharhamel
|
3c0f61d3b3
|
HOTFIX: fixed server crash on /map
|
2020-11-13 12:11:59 +01:00 |
|
Kharhamel
|
74ec363449
|
Merge pull request #413 from thecodingmachine/nbRoomsGauge
FEAT: added a prometheus gauge for the number of active rooms
|
2020-11-12 14:56:01 +01:00 |
|
kharhamel
|
b064f01f97
|
FEAT: added a prometheus gauge for the number of active rooms
|
2020-11-12 14:51:19 +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 |
|