Commit graph

76 commits

Author SHA1 Message Date
p1ng0ut
6daaaf0b25 Merge pull request 'exit zur lounge hinzugefügt' (#16) from berhsi/krautspace-rc3-map:main into main
Reviewed-on: http://git.nr18.space:3000/p1ng0ut/krautspace-rc3-map/pulls/16
2020-12-28 13:25:57 +01:00
bernd
d6f0c312a9 exit zur lounge hinzugefügt 2020-12-28 13:23:07 +01:00
Robert Manigk
29417aaf22 Merge branch 'main' of ssh://git.nr18.space:22023/p1ng0ut/krautspace-rc3-map into main 2020-12-28 12:43:46 +01:00
Robert Manigk
2c5c636d41 Correcting exitUrl in Johannisgasse 2020-12-28 12:36:48 +01:00
p1ng0ut
71832a346d Merge pull request 'main' (#15) from berhsi/krautspace-rc3-map:main into main
Reviewed-on: http://git.nr18.space:3000/p1ng0ut/krautspace-rc3-map/pulls/15
2020-12-27 19:23:58 +01:00
bernd
65ef2b45c6 bugfix link zur chaospost 2020-12-27 15:51:30 +01:00
bernd
1d6df65643 relative links zur chaoszone 2020-12-27 15:18:24 +01:00
bernd
1c0f2a0b1d bugfix link zur chaoszone 2020-12-27 15:13:08 +01:00
bernd
de1a098842 bugfix c3post 2020-12-27 12:58:07 +01:00
bernd
3bd6d08df3 c3post eingebunden 2020-12-27 12:56:23 +01:00
bernd
4056d0de7a bugfix am exit 2020-12-27 12:10:06 +01:00
bernd
2da6f8922f schliessanlage eingebunden 2020-12-27 11:54:26 +01:00
bernd
3d7cc3ede2 layer zum lug-bbb wieder entfernt 2020-12-27 11:30:36 +01:00
bernd
f0e313a7b9 anderer link zum fahrplan 2020-12-27 11:20:01 +01:00
bernd
daad164371 bugfix im istanbul 2020-12-27 11:11:57 +01:00
bernd
7176cc4335 repariercafe eingefügt 2020-12-27 11:02:51 +01:00
bernd
241552e618 kinderbasteln eingefügt 2020-12-27 10:53:41 +01:00
bernd
b17659c38c bugfixes 2020-12-27 10:07:28 +01:00
bernd
9fa16a8d3e 1. etage vervollständigt, fahrplan und lug verlinkt 2020-12-27 04:23:12 +01:00
bernd
8df6dfd47c erdgeschoss umgestaltet, map verkleinert 2020-12-27 02:19:53 +01:00
bernd
fc08aecdeb silentzonen überarbeitet, bad gefliest 2020-12-26 19:50:54 +01:00
bernd
67962f3ef5 bugfix sofa collides 2020-12-26 18:24:45 +01:00
bernd
65e19134fd bugfix in krautspace-tiles, floorLayer angehoben 2020-12-26 18:13:40 +01:00
bernd
e24caf663e tux hinzugefügt 2020-12-26 17:30:56 +01:00
bernd
b7141baf6f krautspace-tileset erweitert und angewandt 2020-12-26 15:45:30 +01:00
bernd
459c322e2e bugfix im jitsi-layer (ungetestet) 2020-12-26 14:51:40 +01:00
bernd
71b4d4d67b saeulenteile zu tileset zusammengefasst, datenkanal hinzu 2020-12-26 14:27:46 +01:00
qbi
d16cb79560 Change name to website_datenkanal 2020-12-26 13:48:15 +01:00
qbi
4df6ab9660 Add a WWW tile 2020-12-26 13:47:02 +01:00
qbi
ada8eb7500 Added link to https://datenkanal.org 2020-12-26 13:38:13 +01:00
Robert Manigk
2de685fac8
Merge pull request #1 from fiveop/main
Copyright
2020-12-25 22:30:25 +01:00
p1ng0ut
de2e51bdc2 Merge pull request 'bugfix der bar' (#14) from berhsi/krautspace-rc3-map:main into main
Reviewed-on: http://git.nr18.space:3000/p1ng0ut/krautspace-rc3-map/pulls/14
2020-12-25 22:18:41 +01:00
bernd
a6b667e955 bugfix der bar 2020-12-25 22:16:29 +01:00
p1ng0ut
f5d4d9bc23 Merge pull request 'sofas komplett collided' (#13) from berhsi/krautspace-rc3-map:main into main
Reviewed-on: http://git.nr18.space:3000/p1ng0ut/krautspace-rc3-map/pulls/13
2020-12-25 22:00:38 +01:00
bernd
87edd8afbd sofas komplett collided 2020-12-25 21:57:56 +01:00
p1ng0ut
fd306169b4 Merge pull request 'jitsi-layer hinzugefügt' (#12) from berhsi/krautspace-rc3-map:main into main
Reviewed-on: http://git.nr18.space:3000/p1ng0ut/krautspace-rc3-map/pulls/12
2020-12-25 21:43:49 +01:00
bernd
fd350c43a0 jitsi-layer hinzugefügt 2020-12-25 21:41:43 +01:00
Philipp Matthias Schaefer
3eef1e9af9 Copyright 2020-12-25 21:41:13 +01:00
p1ng0ut
a43149d1e0 Merge pull request 'AceSet-Hospital.png wieder raus' (#11) from berhsi/krautspace-rc3-map:main into main
Reviewed-on: http://git.nr18.space:3000/p1ng0ut/krautspace-rc3-map/pulls/11
2020-12-25 21:10:15 +01:00
bernd
1f4985a3c3 AceSet-Hospital.png wieder raus 2020-12-25 21:07:23 +01:00
p1ng0ut
71afcb0dbc Merge pull request 'silent layer hinzugefügt' (#10) from berhsi/krautspace-rc3-map:main into main
Reviewed-on: http://git.nr18.space:3000/p1ng0ut/krautspace-rc3-map/pulls/10
2020-12-25 20:57:51 +01:00
bernd
f1e914dc8d silent layer hinzugefügt 2020-12-25 20:55:54 +01:00
p1ng0ut
d4a1e83923 Merge pull request 'regale, sofa, accessoirs geändert' (#9) from berhsi/krautspace-rc3-map:main into main
Reviewed-on: http://git.nr18.space:3000/p1ng0ut/krautspace-rc3-map/pulls/9
2020-12-25 19:06:47 +01:00
bernd
763d5f2de3 regale, sofa, accessoirs geändert 2020-12-25 19:05:11 +01:00
Robert Manigk
eb1179b0ef adds some dishes to the bar and the new cupboard to the wall 2020-12-25 18:38:22 +01:00
Robert Manigk
9aafb57537 Changes the couch on the window 2020-12-25 18:28:26 +01:00
Robert Manigk
7f1a6892b1 Correcting folder of tilesets 2020-12-25 18:13:39 +01:00
Robert Manigk
9e9d10a741 Adds two new tilesets from dezentrale 2020-12-25 18:11:03 +01:00
p1ng0ut
a33ae2f7c8 Merge pull request 'collites in etage 1 hinzugefügt' (#8) from berhsi/krautspace-rc3-map:main into main
Reviewed-on: http://git.nr18.space:3000/p1ng0ut/krautspace-rc3-map/pulls/8
2020-12-25 18:07:05 +01:00
bernd
756c8ae408 collites in etage 1 hinzugefügt 2020-12-25 18:05:11 +01:00