Commit Graph

4786 Commits

Author SHA1 Message Date
_Bastler
f25cb6a3ba Merge branch 'develop' of github.com:thecodingmachine/workadventure 2021-10-04 20:57:12 +02:00
grégoire parant
b33e271d2e
Merge pull request #1499 from thecodingmachine/develop
Release 1.5.3
2021-10-04 20:54:13 +02:00
Gregoire Parant
2db446889b Create emoji test
Signed-off-by: Gregoire Parant <g.parant@thecodingmachine.com>
2021-10-04 20:39:01 +02:00
Kharhamel
a265290e41
Merge pull request #1501 from thecodingmachine/fixEmoteMenu
FIX: fixes for the emnote menu
2021-10-04 15:12:53 +02:00
Kharhamel
02108ce977 FIX: fixes for the emnote menu 2021-10-04 14:43:19 +02:00
_Bastler
735c30b5a5 Merge branch 'develop' of github.com:thecodingmachine/workadventure 2021-10-03 21:18:46 +02:00
Kharhamel
7bb0175648
FIX: we now make sure to completly disable the old stream before attempting to create a new one (#1493)
* FIX: we now make sure to completly disable the old stream before attempting to create a new one

* FIX: disable audio optimization on chrome

* always reemit the stream on chrome

* Try fix on stop current stream

Signed-off-by: Gregoire Parant <g.parant@thecodingmachine.com>

* Try fix on stop current stream

Signed-off-by: Gregoire Parant <g.parant@thecodingmachine.com>

* Push fix microphone

Signed-off-by: Gregoire Parant <g.parant@thecodingmachine.com>

Co-authored-by: Gregoire Parant <g.parant@thecodingmachine.com>
2021-10-02 23:58:33 +02:00
Valdo
f6fcb37d91
Updated README (logo, map, wording) (#1485)
Co-authored-by: Valdo Romao <v.romao@thecodingmachine.com>
2021-10-02 15:59:45 +02:00
Alexis Faizeau
8c3b708981
Remove audio manager range volume control by keys (#1489)
Co-authored-by: Alexis Faizeau <a.faizeau@workadventu.re>
2021-10-02 15:55:54 +02:00
_Bastler
4d52ed4e9d Merge branch 'develop' of github.com:thecodingmachine/workadventure 2021-09-30 18:58:02 +02:00
David Négrier
a7424b9329
Merge pull request #1496 from thecodingmachine/fixCD
FIX: removed admin url from deeployer and changed starter map
2021-09-30 11:54:51 +02:00
Kharhamel
2e34420605 FIX: removed admin url from deeployer on develop and master and changed starter map 2021-09-30 11:51:41 +02:00
grégoire parant
1e69bb0f49
Manage redirect URL from admin and save in hydra via pusher (#1492)
Add redirect parameter url to connect user directly on private openId application

Signed-off-by: Gregoire Parant <g.parant@thecodingmachine.com>
2021-09-30 11:16:25 +02:00
_Bastler
9b84c94579 fix worlds endpoint 2021-09-28 10:29:30 +02:00
_Bastler
99619cf140 update dockerfile 2021-09-28 09:51:53 +02:00
_Bastler
bb7f83cee6 added world menu 2021-09-28 09:44:11 +02:00
_Bastler
8cc1584c2e worlds + fix map update 2021-09-27 20:00:45 +02:00
David Négrier
2b5211d098
Merge pull request #1486 from thecodingmachine/fix-links
Fixing links in the documentation
2021-09-27 15:41:23 +02:00
David Négrier
7d758af900 Fixing .md link 2021-09-27 12:01:40 +02:00
David Négrier
ad5489c102 Adding edit URLs to allow people to directly propose changes 2021-09-27 11:32:57 +02:00
David Négrier
b8996d5abb Fixing links in the documentation 2021-09-27 11:13:35 +02:00
_Bastler
7ffbbae731 update latest dev 2021-09-25 14:42:27 +02:00
_Bastler
876fcdc989 Merge branch 'develop' of github.com:thecodingmachine/workadventure 2021-09-25 08:58:12 +02:00
Kharhamel
8d1943d6e9
Merge pull request #1484 from thecodingmachine/fixExitUrl
FIX: initPositionFromLayerName will now prioritize its target layer rather than the start layer
2021-09-24 12:00:23 +02:00
Kharhamel
ce26294250 FIX: initPositionFromLayerName will now prioritize its target layer rather than the start layer 2021-09-24 11:54:19 +02:00
Kharhamel
4650f4e8cf
Merge pull request #1480 from ValdoTR/maps
Removed old maps and add starter-kit map
2021-09-24 10:58:31 +02:00
Valdo Romao
b44c219441 Added default map path 2021-09-24 09:53:02 +01:00
_Bastler
5e6ffd9fa2 Merge branch 'develop' of github.com:thecodingmachine/workadventure 2021-09-23 18:47:36 +02:00
Kharhamel
bf0c333266
Merge pull request #1463 from thecodingmachine/dependabot/npm_and_yarn/front/axios-0.21.2
Bump axios from 0.21.1 to 0.21.2 in /front
2021-09-23 18:36:51 +02:00
Kharhamel
ff5c2c5e58
Merge pull request #1464 from thecodingmachine/dependabot/npm_and_yarn/back/axios-0.21.2
Bump axios from 0.21.1 to 0.21.2 in /back
2021-09-23 18:36:45 +02:00
Kharhamel
d2bf7b8fde
Merge pull request #1465 from thecodingmachine/dependabot/npm_and_yarn/pusher/axios-0.21.2
Bump axios from 0.21.1 to 0.21.2 in /pusher
2021-09-23 18:36:34 +02:00
Valdo Romao
e8ba9e9785 Removed old maps and add starter-kit map 2021-09-23 12:29:14 +01:00
_Bastler
3b4cf0a68c Merge branch 'develop' of github.com:thecodingmachine/workadventure 2021-09-21 21:10:09 +02:00
GRL78
3f1c5246f8
TO MERGE : Contact page from Admin or Environment Variable (#1401)
* Contact page from Admin or Environment Variable

* Get contact page from admin by pusher

* Changes requested

* Modify contactPageStore management

* documentation environment variables

Co-authored-by: Gregoire Parant <g.parant@thecodingmachine.com>
2021-09-21 20:24:53 +02:00
_Bastler
d305a91ffd Merge branch 'develop' of github.com:thecodingmachine/workadventure 2021-09-21 19:47:56 +02:00
Kharhamel
ccea46fe2b
Merge pull request #1476 from thecodingmachine/fixCustomWoka
FIX: added another catch case for default model
2021-09-21 17:45:31 +02:00
grégoire parant
d033b78c58
Update Youtube link markdown (#1477)
Signed-off-by: Gregoire Parant <g.parant@thecodingmachine.com>
2021-09-21 16:07:57 +02:00
Kharhamel
8b099e5725 FIX: added another catch case for default model 2021-09-21 14:29:15 +02:00
Gregoire Parant
3f954d273c Merge branch 'master' into develop
Signed-off-by: Gregoire Parant <g.parant@thecodingmachine.com>
2021-09-21 02:37:56 +02:00
grégoire parant
e77d4dda84
Update favicon and logo to deploy new design (#1475)
Signed-off-by: Gregoire Parant <g.parant@thecodingmachine.com>
2021-09-20 22:42:15 +02:00
_Bastler
d3a24b06c2 change room slug 2021-09-20 19:31:51 +02:00
_Bastler
0164d24329 Merge branch 'develop' of github.com:thecodingmachine/workadventure 2021-09-20 16:25:25 +02:00
Kharhamel
2fbf8f0a10
Merge pull request #1474 from Lurkars/twemojiEmoteMenuSvelte
fix wrong font name
2021-09-20 15:54:31 +02:00
Lurkars
781c69387c fix wrong font name 2021-09-20 15:22:54 +02:00
_Bastler
49bd6f8a1c Merge branch 'develop' of github.com:thecodingmachine/workadventure 2021-09-20 15:17:30 +02:00
_Bastler
31579283cd fix connection type 2021-09-20 15:06:44 +02:00
dependabot[bot]
8ecef9eadc
Bump axios from 0.21.1 to 0.21.2 in /front
Bumps [axios](https://github.com/axios/axios) from 0.21.1 to 0.21.2.
- [Release notes](https://github.com/axios/axios/releases)
- [Changelog](https://github.com/axios/axios/blob/master/CHANGELOG.md)
- [Commits](https://github.com/axios/axios/compare/v0.21.1...v0.21.2)

---
updated-dependencies:
- dependency-name: axios
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
2021-09-20 12:34:07 +00:00
dependabot[bot]
16d45c921f
Bump axios from 0.21.1 to 0.21.2 in /back
Bumps [axios](https://github.com/axios/axios) from 0.21.1 to 0.21.2.
- [Release notes](https://github.com/axios/axios/releases)
- [Changelog](https://github.com/axios/axios/blob/master/CHANGELOG.md)
- [Commits](https://github.com/axios/axios/compare/v0.21.1...v0.21.2)

---
updated-dependencies:
- dependency-name: axios
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
2021-09-20 12:34:04 +00:00
dependabot[bot]
62c163f11e
Bump axios from 0.21.1 to 0.21.2 in /pusher
Bumps [axios](https://github.com/axios/axios) from 0.21.1 to 0.21.2.
- [Release notes](https://github.com/axios/axios/releases)
- [Changelog](https://github.com/axios/axios/blob/master/CHANGELOG.md)
- [Commits](https://github.com/axios/axios/compare/v0.21.1...v0.21.2)

---
updated-dependencies:
- dependency-name: axios
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
2021-09-20 12:34:04 +00:00
Kharhamel
9b13a6780c
Merge pull request #1437 from Lurkars/twemojiEmoteMenuSvelte
Twemoji emote menu svelte (upgrade of #1301)
2021-09-20 14:33:16 +02:00