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

298 Commits

Author SHA1 Message Date
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
Robert d88eb4fa9e lokomov Rechte, vollst. 2021-12-26 22:12:54 +01:00
Robert bf314c5c05 Weitere copyrights 2021-12-26 21:25:18 +01:00
Robert e09997cfab Rechte in Raketen nachgetragen 2021-12-26 18:04:32 +01:00
Robert 64cf20a8a1 tunnel mit Lizenzen 2021-12-26 17:53:02 +01:00
Robert 6e1a824a55 Mere alltilesd 2021-12-25 22:38:58 +01:00
Robert 7364031b8d mapCopyright pro map 2021-12-25 22:33:19 +01:00
Robert 98c650838e tied session weg + ignore 2021-12-20 20:30:33 +01:00
Robert 7dd2f36cc4 projekt update 2021-12-20 20:25:53 +01:00
Robert 8155706187 Merge branch 'master' of github.com:ChaosChemnitz/workadventure-map 2021-12-20 20:24:22 +01:00
Robert 1e5c85d1d5 project datei 2021-12-20 20:20:47 +01:00
Robert Köpferl 1481fd4fe8 Squashed commit of the following: 
commit e3a3e97ad2
Merge: 69a3694 557d4a3
Author: Robert Köpferl <rob@os23.de>
Date:   Fri Apr 2 20:25:43 2021 +0200

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

commit 69a36945f7
Author: Robert Köpferl <rob@os23.de>
Date:   Fri Apr 2 17:54:44 2021 +0200

    fix_jitsi

commit 20c33ab250
Author: Robert Köpferl <rob@os23.de>
Date:   Fri Apr 2 17:17:54 2021 +0200

    fix_backlink
 2021-04-03 13:30:50 +02:00
Robert Köpferl 557d4a3a71 link ctruhe syntax 2021-03-28 17:19:20 +02:00
Robert Köpferl e38140c68a link_chaosZone_fix 2021-03-27 16:50:25 +01:00
Robert Köpferl 8ea5cffa12 linksverbessern 2021-03-26 21:59:14 +01:00
Robert Köpferl 07aa4aa985 verlinkung_r2r 2021-03-26 21:50:40 +01:00
Robert Köpferl b160a02a1c erster_grafikteil_r2r 2021-03-25 23:58:49 +01:00
Robert Köpferl cba2b2e515 divoc-bilder 2021-03-25 23:16:46 +01:00
Robert Köpferl 1b06f75103 schild 2021-03-12 21:34:16 +01:00
Robert Köpferl 5636da2fe3 tunnel mit Wänden 
Proton beschriftet
Roterturm web
 2021-03-12 21:30:00 +01:00
Robert Köpferl 13a16aa02d tunnelwand 2021-03-12 15:42:11 +01:00
Robert Köpferl 37bb7a09ef Fehler im tunnel und im Space weg 2021-03-12 15:39:35 +01:00
Robert Köpferl 711945c40d zwei S "properties":[ 
{
                 "name":"startLayer",
                 "type":"bool",
                 "value":true
                }],
 2021-03-12 11:41:10 +01:00
Robert Köpferl d5c1f23858 truhe starlayer 2021-03-12 11:26:26 +01:00
Robert Köpferl 5ce7478bae start computertruhe in chch 2021-03-11 17:50:32 +01:00
Robert Köpferl 20be58f239 CT in chch 2021-03-03 23:37:56 +01:00
Robert Köpferl 6f83b51e2c Computertruhe.png 2021-03-02 15:29:09 +01:00
Robert Köpferl c6ac90765e anpassung Schilder und clt 2021-03-01 22:24:32 +01:00
Robert Köpferl 8875c65bc3 Anpassungen für CLT 2021-03-01 21:37:21 +01:00
Robert Köpferl f74c2c6ef6 link 2021-02-06 23:33:40 +01:00
Robert Köpferl aa391c7e83 Links 2021-02-06 23:25:42 +01:00
Robert Köpferl d16ef2ef75 Merge remote-tracking branch 'remotes/origin/sylvester' 2020-12-31 16:45:04 +01:00
Robert Köpferl 61a8e060a5 Revert "verchis ergänzung" 
This reverts commit 0d63a798cf.
 2020-12-31 16:28:49 +01:00
Robert Köpferl 0d63a798cf verchis ergänzung 2020-12-31 14:57:20 +01:00
Robert Köpferl 09d5e7beb2 sylvester-eingang 2020-12-31 00:00:51 +01:00