diff --git a/docs/exitUrls.en.md b/docs/exitUrls.en.md new file mode 100644 index 0000000000000000000000000000000000000000..d7b4d5af8de54474f01464651a26281192bf54da --- /dev/null +++ b/docs/exitUrls.en.md @@ -0,0 +1,94 @@ +# exitUrls +You may want to link back from your assembly map to our lobby maps from. + +Please use the exitUrl matching your assembly +Wahrscheinlich möchtet ihr aus euren Assembly-Karten auch an einer (oder mehreren) Stellen zurück zur Lobby. + +Attention: This does **not** work for the test instance. + +Please use the URLs/placeholders for this as follows: +| Assembly | exitUrl | +| -------- | ------ | +| /dev/base | `{<lobby>/erfas-south.json#start_dev-base}` | +| /dev/lol | `{<lobby>/erfas-south.json#start_devlol}` | +| /dev/tal | `{<lobby>/erfas-spaces-north.json#start_devtal}` | +| 0museum | `{<lobby>/software.json#start_nullmuseum}` | +| 3D History | `{<lobby>/software.json#start_3d-history}` | +| Aaaaaaaaaaaaaaaaaaaaaaa | `{<lobby>/erfas-south.json#start_aaaaaaaaaaaa}` | +| Angelkitchen van de Mecklenbörgers | `{<lobby>/generic-assemblies.json#start_engelkittchen}` | +| Whistleblow Village | `{<lobby>/freedom.json#start_whistleblowers}` | +| Astralship | `{<lobby>/erfas-spaces-north.json#start_astralship}` | +| Awareness | `{<lobby>/c3oc.json#start_awareness-team}` | +| B3 – Berliner Bastel Bande | `{<lobby>/generic-tech.json#start_b3}` | +| Backdoor Collective | `{<lobby>/erfas-spaces-north.json#start_backdoor-collective}` | +| Bits&Bäume Dresden | `{<lobby>/non-tech.json#start_bits-baeume-dresden}` | +| Bitwäscherei / DigiGes | `{<lobby>/erfas-south.json#start_bitwaescherei}` | +| BUNDjugend | `{<lobby>/non-tech.json#start_bundjugend}` | +| C3D2 | `{<lobby>/erfas-spaces-north.json#start_c3d2}` | +| C3Signs | `{<lobby>/c3oc.json#start_c3sign}` | +| CCC Basel | `{<lobby>/erfas-south.json#start_ccc-basel}` | +| CCC Darmstadt | `{<lobby>/erfas-south.json#start_ccc-darmstadt}` | +| CCC HH | `{<lobby>/erfas-spaces-north.json#start_ccc-hh}` | +| Chaos Bronies | `{<lobby>/generic-assemblies.json#start_chaos-bronies}` | +| ChaosPat:innen | `{<lobby>/c3oc.json#start_chaospatinnen}` | +| Chaostreff Alzey | `{<lobby>/erfas-south.json#start_chaostreff-alzey}` | +| ChaosZone | `{<lobby>/erfas-spaces-north.json#start_chaoszone}` | +| Computerwerk | `{<lobby>/non-tech.json#start_computerwerk}` | +| cyber4EDU | `{<lobby>/non-tech.json#start_cyber4edu}` | +| Darksystem | `{<lobby>/generic-assemblies.json#start_darksystem}` | +| Dezentrale | `{<lobby>/erfas-spaces-north.json#start_dezentrale}` | +| Eigenbaukombinat Halle | `{<lobby>/erfas-spaces-north.json#start_eigenbaukombinat}` | +| Elektroglitzer | `{<lobby>/hardware-making.json#start_elektroglitzer}` | +| eventphone | `{<lobby>/main.json#start_eventphone}` | +| Fairy Dust Forest | `{<lobby>/erfas-spaces-north.json#start_fairy-dust-forest}` | +| FraMa | `{<lobby>/erfas-south.json#start_frama}` | +| FSR VI | `{<lobby>/non-tech.json#start_fsrvi}` | +| Gaffa Overflow | `{<lobby>/erfas-spaces-north.json#start_gaffa-overflow}` | +| Hacklabor | `{<lobby>/erfas-spaces-north.json#start_hacklabor}` | +| haecksen | `{<lobby>/erfas-spaces-north.json#start_haecksen}` | +| Haquium Maburgensis | `{<lobby>/erfas-south.json#start_hsmr}` | +| Hardware Hacking Area | `{<lobby>/hardware-making.json#start_hardware-hacking-area}` | +| ICMP | `{<lobby>/erfas-south.json#start_icmp}` | +| Kalkspace | `{<lobby>/erfas-south.json#start_kalkspace}` | +| Labitat | `{<lobby>/erfas-spaces-north.json#start_labitat}` | +| Labstelle511 | `{<lobby>/erfas-spaces-north.json#start_labstelle511}` | +| lebkuch.is | `{<lobby>/erfas-south.json#start_lebkuch-is}` | +| loop23 | `{<lobby>/generic-assemblies.json#start_loop23}` | +| Mainframe | `{<lobby>/erfas-spaces-north.json#start_mainframe-chaostreff-oldenburg}` | +| Metalab | `{<lobby>/erfas-south.json#start_metalab}` | +| MOiN | `{<lobby>/erfas-spaces-north.json#start_moin}` | +| muCCC | `{<lobby>/erfas-south.json#start_muccc}` | +| nerdhof.garden | `{<lobby>/generic-tech.json#start_nerdhof-garden}` | +| Numberwang | `{<lobby>/generic-assemblies.json#start_numberwang}` | +| OIO | `{<lobby>/software.json#start_oio}` | +| okoyono | `{<lobby>/generic-assemblies.json#start_okoyono}` | +| OpenStreetMap | `{<lobby>/software.json#start_osm}` | +| OpenTechSchool | `{<lobby>/non-tech.json#start_opentechschool}` | +| paradies lounge | `{<lobby>/generic-assemblies.json#start_paradies-lounge}` | +| Parents & Guardian Space | `{<lobby>/c3oc.json#start_c3kidspace}` | +| Polarkuh-Spotter | `{<lobby>/generic-assemblies.json#start_polarkuh-spotter}` | +| PrivacyWeek | `{<lobby>/freedom.json#start_privacyweek}` | +| Rust Lang | `{<lobby>/software.json#start_rust-lang}` | +| Section 77 | `{<lobby>/erfas-south.json#start_section77}` | +| Sendezentrum | `{<lobby>/generic-assemblies.json#start_sendezentrum}` | +| Senfcall | `{<lobby>/non-tech.json#start_senfcall}` | +| space.bi | `{<lobby>/erfas-spaces-north.json#start_sensor.community}` | +| Swabian Assembly | `{<lobby>/erfas-south.json#start_space-bi}` | +| Telnet | `{<lobby>/generic-tech.json#start_telnet-klartext-reden}` | +| Tinfoil Colloquy | `{<lobby>/art-games.json#start_tinfoil-colloquy}` | +| Tox Assembly | `{<lobby>/software.json#start_tox}` | +| UN-Hack-Bar | `{<lobby>/erfas-spaces-north.json#start_un-hack-bar}` | +| Veloak | `{<lobby>/art-games.json#start_veloak}` | +| Vizworld (== vizak) | `{<lobby>/software.json#start_vizak}` | +| xil | `{<lobby>/erfas-spaces-north.json#start_xil}` | +| Labstelle511 | `{<lobby>/erfas-spaces-north.json#start_labstelle511}` | +| Chaostal | `{<lobby>/erfas-spaces-north.json#start_chaostal}` | +| CCCWI | `{<lobby>/erfas-south.json#start_cccwi}` | +| 1K dezentralᵉ remote clubhaus &friends ⊂(◉‿◉)つ | `{<lobby>/generic-assemblies.json#start_1k-dezentral-remote-clubhaus-friends}` | +| TMS | `{<lobby>/generic-tech.json#start_tms}` | +| menschmeier | `{<lobby>/generic-assemblies.json#start_menschmeier}` | +| mag.lab | `{<lobby>/erfas-south.json#start_maglab}` | +| Bytewerk | `{<lobby>/erfas-south.json#start_bytewerk}` | +| Esperanto | `{<lobby>/non-tech.json#start_esperanto}` | +| Open Source Gardens | `{<lobby>/generic-tech.json#start_open-source-gardens}` | +| Munich Maker Lab | `{<lobby>/erfas-south.json#start_mumalab}` | diff --git a/docs/exitUrls.md b/docs/exitUrls.md new file mode 100644 index 0000000000000000000000000000000000000000..1cfd11d2f3c37fa0b97671e76f85edc3bd7d0c2c --- /dev/null +++ b/docs/exitUrls.md @@ -0,0 +1,92 @@ +# exitUrls + +Wahrscheinlich möchtet ihr aus euren Assembly-Karten auch an einer (oder mehreren) Stellen zurück zur Lobby. + +Achtung: Das funktioniert **nicht** auf der Testinstanz. + +Bitte nutzt hierfür die URLs/Platzhalter wie folgt: +| Assembly | exitUrl | +| -------- | ------ | +| /dev/base | `{<lobby>/erfas-south.json#start_dev-base}` | +| /dev/lol | `{<lobby>/erfas-south.json#start_devlol}` | +| /dev/tal | `{<lobby>/erfas-spaces-north.json#start_devtal}` | +| 0museum | `{<lobby>/software.json#start_nullmuseum}` | +| 3D History | `{<lobby>/software.json#start_3d-history}` | +| Aaaaaaaaaaaaaaaaaaaaaaa | `{<lobby>/erfas-south.json#start_aaaaaaaaaaaa}` | +| Angelkitchen van de Mecklenbörgers | `{<lobby>/generic-assemblies.json#start_engelkittchen}` | +| Whistleblow Village | `{<lobby>/freedom.json#start_whistleblowers}` | +| Astralship | `{<lobby>/erfas-spaces-north.json#start_astralship}` | +| Awareness | `{<lobby>/c3oc.json#start_awareness-team}` | +| B3 – Berliner Bastel Bande | `{<lobby>/generic-tech.json#start_b3}` | +| Backdoor Collective | `{<lobby>/erfas-spaces-north.json#start_backdoor-collective}` | +| Bits&Bäume Dresden | `{<lobby>/non-tech.json#start_bits-baeume-dresden}` | +| Bitwäscherei / DigiGes | `{<lobby>/erfas-south.json#start_bitwaescherei}` | +| BUNDjugend | `{<lobby>/non-tech.json#start_bundjugend}` | +| C3D2 | `{<lobby>/erfas-spaces-north.json#start_c3d2}` | +| C3Signs | `{<lobby>/c3oc.json#start_c3sign}` | +| CCC Basel | `{<lobby>/erfas-south.json#start_ccc-basel}` | +| CCC Darmstadt | `{<lobby>/erfas-south.json#start_ccc-darmstadt}` | +| CCC HH | `{<lobby>/erfas-spaces-north.json#start_ccc-hh}` | +| Chaos Bronies | `{<lobby>/generic-assemblies.json#start_chaos-bronies}` | +| ChaosPat:innen | `{<lobby>/c3oc.json#start_chaospatinnen}` | +| Chaostreff Alzey | `{<lobby>/erfas-south.json#start_chaostreff-alzey}` | +| ChaosZone | `{<lobby>/erfas-spaces-north.json#start_chaoszone}` | +| Computerwerk | `{<lobby>/non-tech.json#start_computerwerk}` | +| cyber4EDU | `{<lobby>/non-tech.json#start_cyber4edu}` | +| Darksystem | `{<lobby>/generic-assemblies.json#start_darksystem}` | +| Dezentrale | `{<lobby>/erfas-spaces-north.json#start_dezentrale}` | +| Eigenbaukombinat Halle | `{<lobby>/erfas-spaces-north.json#start_eigenbaukombinat}` | +| Elektroglitzer | `{<lobby>/hardware-making.json#start_elektroglitzer}` | +| eventphone | `{<lobby>/main.json#start_eventphone}` | +| Fairy Dust Forest | `{<lobby>/erfas-spaces-north.json#start_fairy-dust-forest}` | +| FraMa | `{<lobby>/erfas-south.json#start_frama}` | +| FSR VI | `{<lobby>/non-tech.json#start_fsrvi}` | +| Gaffa Overflow | `{<lobby>/erfas-spaces-north.json#start_gaffa-overflow}` | +| Hacklabor | `{<lobby>/erfas-spaces-north.json#start_hacklabor}` | +| haecksen | `{<lobby>/erfas-spaces-north.json#start_haecksen}` | +| Haquium Maburgensis | `{<lobby>/erfas-south.json#start_hsmr}` | +| Hardware Hacking Area | `{<lobby>/hardware-making.json#start_hardware-hacking-area}` | +| ICMP | `{<lobby>/erfas-south.json#start_icmp}` | +| Kalkspace | `{<lobby>/erfas-south.json#start_kalkspace}` | +| Labitat | `{<lobby>/erfas-spaces-north.json#start_labitat}` | +| Labstelle511 | `{<lobby>/erfas-spaces-north.json#start_labstelle511}` | +| lebkuch.is | `{<lobby>/erfas-south.json#start_lebkuch-is}` | +| loop23 | `{<lobby>/generic-assemblies.json#start_loop23}` | +| Mainframe | `{<lobby>/erfas-spaces-north.json#start_mainframe-chaostreff-oldenburg}` | +| Metalab | `{<lobby>/erfas-south.json#start_metalab}` | +| MOiN | `{<lobby>/erfas-spaces-north.json#start_moin}` | +| muCCC | `{<lobby>/erfas-south.json#start_muccc}` | +| nerdhof.garden | `{<lobby>/generic-tech.json#start_nerdhof-garden}` | +| Numberwang | `{<lobby>/generic-assemblies.json#start_numberwang}` | +| OIO | `{<lobby>/software.json#start_oio}` | +| okoyono | `{<lobby>/generic-assemblies.json#start_okoyono}` | +| OpenStreetMap | `{<lobby>/software.json#start_osm}` | +| OpenTechSchool | `{<lobby>/non-tech.json#start_opentechschool}` | +| paradies lounge | `{<lobby>/generic-assemblies.json#start_paradies-lounge}` | +| Parents & Guardian Space | `{<lobby>/c3oc.json#start_c3kidspace}` | +| Polarkuh-Spotter | `{<lobby>/generic-assemblies.json#start_polarkuh-spotter}` | +| PrivacyWeek | `{<lobby>/freedom.json#start_privacyweek}` | +| Rust Lang | `{<lobby>/software.json#start_rust-lang}` | +| Section 77 | `{<lobby>/erfas-south.json#start_section77}` | +| Sendezentrum | `{<lobby>/generic-assemblies.json#start_sendezentrum}` | +| Senfcall | `{<lobby>/non-tech.json#start_senfcall}` | +| space.bi | `{<lobby>/erfas-spaces-north.json#start_sensor.community}` | +| Swabian Assembly | `{<lobby>/erfas-south.json#start_space-bi}` | +| Telnet | `{<lobby>/generic-tech.json#start_telnet-klartext-reden}` | +| Tinfoil Colloquy | `{<lobby>/art-games.json#start_tinfoil-colloquy}` | +| Tox Assembly | `{<lobby>/software.json#start_tox}` | +| UN-Hack-Bar | `{<lobby>/erfas-spaces-north.json#start_un-hack-bar}` | +| Veloak | `{<lobby>/art-games.json#start_veloak}` | +| Vizworld (== vizak) | `{<lobby>/software.json#start_vizak}` | +| xil | `{<lobby>/erfas-spaces-north.json#start_xil}` | +| Labstelle511 | `{<lobby>/erfas-spaces-north.json#start_labstelle511}` | +| Chaostal | `{<lobby>/erfas-spaces-north.json#start_chaostal}` | +| CCCWI | `{<lobby>/erfas-south.json#start_cccwi}` | +| 1K dezentralᵉ remote clubhaus &friends ⊂(◉‿◉)つ | `{<lobby>/generic-assemblies.json#start_1k-dezentral-remote-clubhaus-friends}` | +| TMS | `{<lobby>/generic-tech.json#start_tms}` | +| menschmeier | `{<lobby>/generic-assemblies.json#start_menschmeier}` | +| mag.lab | `{<lobby>/erfas-south.json#start_maglab}` | +| Bytewerk | `{<lobby>/erfas-south.json#start_bytewerk}` | +| Esperanto | `{<lobby>/non-tech.json#start_esperanto}` | +| Open Source Gardens | `{<lobby>/generic-tech.json#start_open-source-gardens}` | +| Munich Maker Lab | `{<lobby>/erfas-south.json#start_mumalab}` | diff --git a/docs/index.md b/docs/index.md index 1061dc435b9df55c72d0d7fb1a86b9c4243d8941..c1ecdc1b45a081ca103f506804bf7de7dca40433 100644 --- a/docs/index.md +++ b/docs/index.md @@ -5,6 +5,7 @@ Aktuell findet ihr hier: * [Styleguide](styleguide.md) * [Maps Tutorial](maps.md) +* [exitUrls für world.rc3 maps](exitUrls.md) * [Maschinenraum Doku](maschinenraum.md) * [HowTo Play](play.md) * [GEMA](gema.md) @@ -16,6 +17,7 @@ You will find the following things here: * [Styleguide](styleguide.md) * [Maps Tutorial](maps.en.md) +* [exitUrls for world.rc3 maps](exitUrls.en.md) * [Maschinenraum Docs](maschinenraum.en.md) * [HowTo Play](play.en.md) * [GEMA](gema.en.md) diff --git a/docs/maps.en.md b/docs/maps.en.md index 471bd5072de82cd8115f859433f448e5fa935930..f1da9305d35f02ba536100cf6014527fdc598375 100644 --- a/docs/maps.en.md +++ b/docs/maps.en.md @@ -21,6 +21,7 @@ This tutorial is "work in progess", hence its worth checking it from time to tim * 2020-12-20: Starter kit added. * 2020-12-22: World-Exit added. * 2020-12-22: Cross-Assembly Links added. +* 2020-12-25: Added [exitUrl List](exitUrls.en.md) ## Known Bugs Following bugs are known and worked on: @@ -88,7 +89,7 @@ We recommend the following tile for your exit(s) back to the lobby map for a mor  -The URL for your exit will be provided upon registration of your entry. +You individual exitUrls are listed [here](exitUrls.en.md) #### Highlight current layer For a better mapping experience, highlight the current layer: diff --git a/docs/maps.md b/docs/maps.md index 7123267174809f595fba5020f5fdb5300ceb36ce..694a713027d1d8208ba116cf654e12335dfec1bf 100644 --- a/docs/maps.md +++ b/docs/maps.md @@ -24,6 +24,7 @@ Dieses Tutorial ist ein work in progress und wird immer mal wieder erweitert, es * 2020-12-20: Vorlage ergänzt. * 2020-12-22: World-Exit ergänzt. * 2020-12-22: Cross-Assembly Links ergänzt. +* 2020-12-25: Liste der exitUrls ergänzt. ## Known Bugs Folgende Bugs sind aktuell bekannt, wir versuchen bereits, Lösungen dafür zu finden: @@ -92,7 +93,7 @@ Als einheitlichen, wiedererkennbaren Ausgang zur Lobby-Karte empfehlen wir diese  -Die URL für euren Exit teilen wir euch bei Anmeldung eures Eingangs mit. +Eure individuellen exitUrls findet ihr [hier](exitUrls.md) #### Aktuellen Layer hervorheben Für ein leichteres Gestelten hebt euch den aktuellen Layer hervor: diff --git a/docs/maschinenraum.en.md b/docs/maschinenraum.en.md index 17466b283bf08ae4bb16f8cb4f1c7c2f7bec1379..e6ab75caa80caf19f8c35f2f70de18107f295fe6 100644 --- a/docs/maschinenraum.en.md +++ b/docs/maschinenraum.en.md @@ -48,6 +48,11 @@ To add a map to the 2D world, you have to offer a cloneable git repo. If the rep Learn how to create a compatible map in the rC3-World HowTo: [howto.rc3.world](https://howto.rc3.world/) +### What shall projects actually be? +Everything you would like to share with the world. + +Flying mate crates, cocktail robots, waffles of mass destruction? Show us and the world! + ### How are projects created? We want to see your projects! To see them in the frontend, we'll need from you: @@ -75,8 +80,11 @@ When you're uploading data to the "hangar" please make sure you have the rights * Soon you'll be able to request a FTPS access via the Maschinenraum and then use a FTP client to upload the files. * Please specify what you want to upload in the "hangar" (short description) and name the person to be contacted in cases of abuse and similar. -### How are badges created? -How does it work and what is possible? What means sticker and achievement mode? + +### What are badges and how to create them? +Badges should strengthen the explorative character of the congress: Assemblies can distribute these stickers/awards for "been there", "discovered something" or maybe also "P=NP proven"... + +#### How does it work and what is possible? What means sticker and achievement mode?  @@ -97,7 +105,9 @@ Badges are distributed to users via token. A matching token can be generated whe Users will find collected badges in their profile. Users will always have to actively accept a badge - who wants to suddenly find a pink dolphine vibrator in their profile? -API endpoints will exist soon +#### How to distribute badges to the users? + +API endpoints will exist soon. You can award badges to individual users in the maschinenraum, too. ## Any More Questions? Please send any questions not covered here to the Assembly Team: [rc3@c3assemblies.de](mailto:rc3@c3assemblies.de) diff --git a/docs/maschinenraum.md b/docs/maschinenraum.md index 29daaf740e59a9b4fdf721b640887c1ce0c9ca8f..4e23fa62706985843a0bb143564dec94865f7161 100644 --- a/docs/maschinenraum.md +++ b/docs/maschinenraum.md @@ -52,6 +52,12 @@ Um eine Map zur 2D-Welt beizutragen, müsst Ihr ein Git-Repo angeben, welches cl Wie Ihr eine kompatible Map erstellt, lest Ihr im [rC3-World HowTo](https://howto.rc3.world/) + +### Was sollen Projekte eigentlich sein? +Alles was ihr gerne mit der Welt teilen wollt. + +Fliegende Mate-Kiste, Cocktailroboter, Massenvernichtungswaffeln? Zeigt es uns und der Welt! + ### Wie werden Projekte angelegt? Wir möchten Eure Projekte sehen! Damit die guten Stücke im Frontend landen, brauchen wir von Euch: @@ -60,7 +66,6 @@ Wir möchten Eure Projekte sehen! Damit die guten Stücke im Frontend landen, br * auch: Wir suchen noch Leute für xyz * Links zu diversen weiteren Inhalten (hinter Dereferrer) möglich, wie z.B. Bildergalerie, Sourcecode-Repo, etc. - ### Externe Links Natürlich könnt Ihr z.B. Wikis Eurer Projekte verlinken. Allerdings ist alles, was außerhalb der rC3-Domains liegt, "YOLO-Land" und wird mit einer Dereferrer-Warnung versehen. @@ -83,8 +88,10 @@ Wenn Ihr Daten in den Hangar ladet, geht vorher sicher, dass Ihr die Rechte an d * Ihr könnt Euch in Kürze einen FTPS Zugang über den Maschinenraum klicken und dann mit einem gängigen FTP Client die Dateien hochladen. * Dazu gebt Ihr an, was Ihr im Hangar hinterlegen wollt (Kurzbeschreibung) und benennt den:die _Ansprechpartner:in_ für Abusefälle und dergleichen. -### Wie werden Badges erstellt? -Wie geht das und was ist machbar? Was bedeuten Sticker- oder Achievement-Mode? +### Wie werden Badges erstellt und was soll das eigentlich sein? +Badges sollen den explorativen Charakter des Congress verstärken: Assemblies können diese Sticker/Auszeichnungen verteilen für "mal da gewesen", "etwas entdeckt" oder vllt. auch "P=NP bewiesen"... + +#### Wie geht das und was ist machbar? Was bedeuten Sticker- oder Achievement-Mode?  @@ -104,7 +111,8 @@ Badges werden via Token an die User:innen verteilt. Ein passendes Token kann bei Gesammelte Badges finden User:innen in ihrem Profil. User:innen müssen den Erhalt der Badges immer aktiv bestätigen - wer möchte schon plötzlich einen rosafarbenen Delphin-Vibrator im Profil vorfinden? -API Endpunkt existiert in Kürze (noch nicht) +#### Badges verteilen +API Endpunkt existiert in Kürze, alternativ können Badges individuell im Maschinenraum an Nutzer verteilt werden. ## Noch Fragen?