Squashed commit of the following:
commite3a3e97ad2
Merge:69a3694
557d4a3
Author: Robert Köpferl <rob@os23.de> Date: Fri Apr 2 20:25:43 2021 +0200 Merge branch 'r2r' of github.com:ChaosChemnitz/workadventure-map into r2r commit69a36945f7
Author: Robert Köpferl <rob@os23.de> Date: Fri Apr 2 17:54:44 2021 +0200 fix_jitsi commit20c33ab250
Author: Robert Köpferl <rob@os23.de> Date: Fri Apr 2 17:17:54 2021 +0200 fix_backlink
This commit is contained in:
parent
557d4a3a71
commit
1481fd4fe8
|
@ -11,8 +11,8 @@
|
|||
"scale": 0.75,
|
||||
"selectedLayer": 8,
|
||||
"viewCenter": {
|
||||
"x": 1998.6666666666665,
|
||||
"y": 1677.3333333333333
|
||||
"x": 1997.9999999999998,
|
||||
"y": 1568
|
||||
}
|
||||
},
|
||||
"chch/a102_2OG.json#Computertruhe": {
|
||||
|
@ -27,6 +27,9 @@
|
|||
"chch/a102_2OG.json#clt_tileset": {
|
||||
"scaleInDock": 1
|
||||
},
|
||||
"chch/a102_2OG.json#divoc-functional": {
|
||||
"scaleInDock": 1
|
||||
},
|
||||
"chch/a102_2OG.json#fantasy": {
|
||||
"scaleInDock": 1
|
||||
},
|
||||
|
@ -76,8 +79,8 @@
|
|||
"scale": 1,
|
||||
"selectedLayer": 3,
|
||||
"viewCenter": {
|
||||
"x": 1539,
|
||||
"y": 658
|
||||
"x": 1183.5,
|
||||
"y": 960
|
||||
}
|
||||
},
|
||||
"zietenaugust/main.json#campfire": {
|
||||
|
@ -95,6 +98,9 @@
|
|||
"zietenaugust/main.json#clt_tileset": {
|
||||
"scaleInDock": 1
|
||||
},
|
||||
"zietenaugust/main.json#divoc-functional": {
|
||||
"scaleInDock": 1
|
||||
},
|
||||
"zietenaugust/main.json#fantasy": {
|
||||
"scaleInDock": 1,
|
||||
"scaleInEditor": 1
|
||||
|
|
|
@ -86,6 +86,12 @@
|
|||
"id":19,
|
||||
"name":"gotoLobby",
|
||||
"opacity":1,
|
||||
"properties":[
|
||||
{
|
||||
"name":"exitUrl",
|
||||
"type":"string",
|
||||
"value":"\/_\/global\/c0c0bird.codeberg.page\/main.json#start_chaoschemnitz\n"
|
||||
}],
|
||||
"type":"tilelayer",
|
||||
"visible":true,
|
||||
"width":100,
|
||||
|
@ -116,6 +122,12 @@
|
|||
"id":20,
|
||||
"name":"ChCh-jitsi",
|
||||
"opacity":1,
|
||||
"properties":[
|
||||
{
|
||||
"name":"jitsiRoom",
|
||||
"type":"string",
|
||||
"value":"shared-chch"
|
||||
}],
|
||||
"type":"tilelayer",
|
||||
"visible":true,
|
||||
"width":100,
|
||||
|
|
Loading…
Reference in New Issue