Commit Graph

3755 Commits

Author SHA1 Message Date
_Bastler
7a12e48e70 Merge branch 'develop' of github.com:thecodingmachine/workadventure 2022-01-10 15:42:59 +01:00
David Négrier
e298a35efb
Merge pull request #1712 from albanbruder/fix-dump-serialization
Fix circular serialization in pusher dump endpoint
2022-01-09 22:39:38 +01:00
Alban Bruder
4a78e449df Fix circular serialization in pusher dump endpoint 2022-01-07 14:37:44 +01:00
_Bastler
5cc573ac49 Merge branch 'develop' of github.com:thecodingmachine/workadventure 2022-01-07 09:59:00 +01:00
David Négrier
adac0df05d
Merge pull request #1710 from thecodingmachine/fix_startup
Fix pusher and back locked
2022-01-06 19:29:21 +01:00
David Négrier
996adc6b59 Fix pusher and back locked
Due to the "messages" container changing .ts files at the very same time Typescript is compiling, ts-node-dev can end up in a "locked" state.
This is a bug in ts-node-dev.

To avoid issues, I am adding a small 5 seconds delay in pusher and back startup. This should allow (at least on my hardware) enough time for messages to be generated.
2022-01-06 18:53:45 +01:00
David Négrier
c46882e099
Merge pull request #1672 from thecodingmachine/2daysLimit
2 days limit
2022-01-05 17:42:01 +01:00
David Négrier
d24e074fbf
Merge pull request #1703 from thecodingmachine/2daysLimit_stupid_front
2 days limit improvements
2022-01-05 16:36:57 +01:00
David Négrier
f82012d315 Flagging Room.isPublic property as deprecated 2022-01-05 16:30:41 +01:00
David Négrier
6766ee86da Merge branch '2daysLimit' of github.com:thecodingmachine/workadventure into 2daysLimit 2022-01-05 14:32:17 +01:00
David Négrier
968e71cbca Removing completely any analysis of the URL from the front.
Instead, data related to room is sent from the admin, via the pusher.
2022-01-05 14:32:02 +01:00
Gregoire Parant
229bf2480c Merge branch 'develop' into 2daysLimit
Signed-off-by: Gregoire Parant <g.parant@thecodingmachine.com>

# Conflicts:
#	front/src/Connexion/RoomConnection.ts
2022-01-05 12:14:59 +01:00
Gregoire Parant
08847e1a64 Merge branch 'develop' into 2daysLimit
Signed-off-by: Gregoire Parant <g.parant@thecodingmachine.com>

