Commit Graph

297 Commits

Author SHA1 Message Date
Robert b05fa2dd35 kleiner_Bagger 2021-12-29 23:33:59 +01:00
Thomas ded78c6775 remove space 2021-12-29 22:47:06 +01:00
Thomas 4a758c9dbb change token 2021-12-29 22:42:48 +01:00
Robert 035a19618c Badge_karlmarkx 2021-12-29 21:49:52 +01:00
Robert 66913a1446 Badge_karlmarkx 2021-12-29 21:29:56 +01:00
123TzTz321 c398078ed0
Update a102_2OG.json
remove badge from tilset
2021-12-29 11:58:05 +01:00
Robert Köpferl 77c37486d9 tunnel besser 2021-12-28 15:17:43 +01:00
Florian Schlegel b7be99a967
Merge pull request #12 from ChaosChemnitz/master
set property start layer
2021-12-28 02:19:18 +01:00
Florian Schlegel e55dd9ef17 set property start layer 2021-12-28 02:18:11 +01:00
Florian Schlegel 9f3dea4323
Merge pull request #11 from ChaosChemnitz/master
partially fix Zietenaugust
2021-12-28 01:53:54 +01:00
Florian Schlegel e1e7ed02fc partially fix Zietenaugust 2021-12-28 01:52:50 +01:00
Robert Köpferl 842c6508d9 Merge branch 'master' into rc3-release 2021-12-28 01:36:48 +01:00
Robert Köpferl 4e157ab20d ellipse 2021-12-28 01:34:36 +01:00
Robert Köpferl 4c081499c0 Merge branch 'master' into rc3-release 2021-12-28 01:27:46 +01:00
Robert Köpferl 1106dd47be Merge branch 'master' of github.com:ChaosChemnitz/workadventure-map 2021-12-28 01:26:55 +01:00
Robert Köpferl b23202df13 Kosmonautenschild und bADGEID 2021-12-28 01:26:40 +01:00
Florian Schlegel 50d1493ae8 add images for badge "ChCh Toilet Experience" 2021-12-28 01:06:42 +01:00
Robert Köpferl ad06a81222 Merge branch 'master' into rc3-release 2021-12-28 01:06:19 +01:00
Robert Köpferl 6e8870fce4 Chemnitz Pinguine Badge 2021-12-28 01:00:27 +01:00
Florian Schlegel 271e56fc3e
Merge pull request #10 from ChaosChemnitz/master
it's contagious
2021-12-27 22:57:56 +01:00
Florian Schlegel 588cac1474 it's contagious 2021-12-27 22:55:30 +01:00
Florian Schlegel 9020798967
Merge pull request #9 from ChaosChemnitz/master
fix return from Lokomov
2021-12-27 20:49:04 +01:00
Florian Schlegel 6c8dbe47c6 fix return from Lokomov 2021-12-27 20:47:38 +01:00
Florian Schlegel 88c74a73c9
Merge pull request #8 from ChaosChemnitz/master
merge fixed Lokomov entrance
2021-12-27 20:28:44 +01:00
Florian Schlegel d497524c2f Merge remote-tracking branch 'origin/rc3-release' 2021-12-27 20:24:02 +01:00
Florian Schlegel 1777c8ffec removed Lokomov back door 2021-12-27 20:21:14 +01:00
Florian Schlegel bb5da801a1 continue fixing Lokomov 2021-12-27 19:43:08 +01:00
123TzTz321 4194757456
Merge pull request #7 from ChaosChemnitz/master
dinge von florz & tztz
2021-12-27 19:33:16 +01:00
Florian Schlegel 2272b8a6f2 first attempt at fixing Lokomov entrance 2021-12-27 19:31:42 +01:00
Thomas 369a7652d1 add start layer ffc 2021-12-27 18:46:54 +01:00
123TzTz321 d483e5894e
Merge pull request #6 from ChaosChemnitz/master
try to fix ffc exit
2021-12-27 18:15:58 +01:00
Thomas 66491a7699 try to fix ffc exit 2021-12-27 18:14:46 +01:00
123TzTz321 2ae0caed78
Merge pull request #5 from ChaosChemnitz/master
add freifunk exit
2021-12-27 17:51:27 +01:00
Thomas 7d932c5270 add freifunk exit
fix wrong chaoszone exit
2021-12-27 17:49:46 +01:00
123TzTz321 e996f59a7c
Merge pull request #4 from ChaosChemnitz/master
add radiotipi
2021-12-27 14:26:12 +01:00
Thomas eacb9cbb51 tante edit -> tipi links 2021-12-27 14:17:11 +01:00
Thomas 232ddcf09a vorder vs hintergrund 2021-12-27 11:35:02 +01:00
Thomas 1071ea986d collides!11! 2021-12-27 11:29:36 +01:00
Thomas 6119c29ce9 typo in collides 2021-12-27 11:24:40 +01:00
Thomas 8520655071 add exit 2021-12-27 11:22:41 +01:00
Thomas 43a6762e39 add radioT tipi 2021-12-27 11:17:24 +01:00
Robert Köpferl 9ccbddd0bd Merge branch 'master' into rc3-release 2021-12-27 00:51:26 +01:00
Robert fa71fc260e Merge branch 'master' of github.com:ChaosChemnitz/workadventure-map 2021-12-27 00:48:28 +01:00
Robert 23f7b684aa warnings in maps weg 2021-12-27 00:48:17 +01:00
Thomas 5e1ae49045 fix badge token 2021-12-27 00:43:27 +01:00
Robert Köpferl af0efcffe1 Merge remote-tracking branch 'remotes/origin/master' into rc3-release
# Conflicts:
#	chch/a102_2OG.json
#	kreuzung/kosmonautenzentrum.json
#	kreuzung/rakete1.json
#	kreuzung/rakete2.json
#	kreuzung/rakete3.json
#	kreuzung/tunnel.json
#	main.json
#	zietenaugust/main.json
2021-12-27 00:21:47 +01:00
Florian Schlegel ce1e1e8dbf fix linter warnings for Kosmonautenzentrum 2021-12-27 00:17:08 +01:00
Robert dca0eb0d12 baumhaus fixes 2021-12-27 00:09:44 +01:00
Thomas 4c11e98811 Merge branch 'master' of github.com:ChaosChemnitz/workadventure-map 2021-12-27 00:03:01 +01:00
Thomas c6a4e0d644 fix badge 2021-12-27 00:02:45 +01:00