merged develop

This commit is contained in:
Piotr 'pwh' Hanusiak
2022-04-19 12:43:56 +02:00
43 changed files with 672 additions and 138 deletions
+9 -4
View File
@@ -43,6 +43,11 @@
"type":"string",
"value":"{\"DEFAULT_BACKGROUND\":\"#77ee77\"}"
},
{
"name":"jitsiNoPrefix",
"type":"bool",
"value":true
},
{
"name":"jitsiRoom",
"type":"string",
@@ -65,7 +70,7 @@
"name":"floorLayer",
"objects":[
{
"height":83.6666666666666,
"height":110.891622876526,
"id":1,
"name":"",
"rotation":0,
@@ -73,14 +78,14 @@
{
"fontfamily":"Sans Serif",
"pixelsize":13,
"text":"Test:\nWalk on the carpet and press space\nResult:\nJitsi opens, background in green and audio\/video is muted",
"text":"Test:\nWalk on the carpet and press space\nResult:\nJitsi opens, background in green and audio\/video is muted.\nThe name of the room (displayed at the top of Jitsi) is \"Myroom Avec Espace EA\"",
"wrap":true
},
"type":"",
"visible":true,
"width":315.4375,
"x":2.28125,
"y":235.166666666667
"x":1.48051599382768,
"y":209.535838407429
}],
"opacity":1,
"type":"objectgroup",