Skip to content
Snippets Groups Projects
Commit f8d4c769 authored by yourcoke's avatar yourcoke
Browse files

Squashed commit of the following: 

commit 1ad56ac47f3d1a6ec07ea61a14ed859bc572483c
Author: deinkoks <deinkoks@cert.ccc.de>
Date:   Fri Dec 25 19:43:52 2020 +0000

    Update maps.en.md

commit dc6aca3f17dbaf61ccdcd419a869ea9117275df9
Author: deinkoks <deinkoks@cert.ccc.de>
Date:   Fri Dec 25 19:37:13 2020 +0000

    Update maps.md

commit 642dd401e6f838275ee8eb0253d557d943ddb646
Author: deinkoks <deinkoks@cert.ccc.de>
Date:   Fri Dec 25 19:33:02 2020 +0000

    Update index.md

commit 7c6de21594eba7ac59f9e11a1b16f4f0f63df036
Author: deinkoks <deinkoks@cert.ccc.de>
Date:   Fri Dec 25 19:30:54 2020 +0000

    english version

commit e43310e33dd30b64250f5ff08e5f405af7e2f74b
Author: deinkoks <deinkoks@cert.ccc.de>
Date:   Fri Dec 25 19:24:29 2020 +0000

    Update exitUrls.md

commit 42953fc5c0ff3d60675abce1e05591863c315702
Author: deinkoks <deinkoks@cert.ccc.de>
Date:   Fri Dec 25 19:24:04 2020 +0000

    Update maps.md

commit 108b1aebb1084269f4ab955472db914c1deabbae
Author: deinkoks <deinkoks@cert.ccc.de>
Date:   Fri Dec 25 19:23:17 2020 +0000

    moved exitUrls to own file

commit 5b95bd6939575e3e04b59642543913a910c8ac04
Author: deinkoks <deinkoks@cert.ccc.de>
Date:   Fri Dec 25 19:09:07 2020 +0000

    Moved section

commit 1af9be4bf8a748ac6eff9588512a84c5701131c7
Author: deinkoks <deinkoks@cert.ccc.de>
Date:   Fri Dec 25 19:03:35 2020 +0000

    Added exitUrls List
parent 6858dc8e
No related branches found
No related tags found
1 merge request!38Added exitUrls List, expanded Maschinenraum Doku
Show whitespace changes
Inline Side-by-side
docs/exitUrls.en.md 0 → 100644
+ 94
− 0
View file @ f8d4c769
# 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}` |
docs/exitUrls.md 0 → 100644
+ 92
− 0
View file @ f8d4c769
# 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}` |
docs/index.md
+ 2
− 0
View file @ f8d4c769
......@@ -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)
......
docs/maps.en.md
+ 2
− 1
View file @ f8d4c769
......@@ -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
![](https://tiles.rc3.world/structures/worldExit.png)
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:
......
docs/maps.md
+ 2
− 1
View file @ f8d4c769
......@@ -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
![](https://tiles.rc3.world/structures/worldExit.png)
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:
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment

Impressum - Datenschutzerklärung