Commit Graph

4201 Commits

Author SHA1 Message Date
David Négrier
469f9d9533
Merge pull request #2007 from thecodingmachine/fix-bubble-lock-away-mode
fix locking bubble when returning from away mode
2022-03-29 14:41:34 +02:00
David Négrier
c177173688
Merge pull request #2005 from thecodingmachine/proto-well-known-types
make use of proto well knows types
2022-03-29 14:40:53 +02:00
David Négrier
3f090c61e0
Merge pull request #1836 from thecodingmachine/changeRegisterAccess
Change access token with query privateAccessToken in the url
2022-03-29 14:40:14 +02:00
Gregoire Parant
c1222c1c57 Fix run pretty
Signed-off-by: Gregoire Parant <g.parant@thecodingmachine.com>
2022-03-29 13:45:31 +02:00
Gregoire Parant
dce1ece837 Merge branch 'develop' into changeRegisterAccess
Signed-off-by: Gregoire Parant <g.parant@thecodingmachine.com>

# Conflicts:
#	front/src/Connexion/ConnectionManager.ts
#	front/vite.config.ts
2022-03-29 13:30:40 +02:00
Piotr 'pwh' Hanusiak
0e3529ae4a fix locking bubble when returning from away mode 2022-03-29 11:04:29 +02:00
Piotr 'pwh' Hanusiak
225f80b3ad fixed types for RoomConnection 2022-03-29 10:00:26 +02:00
Piotr 'pwh' Hanusiak
82dffff5a7 make use of proto well knows types 2022-03-28 17:08:12 +02:00
David Négrier
7ba3225ac4
Merge pull request #1941 from thecodingmachine/feature-bubble-lock
Feature bubble lock
2022-03-28 15:31:12 +02:00
Piotr 'pwh' Hanusiak
7afa53840e update dependencies 2022-03-28 14:55:20 +02:00
Piotr 'pwh' Hanusiak
6230bb1657 fix linter issues 2022-03-28 14:35:21 +02:00
Piotr 'pwh' Hanusiak
1b2c67a4d7 removed obsolete console.log 2022-03-28 13:47:02 +02:00
Piotr 'pwh' Hanusiak
b95d5f1d10 merged develop 2022-03-28 13:16:29 +02:00
Piotr 'pwh' Hanusiak
ee88bf1b99 Merge branch 'develop' into new_custom_woka_scene 2022-03-28 12:30:26 +02:00
Piotr 'pwh' Hanusiak
81c5876a66 grid shadow and animations 2022-03-28 12:29:31 +02:00
David Négrier
9d3e06ca10
Merge pull request #1945 from thecodingmachine/settings-mic-camera
Settings for camera and microphone on leaving WA tab
2022-03-28 09:57:14 +02:00
David Négrier
5f07bff2a7 Applying German translation, thanks to @Lurkars 2022-03-28 09:26:40 +02:00
Benedicte Quimbert
34d69b3b08 Fix conflicts 2022-03-25 16:53:18 +01:00
Bénédicte Q
4f9d254c7e
Merge branch 'develop' into settings-mic-camera 2022-03-25 16:44:49 +01:00
Benedicte Quimbert
fac445a8fe Fixes tileset import 2022-03-25 16:40:05 +01:00
Benedicte Quimbert
b9ff3425e0 Makes the default setting: camera off and mic on 2022-03-25 16:40:05 +01:00
Benedicte Quimbert
4215925141 Adds test map 2022-03-25 16:40:05 +01:00
Benedicte Quimbert
5c6a74df4c Adds the todo about German translation 2022-03-25 16:40:05 +01:00
Benedicte Quimbert
4e5fb735bd switches dropdown for checkboxes and adjusts wording 2022-03-25 16:40:05 +01:00
Benedicte Quimbert
40c0f06c8a PrivacyShutdownStore modifies constraints according to the user's setting 2022-03-25 16:37:03 +01:00
Benedicte Quimbert
85f3a1a9c8 Adds settings options and localUser functions 2022-03-25 16:34:59 +01:00
Benedicte Quimbert
b64aff4847 Fixes tileset import 2022-03-25 15:51:38 +01:00
David Négrier
d4e20a792e Merge branch 'master' of github.com:thecodingmachine/workadventure into develop 2022-03-25 14:29:57 +01:00
Piotr 'pwh' Hanusiak
f656702bb9 merged develop 2022-03-24 14:56:42 +01:00
Piotr 'pwh' Hanusiak
b1ddc2210e add category icons 2022-03-24 10:30:33 +01:00
David Négrier
38847afebf Restoring WA object in the iframe_api.ts file to avoid breaking compatibility
The WA object was missing in window otherwise because window.d.ts was not bundled in the package.
2022-03-23 22:57:53 +01:00
Alexis Faizeau
14a68ade88 Add z-index on embeds screens and action menu 2022-03-23 17:04:46 +01:00
Alexis Faizeau
87412c3400 Add more checking on woka details 2022-03-23 10:51:52 +01:00
Benedicte Quimbert
a4234268b2 Makes the default setting: camera off and mic on 2022-03-23 10:48:50 +01:00
Piotr 'pwh' Hanusiak
f755e68327 Press Start 2P font on buttons 2022-03-23 10:12:34 +01:00
Alexis Faizeau
418a8cc634 Remove login name scene on logout button event 2022-03-22 17:52:22 +01:00
Benedicte Quimbert
1681373d88 Adds test map 2022-03-22 17:42:11 +01:00
Piotr 'pwh' Hanusiak
fcf8659829 cleanup 2022-03-22 16:53:23 +01:00
Piotr 'pwh' Hanusiak
f446918e42 start normally 2022-03-22 16:49:20 +01:00
Benedicte Quimbert
a80f7ced44 Adds the todo about German translation 2022-03-22 16:48:02 +01:00
David Négrier
f1549a0ee0 Removing the temporary error message when moving to open id screen 2022-03-22 15:05:44 +01:00
David Négrier
e20a8caa26 Allowing iframeAuthentication URL (stored in OPID_LOGIN_SCREEN_PROVIDER) to be non-absolute. 2022-03-22 15:05:44 +01:00
Piotr 'pwh' Hanusiak
dae8619a6b Merge branch 'refactor_wokas' into new_custom_woka_scene 2022-03-22 15:05:33 +01:00
Piotr 'pwh' Hanusiak
87034a453e set starting parts on 0 indices 2022-03-22 14:39:47 +01:00
Piotr 'pwh' Hanusiak
11a262b178 make sure horizontal iPhoneX displays view properly 2022-03-22 13:37:41 +01:00
Piotr 'pwh' Hanusiak
d971c7e064 randomize and finish buttons 2022-03-22 11:56:22 +01:00
Piotr 'pwh' Hanusiak
2cf55cac7e crispy pixels 2022-03-22 09:44:26 +01:00
David Négrier
66aeb21fbb Restoring icons deleted by error 2022-03-22 09:14:59 +01:00
Benedicte Quimbert
216f34c113 switches dropdown for checkboxes and adjusts wording 2022-03-21 19:13:24 +01:00
Piotr 'pwh' Hanusiak
ccf897f320 fixing grid. wip 2022-03-21 16:44:51 +01:00