From 1481fd4fe8a5b29073dd76ff72a192e01bf1a7ff Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20K=C3=B6pferl?= <rk@flinkebits.de>
Date: Sat, 3 Apr 2021 13:30:50 +0200
Subject: [PATCH] Squashed commit of the following:
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

commit e3a3e97ad27a6dbcc0331a5330b0d2c774558717
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

commit 69a36945f7b75d0b533d02707f3124e9e3638079
Author: Robert Köpferl <rob@os23.de>
Date:   Fri Apr 2 17:54:44 2021 +0200

    fix_jitsi

commit 20c33ab25042e92a4ea4ab6b0b5614d8c84d4997
Author: Robert Köpferl <rob@os23.de>
Date:   Fri Apr 2 17:17:54 2021 +0200

    fix_backlink
---
 alles.tiled-session              | 14 ++++++++++----
 kreuzung/kosmonautenzentrum.json | 12 ++++++++++++
 2 files changed, 22 insertions(+), 4 deletions(-)

diff --git a/alles.tiled-session b/alles.tiled-session
index 117fb33..420d36c 100644
--- a/alles.tiled-session
+++ b/alles.tiled-session
@@ -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
diff --git a/kreuzung/kosmonautenzentrum.json b/kreuzung/kosmonautenzentrum.json
index 2eae27f..7f5c848 100644
--- a/kreuzung/kosmonautenzentrum.json
+++ b/kreuzung/kosmonautenzentrum.json
@@ -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,