# Conflicts:
#	front/src/Connexion/RoomConnection.ts
2022-01-05 12:08:27 +01:00
Gregoire Parant
ae122261d4 Fix prettier update
Signed-off-by: Gregoire Parant <g.parant@thecodingmachine.com>
2022-01-05 11:49:01 +01:00
Gregoire Parant
8b758a0053 Merge branch 'develop' into 2daysLimit
Signed-off-by: Gregoire Parant <g.parant@thecodingmachine.com>
2022-01-05 11:47:31 +01:00
David Négrier
c85679b42c Merge branch 'develop' of github.com:thecodingmachine/workadventure into 2daysLimit 2022-01-05 10:19:23 +01:00
David Négrier
20538b6287
Merge pull request #1655 from thecodingmachine/unhandled_promises
Fixing unhandled promises
2022-01-04 17:18:12 +01:00
David Négrier
24baf5664c All promises are now handled 2022-01-04 17:06:29 +01:00
David Négrier
6e27ffb2d5 Starting fixing unhandled promises 2022-01-04 16:50:43 +01:00
_Bastler
899621dd03 fix actions 2022-01-04 14:38:10 +01:00
_Bastler
b5b2eb487c latest dev 2022-01-04 13:59:09 +01:00
_Bastler
a9277fd977 latest dev 2022-01-04 13:55:34 +01:00
_Bastler
b2ec610027 Merge branch 'develop' of github.com:thecodingmachine/workadventure 2022-01-04 13:31:14 +01:00
David Négrier
bade2b41b6
Merge pull request #1693 from jonnytest1/patch-2
added columns type definition
2022-01-04 08:57:46 +01:00
David Négrier
b5778c386f
Merge pull request #1692 from workadventure-xce/fix/user-select
Disable user selection of UI elements
2022-01-04 08:55:21 +01:00
_Bastler
9b62e5f4ba Merge branch 'develop' of github.com:thecodingmachine/workadventure 2022-01-03 19:10:22 +01:00
David Négrier
5234cbe3f3
Merge pull request #1689 from Lurkars/fixAudioPlayerSrc
fix audio player src
2022-01-03 18:25:38 +01:00
David Négrier
4eb2ebd034
Merge pull request #1680 from workadventure-xce/fix/follow-via-keyboard
Fix follow requests via keyboard
2022-01-03 18:24:03 +01:00
David Négrier
fb69476b97
Merge pull request #1698 from thecodingmachine/ts-proto
Migrating front protobuf encode/decode to ts-proto lib
2022-01-03 18:07:19 +01:00
David Négrier
5b45a2bc25
Merge pull request #1699 from moufmouf/disable_e2e_for_forks
[WIP] Disabling running end to end tests for forks
2022-01-03 17:58:55 +01:00
David Négrier
7b239e8ebb Disabling running end to end tests for forks
Github Actions does not provide big enough VMs for E2E tests.
So we need to spin our own instances on AWS. But we cannot share the credentials with the forks for obvious security reasons.
We therefore need to completely disable E2E tests for forks :(
2022-01-03 17:57:41 +01:00
David Négrier
6bd9a998f9 Removing unused messages 2022-01-03 16:26:52 +01:00
David Négrier
b0ee4fc633
Merge pull request #1696 from ngc4622/iframe-division-by-zero
ScaleManager: do not apply new size if width is zero
2022-01-03 16:01:01 +01:00
David Négrier
bf070c33b5 Migrating front protobuf encode/decode to ts-proto lib
The ts-proto lib has the huge advantage of producing code the "Typescript" way and not the "Java" way.
In particular, for "oneof" types in protobuf, it is generating "ADT" that can be used to check if we forgot or not to deal with a type.
2022-01-03 15:52:46 +01:00
David Négrier
a28d86c16d
Merge pull request #1525 from thecodingmachine/player-local-storage
Allows to read and write "Player properties" from LocalStorage & Adds a camera API
2022-01-03 15:24:14 +01:00
Bénédicte Q
5d0aa835a2
Apply suggestions from code review
Co-authored-by: David Négrier <d.negrier@thecodingmachine.com>
2022-01-03 14:21:59 +01:00
Bénédicte Q
7c34e0a435
Update docs/maps/api-camera.md
Co-authored-by: David Négrier <d.negrier@thecodingmachine.com>
2022-01-03 14:19:55 +01:00
_Bastler
4d520a5994 bring back emojis! 2022-01-03 13:42:13 +01:00
_Bastler
be6d7c7151 remove emoji cdn 2022-01-03 13:10:15 +01:00
Benedicte Quimbert
ac27ab7e3e Revert "WIP enable/disable tutorial according to the map 'tutorial' property"
This reverts commit 47a6710b60e3856bf57c0700fe33bec95c6fc6dd.
2022-01-03 11:45:47 +01:00
Benedicte Quimbert
8157ee4603 Completes documentation 2022-01-03 11:45:47 +01:00
Benedicte Quimbert
85d45071fa Makes onCameraUpdate subscribe-able 2022-01-03 11:45:47 +01:00
Benedicte Quimbert
d9482d484b WIP enable/disable tutorial according to the map 'tutorial' property 2022-01-03 11:45:47 +01:00
Benedicte Quimbert
99f9d56c5c Updates room documentation for embeddedWebsite properties 2022-01-03 11:45:47 +01:00
Bénédicte Q
a69f232a06 Update front/src/Api/Events/IframeEvent.ts
Co-authored-by: David Négrier <d.negrier@thecodingmachine.com>
2022-01-03 11:45:47 +01:00
Bénédicte Q
adc71b5695 Update front/src/Api/Events/IframeEvent.ts
Co-authored-by: David Négrier <d.negrier@thecodingmachine.com>
2022-01-03 11:45:47 +01:00
Bénédicte Q
73efdab52f Update docs/maps/api-camera.md
Co-authored-by: David Négrier <d.negrier@thecodingmachine.com>
2022-01-03 11:45:47 +01:00
Bénédicte Q
864ff49af5 Update docs/maps/api-camera.md
Co-authored-by: David Négrier <d.negrier@thecodingmachine.com>
2022-01-03 11:45:47 +01:00
Benedicte Quimbert
9cf64c3c76 Documentation on type Position 2022-01-03 11:45:47 +01:00
Benedicte Quimbert
ddb4ae8823 Documentation 2022-01-03 11:45:47 +01:00