_Bastler/partey_workadventure
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
3,051 Commits 2 Branches 0 Tags 47 MiB
f053ece7da
Commit Graph

3051 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
grégoire parant
a0d863569b
WIP: Bypass camera scene (#1337) 
* Set new local camera setup variable

* Finish by pass video settings

 - TODO add button to update camera settings

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

* Merge branch 'develop' into jumpVideoCamera

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

# Conflicts:
#	front/src/Connexion/LocalUserStore.ts
#	front/src/Phaser/Components/Loader.ts
#	front/src/Phaser/Game/GameManager.ts
#	front/src/Phaser/Login/EnableCameraScene.ts

* Add menu to open enable camera scene

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

* Finish jump camera setup

Signed-off-by: Gregoire Parant <g.parant@thecodingmachine.com>
 2021-09-04 21:31:36 +02:00
_Bastler
22ff1cc82e Merge branch 'develop' of github.com:thecodingmachine/workadventure 2021-09-03 19:31:40 +02:00
Kharhamel
ce16dab65f
Merge pull request #1410 from thecodingmachine/betterMEdiaStore 
FIX: fixed a circular dependancy in stores
 2021-09-03 17:27:12 +02:00
kharhamel
ba5fa06306 FIX: fixed a circular dependancy in stores by rewriting createPeerStore() and createScreenSharingPeerStore() 2021-09-03 17:16:31 +02:00
_Bastler
b539d95fec Merge branch 'develop' of github.com:thecodingmachine/workadventure 2021-09-03 12:52:17 +02:00
Kharhamel
6cb0f14e5a
Merge pull request #919 from Lurkars/audioPlayerImprovements 
audio player volume improvements
 2021-09-03 11:50:23 +02:00
_Bastler
62e164de9e Merge branch 'develop' of github.com:thecodingmachine/workadventure 2021-09-02 19:18:25 +02:00
David Négrier
86858a176e
Merge pull request #1406 from thecodingmachine/fix/recursive_variables 
Allowing variables nested in group layers
 2021-09-02 18:37:27 +02:00
David Négrier
68a4772627 Allowing variables nested in group layers 
Up until this commit, variables nested in object layers inside group layers where not found by the front nor the back.
This PR changes analysis so that variables can be detected.
 2021-09-02 18:05:55 +02:00
Kharhamel
8d2da6bdc7
Merge pull request #1405 from jonnytest1/opentab2 
openTabPropertyKey (create new props in own file)
 2021-09-02 17:19:20 +02:00
Lurkars
49b1a55042 Merge branch 'develop' of github.com:thecodingmachine/workadventure into audioPlayerImprovements 2021-09-01 19:25:37 +02:00
Lurkars
cc048f9b20 Merge branch 'develop' of github.com:thecodingmachine/workadventure into develop 2021-09-01 19:25:11 +02:00
Lurkars
e584c16aaa socket 2021-09-01 19:25:05 +02:00
_Bastler
8715781bbd Merge branch 'develop' of github.com:thecodingmachine/workadventure 2021-09-01 19:24:26 +02:00
jonny
606e9093e1 renamed 2021-09-01 18:16:31 +02:00
jonny
181232c1e6 added jitsiTypes 2021-09-01 17:55:23 +02:00
Kharhamel
1d5ad96646
Merge pull request #1357 from thecodingmachine/dependabot/npm_and_yarn/benchmark/path-parse-1.0.7 
Bump path-parse from 1.0.6 to 1.0.7 in /benchmark
 2021-09-01 17:48:28 +02:00
dependabot[bot]
949da0529f
Bump path-parse from 1.0.6 to 1.0.7 in /benchmark 
Bumps [path-parse](https://github.com/jbgutierrez/path-parse) from 1.0.6 to 1.0.7.
- [Release notes](https://github.com/jbgutierrez/path-parse/releases)
- [Commits](https://github.com/jbgutierrez/path-parse/commits/v1.0.7)

---
updated-dependencies:
- dependency-name: path-parse
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
 2021-09-01 15:48:20 +00:00
Kharhamel
295d413fdc
Merge pull request #1358 from thecodingmachine/dependabot/npm_and_yarn/maps/path-parse-1.0.7 
Bump path-parse from 1.0.6 to 1.0.7 in /maps
 2021-09-01 17:48:14 +02:00
Kharhamel
04fe8fdd1e
Merge pull request #1359 from thecodingmachine/dependabot/npm_and_yarn/back/path-parse-1.0.7 
Bump path-parse from 1.0.6 to 1.0.7 in /back
 2021-09-01 17:48:01 +02:00
Kharhamel
8f31380084
Merge pull request #1360 from thecodingmachine/dependabot/npm_and_yarn/uploader/path-parse-1.0.7 
Bump path-parse from 1.0.6 to 1.0.7 in /uploader
 2021-09-01 17:47:48 +02:00
Kharhamel
93238abd76
Merge pull request #1361 from thecodingmachine/dependabot/npm_and_yarn/front/path-parse-1.0.7 
Bump path-parse from 1.0.6 to 1.0.7 in /front
 2021-09-01 17:47:34 +02:00
Kharhamel
3191930fdb
Merge pull request #1208 from thecodingmachine/dependabot/npm_and_yarn/messages/striptags-3.2.0 
Bump striptags from 3.1.1 to 3.2.0 in /messages
 2021-09-01 17:41:35 +02:00
Kharhamel
095a486621
Merge pull request #1402 from thecodingmachine/betterMEdiaStore 
FEATURE: improved the mediaStore code to disable tracks instead of deleting them
 2021-09-01 17:30:59 +02:00
kharhamel
52fe79df47 FEATURE: improved the mediaStore code to disable tracks instead of deleting them 2021-09-01 17:14:05 +02:00
David Négrier
4fac9eb928 Adding "collides" video to documentation 2021-09-01 16:11:55 +02:00
dependabot[bot]
e2b8d3b6ef
Bump path-parse from 1.0.6 to 1.0.7 in /maps 
Bumps [path-parse](https://github.com/jbgutierrez/path-parse) from 1.0.6 to 1.0.7.
- [Release notes](https://github.com/jbgutierrez/path-parse/releases)
- [Commits](https://github.com/jbgutierrez/path-parse/commits/v1.0.7)

---
updated-dependencies:
- dependency-name: path-parse
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
 2021-09-01 13:10:28 +00:00
dependabot[bot]
1b5042ef6a
Bump path-parse from 1.0.6 to 1.0.7 in /back 
Bumps [path-parse](https://github.com/jbgutierrez/path-parse) from 1.0.6 to 1.0.7.
- [Release notes](https://github.com/jbgutierrez/path-parse/releases)
- [Commits](https://github.com/jbgutierrez/path-parse/commits/v1.0.7)

---
updated-dependencies:
- dependency-name: path-parse
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
 2021-09-01 13:10:28 +00:00
dependabot[bot]
3f143ba912
Bump path-parse from 1.0.6 to 1.0.7 in /front 
Bumps [path-parse](https://github.com/jbgutierrez/path-parse) from 1.0.6 to 1.0.7.
- [Release notes](https://github.com/jbgutierrez/path-parse/releases)
- [Commits](https://github.com/jbgutierrez/path-parse/commits/v1.0.7)

---
updated-dependencies:
- dependency-name: path-parse
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
 2021-09-01 13:10:14 +00:00
dependabot[bot]
80601ae432
Bump path-parse from 1.0.6 to 1.0.7 in /uploader 
Bumps [path-parse](https://github.com/jbgutierrez/path-parse) from 1.0.6 to 1.0.7.
- [Release notes](https://github.com/jbgutierrez/path-parse/releases)
- [Commits](https://github.com/jbgutierrez/path-parse/commits/v1.0.7)

---
updated-dependencies:
- dependency-name: path-parse
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
 2021-09-01 13:10:13 +00:00
Kharhamel
49c2ba3c4b
Merge pull request #1362 from thecodingmachine/dependabot/npm_and_yarn/messages/path-parse-1.0.7 
Bump path-parse from 1.0.6 to 1.0.7 in /messages
 2021-09-01 15:09:19 +02:00
_Bastler
29b790ec32 Merge branch 'develop' of github.com:thecodingmachine/workadventure 2021-09-01 14:58:52 +02:00
jonny
0272e4f691 merged in develop again 2021-09-01 14:55:29 +02:00
jonny
7971daa27f openTabPropertyKey (create new props in own file) 2021-09-01 14:50:48 +02:00
Kharhamel
ad60993b9a
Merge pull request #1398 from tabascoeye/develop 
add possibility to set size of coWebsite and Jitsis via map property
 2021-09-01 14:42:41 +02:00
dependabot[bot]
7244fcd128
Bump path-parse from 1.0.6 to 1.0.7 in /messages 
Bumps [path-parse](https://github.com/jbgutierrez/path-parse) from 1.0.6 to 1.0.7.
- [Release notes](https://github.com/jbgutierrez/path-parse/releases)
- [Commits](https://github.com/jbgutierrez/path-parse/commits/v1.0.7)

---
updated-dependencies:
- dependency-name: path-parse
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
 2021-09-01 12:35:56 +00:00
Kharhamel
c0547637b5
Merge pull request #1404 from thecodingmachine/dependabot/npm_and_yarn/back/tar-4.4.19 
Bump tar from 4.4.15 to 4.4.19 in /back
 2021-09-01 14:33:57 +02:00
Kharhamel
5315628a10
Merge pull request #1403 from thecodingmachine/removesysteminformation 
remove the package systeminformation from back
 2021-09-01 14:29:05 +02:00
dependabot[bot]
df0546a2f3
Bump tar from 4.4.15 to 4.4.19 in /back 
Bumps [tar](https://github.com/npm/node-tar) from 4.4.15 to 4.4.19.
- [Release notes](https://github.com/npm/node-tar/releases)
- [Changelog](https://github.com/npm/node-tar/blob/main/CHANGELOG.md)
- [Commits](https://github.com/npm/node-tar/compare/v4.4.15...v4.4.19)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2021-09-01 12:28:03 +00:00
Kharhamel
4f8273bae7
Merge pull request #1356 from thecodingmachine/dependabot/npm_and_yarn/front/url-parse-1.5.3 
Bump url-parse from 1.5.1 to 1.5.3 in /front
 2021-09-01 14:27:18 +02:00
Kharhamel
b4501a4d2a
Merge pull request #1200 from guysoft/patch-1 
Add workaround for #932
 2021-09-01 14:26:22 +02:00
dependabot[bot]
96ff1f3af1
Bump url-parse from 1.5.1 to 1.5.3 in /front 
Bumps [url-parse](https://github.com/unshiftio/url-parse) from 1.5.1 to 1.5.3.
- [Release notes](https://github.com/unshiftio/url-parse/releases)
- [Commits](https://github.com/unshiftio/url-parse/compare/1.5.1...1.5.3)

---
updated-dependencies:
- dependency-name: url-parse
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
 2021-09-01 12:23:36 +00:00
kharhamel
bc9131119f remove the package systeminformation from back 2021-09-01 14:21:26 +02:00
_Bastler
9e459748bf Merge branch 'develop' of github.com:thecodingmachine/workadventure 2021-09-01 12:05:30 +02:00
GRL78
19baf7f582
fix ReportMenu (#1397) 2021-09-01 10:11:12 +02:00
_Bastler
8ab4b5b80c Merge branch 'develop' of github.com:thecodingmachine/workadventure 2021-08-31 21:02:33 +02:00
Kharhamel
d7b552a513
Merge pull request #1400 from thecodingmachine/bugA3 
FIX: media tracks were not readded to a 3rd person in some situations
 2021-08-31 16:30:41 +02:00
kharhamel
1e20466f74 FIX: media tracks were not readded to a 3rd person in some situations 2021-08-31 16:29:23 +02:00
TabascoEye
a0d73f27d9
Update CoWebsiteManager.ts 
yet another typo
 2021-08-30 19:51:14 +02:00
TabascoEye
e6ae343975
Update CoWebsiteManager.ts 
typos and style
 2021-08-30 19:44:50 +02:00