Commit graph

52 commits

Author SHA1 Message Date
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
p1ng0ut
75bb962257 Merge pull request 'aussenwand stärker' (#7) from berhsi/krautspace-rc3-map:main into main
Reviewed-on: http://git.nr18.space:3000/p1ng0ut/krautspace-rc3-map/pulls/7
2020-12-25 17:27:30 +01:00
bernd
f165138905 aussenwand stärker 2020-12-25 17:25:33 +01:00
Robert Manigk
8462032e9f corrects collides of cars 2020-12-25 17:17:44 +01:00
Robert Manigk
d1cefdb101 Adds some cars to the krautgasse again 2020-12-25 17:12:53 +01:00
p1ng0ut
e85b27ebad Merge pull request 'umgeräumt' (#6) from berhsi/krautspace-rc3-map:main into main
Reviewed-on: http://git.nr18.space:3000/p1ng0ut/krautspace-rc3-map/pulls/6
2020-12-25 16:51:56 +01:00
bernd
4c8f3ffd54 umgeräumt 2020-12-25 16:50:13 +01:00
Robert Manigk
d7db834326 Adds collides flag to closed doors 2020-12-25 16:42:56 +01:00
Robert Manigk
8226c58979 Corrects walls and windows of the gangway 2020-12-25 16:37:36 +01:00
p1ng0ut
cef8ae51c0 Merge pull request 'collisions eingefügt' (#5) from berhsi/krautspace-rc3-map:main into main
Reviewed-on: http://git.nr18.space:3000/p1ng0ut/krautspace-rc3-map/pulls/5
2020-12-25 16:26:21 +01:00
bernd
0bdf636607 collisions eingefügt 2020-12-25 16:24:16 +01:00
Robert Manigk
179dd52d20 Sets the collides flatgs of the walls 2020-12-25 16:11:46 +01:00
Robert Manigk
0ef296f67c Merge branch 'main' of github.com:HackspaceJena/krautspace-rc3-map into main 2020-12-25 15:43:54 +01:00
p1ng0ut
2d29092aa2 Merge pull request 'etage 1 weiter eingerichtet' (#4) from berhsi/krautspace-rc3-map:main into main
Reviewed-on: http://git.nr18.space:3000/p1ng0ut/krautspace-rc3-map/pulls/4
2020-12-25 15:39:56 +01:00
Robert Manigk
56b22dd3ab Building the facades of krautgasse 2020-12-25 15:38:31 +01:00
bernd
81cf641c7e etage 1 weiter eingerichtet 2020-12-25 15:35:28 +01:00
Robert Manigk
e50dedf770 Correction of the facade, wip 2020-12-25 14:44:56 +01:00
p1ng0ut
3705b7f3a7 Merge pull request 'bugfixes etage_0' (#3) from berhsi/krautspace-rc3-map:main into main
Reviewed-on: http://git.nr18.space:3000/p1ng0ut/krautspace-rc3-map/pulls/3
2020-12-25 14:38:04 +01:00
bernd
456562df59 bugfixes etage_0 2020-12-25 14:36:32 +01:00
p1ng0ut
eddbc643cf Merge pull request 'fix bug etage_0' (#2) from berhsi/krautspace-rc3-map:main into main
Reviewed-on: http://git.nr18.space:3000/p1ng0ut/krautspace-rc3-map/pulls/2
2020-12-25 13:10:53 +01:00
bernd
a2b8cd3abe fix bug etage_0 2020-12-25 13:03:50 +01:00
p1ng0ut
2b556b1ea2 Merge pull request 'fix bug etage_0' (#1) from berhsi/krautspace-rc3-map:main into main
Reviewed-on: http://git.nr18.space:3000/p1ng0ut/krautspace-rc3-map/pulls/1
2020-12-25 12:56:26 +01:00
bernd
72639d84bc fix bug etage_0 2020-12-25 12:52:53 +01:00
Robert Manigk
0c1a3f6b15 updates chaos_zone_shared.png 2020-12-23 18:28:49 +01:00
Robert Manigk
5c0f5c25e5
Corrects the link in the README.md 2020-12-23 12:50:56 +01:00