ChCh
/
workadventure-map_github
mirror of https://github.com/ChaosChemnitz/workadventure-map.git
5
0
Fork 0
Code Issues Projects Releases Wiki Activity
282 Commits 9 Branches 0 Tags 20 MiB
Commit Graph

282 Commits

Author SHA1 Message Date
Florian Schlegel e1e7ed02fc partially fix Zietenaugust 2021-12-28 01:52:50 +01:00
Robert Köpferl 4e157ab20d ellipse 2021-12-28 01:34:36 +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 6e8870fce4 Chemnitz Pinguine Badge 2021-12-28 01:00:27 +01:00
Florian Schlegel 588cac1474 it's contagious 2021-12-27 22:55:30 +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
Thomas 4e3f57be93 change map link 2021-12-26 23:56:23 +01:00
Florian Schlegel 25d0ba466d "collide" collides with suggested naming of "collides" 2021-12-26 23:56:01 +01:00
Thomas 994a40e13d change exitURL 2021-12-26 23:53:31 +01:00
Robert Köpferl 579883e84d Squashed commit of the following: 
commit c08a459921
Author: Florian Schlegel <Florz@florz.net>
Date:   Sun Dec 26 23:17:54 2021 +0100

    fix lobby exit in Zietenaugust

commit 57f68ecdf6
Author: Robert <robertofon@os23.de>
Date:   Sun Dec 26 23:18:01 2021 +0100

    Fixen in main.json

commit a18dd7b204
Author: Thomas <tztz@stenon.io>
Date:   Sun Dec 26 23:10:35 2021 +0100

    remove empty layers

commit 3d5f020771
Author: Thomas <tztz@stenon.io>
Date:   Sun Dec 26 23:08:13 2021 +0100

    change exit node to c0mput3rtruhe

commit e9476aa493
Author: Thomas <tztz@stenon.io>
Date:   Sun Dec 26 22:59:23 2021 +0100

    remove empty layer

commit 65da5cf0ac
Merge: fc2f16d 1d6888b
Author: Thomas <tztz@stenon.io>
Date:   Sun Dec 26 22:58:41 2021 +0100

    Merge branch 'master' of github.com:ChaosChemnitz/workadventure-map

commit fc2f16defb
Author: Thomas <tztz@stenon.io>
Date:   Sun Dec 26 22:58:17 2021 +0100

    remove empty layer

commit 1d6888bae7
Author: Florian Schlegel <Florz@florz.net>
Date:   Sun Dec 26 22:55:17 2021 +0100

    fixed sounds to satisfy rc3-linter

commit a2e514029b
Author: Thomas <tztz@stenon.io>
Date:   Sun Dec 26 22:56:36 2021 +0100

    add start layer

commit af6a5ed838
Author: Thomas <tztz@stenon.io>
Date:   Sun Dec 26 22:53:09 2021 +0100

    fix map link -> world://

commit d88eb4fa9e
Author: Robert <robertofon@os23.de>
Date:   Sun Dec 26 22:12:54 2021 +0100

    lokomov Rechte, vollst.

commit bf314c5c05
Author: Robert <robertofon@os23.de>
Date:   Sun Dec 26 21:25:18 2021 +0100

    Weitere copyrights

commit e09997cfab
Author: Robert <robertofon@os23.de>
Date:   Sun Dec 26 18:04:32 2021 +0100

    Rechte in Raketen nachgetragen

commit 64cf20a8a1
Author: Robert <robertofon@os23.de>
Date:   Sun Dec 26 17:53:02 2021 +0100

    tunnel mit Lizenzen

commit 7364031b8d
Author: Robert <robertofon@os23.de>
Date:   Sat Dec 25 22:33:19 2021 +0100

    mapCopyright pro map

commit 98c650838e
Author: Robert <robertofon@os23.de>
Date:   Mon Dec 20 20:30:33 2021 +0100

    tied session weg + ignore

commit 7dd2f36cc4
Author: Robert <robertofon@os23.de>
Date:   Mon Dec 20 20:25:53 2021 +0100

    projekt update

commit 8155706187
Merge: 1e5c85d 1481fd4
Author: Robert <robertofon@os23.de>
Date:   Mon Dec 20 20:24:22 2021 +0100

    Merge branch 'master' of github.com:ChaosChemnitz/workadventure-map

commit 1e5c85d1d5
Author: Robert <robertofon@os23.de>
Date:   Mon Dec 20 20:20:47 2021 +0100

    project datei

# Conflicts:
#	kreuzung/rakete1.json
#	kreuzung/rakete2.json
#	kreuzung/rakete3.json
#	kreuzung/tunnel.json
#	main.json
#	zietenaugust/main.json
 2021-12-26 23:37:21 +01:00
Florian Schlegel c08a459921 fix lobby exit in Zietenaugust 2021-12-26 23:18:33 +01:00
Robert 57f68ecdf6 Fixen in main.json 2021-12-26 23:18:01 +01:00
Thomas a18dd7b204 remove empty layers 2021-12-26 23:10:35 +01:00
Thomas 3d5f020771 change exit node to c0mput3rtruhe 2021-12-26 23:08:13 +01:00
Thomas e9476aa493 remove empty layer 2021-12-26 22:59:23 +01:00
Thomas 65da5cf0ac Merge branch 'master' of github.com:ChaosChemnitz/workadventure-map 2021-12-26 22:58:41 +01:00
Thomas fc2f16defb remove empty layer 2021-12-26 22:58:17 +01:00
Florian Schlegel 1d6888bae7 fixed sounds to satisfy rc3-linter 2021-12-26 22:58:17 +01:00
Thomas a2e514029b add start layer 2021-12-26 22:56:36 +01:00
Thomas af6a5ed838 fix map link -> world:// 2021-12-26 22:53:09 +01:00
Robert 7e2d6a67f6 squash merge von master 2021-12-26 22:17:42 +01:00