Commit Graph

4167 Commits

Author SHA1 Message Date
David Négrier
9e5c6d14e4 Merge branch 'develop' of github.com:thecodingmachine/workadventure into new_custom_woka_scene 2022-04-04 13:42:51 +02:00
David Négrier
2ff7bf54ae Making 2 properties readonly 2022-04-04 13:41:53 +02:00
Piotr 'pwh' Hanusiak
c43e5b97c6 merged full clothes branch 2022-04-04 13:03:56 +02:00
Piotr Hanusiak
32b777b5cf
New custom woka scene full clothes (#2023)
* center grid if possible

* whole outfit for every slot

* switched bodyPart slots into buttons

* change categories and body parts with WSAD / arrow keys

Co-authored-by: Piotr 'pwh' Hanusiak <p.hanusiak@workadventu.re>
2022-04-04 13:01:21 +02:00
Lukas
50a4481704
Update vite-plugin-env-config (#2025)
* Update vite-plugin-env-config
2022-04-01 18:47:28 +02:00
David Négrier
2f5dbfef89 Adding back missing report logo 2022-03-30 14:48:52 +02:00
Piotr 'pwh' Hanusiak
42e71411b5 center grid if possible 2022-03-30 13:20:49 +02:00
Piotr 'pwh' Hanusiak
d0ad5f8299 custom background for slots 2022-03-30 13:02:02 +02:00
Piotr 'pwh' Hanusiak
4c93060f85 select and center on currently selected item 2022-03-30 11:16:58 +02:00
Piotr 'pwh' Hanusiak
21e84064b9 Merge branch 'develop' into new_custom_woka_scene 2022-03-29 15:52:16 +02:00
dependabot[bot]
ba68623e6f Bump plist from 3.0.4 to 3.0.5 in /desktop/electron
Bumps [plist](https://github.com/TooTallNate/node-plist) from 3.0.4 to 3.0.5.
- [Release notes](https://github.com/TooTallNate/node-plist/releases)
- [Changelog](https://github.com/TooTallNate/plist.js/blob/master/History.md)
- [Commits](https://github.com/TooTallNate/node-plist/commits)

---
updated-dependencies:
- dependency-name: plist
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-03-29 15:32:57 +02:00
dependabot[bot]
8d690bcae1 Bump ansi-regex from 4.1.0 to 4.1.1 in /uploader
Bumps [ansi-regex](https://github.com/chalk/ansi-regex) from 4.1.0 to 4.1.1.
- [Release notes](https://github.com/chalk/ansi-regex/releases)
- [Commits](https://github.com/chalk/ansi-regex/compare/v4.1.0...v4.1.1)

---
updated-dependencies:
- dependency-name: ansi-regex
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-03-29 15:32:49 +02:00
dependabot[bot]
f436f5bcd4 Bump ansi-regex from 4.1.0 to 4.1.1 in /desktop/electron
Bumps [ansi-regex](https://github.com/chalk/ansi-regex) from 4.1.0 to 4.1.1.
- [Release notes](https://github.com/chalk/ansi-regex/releases)
- [Commits](https://github.com/chalk/ansi-regex/compare/v4.1.0...v4.1.1)

---
updated-dependencies:
- dependency-name: ansi-regex
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-03-29 15:32:41 +02:00
dependabot[bot]
80122a5294 Bump minimist from 1.2.5 to 1.2.6 in /desktop/local-app
Bumps [minimist](https://github.com/substack/minimist) from 1.2.5 to 1.2.6.
- [Release notes](https://github.com/substack/minimist/releases)
- [Commits](https://github.com/substack/minimist/compare/1.2.5...1.2.6)

---
updated-dependencies:
- dependency-name: minimist
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-03-29 15:32:33 +02:00
dependabot[bot]
f04cfb3bb4 Bump ansi-regex from 4.1.0 to 4.1.1 in /maps
Bumps [ansi-regex](https://github.com/chalk/ansi-regex) from 4.1.0 to 4.1.1.
- [Release notes](https://github.com/chalk/ansi-regex/releases)
- [Commits](https://github.com/chalk/ansi-regex/compare/v4.1.0...v4.1.1)

---
updated-dependencies:
- dependency-name: ansi-regex
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-03-29 15:32:22 +02:00
Piotr 'pwh' Hanusiak
ac9926b8d6 prevent actions menu from appearing when inserting space key on chat 2022-03-29 14:53:50 +02:00
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