Commits · 45ffa22d894449c1827c5b641583fe5750a91955 · Nerdraum / rc3-map

28 Dec, 2021 19 commits
- changed again jitsi ... eieieie · 45ffa22d
  Dennis Keller authored Dec 28, 2021
  
  45ffa22d
- Merge branch 'bachelor' of hacksaar.de:nerdraum/rc3-map into bachelor · 181cbf38
  Dennis Keller authored Dec 28, 2021
  
  181cbf38
- changed jitsi · b8da2a58
  Dennis Keller authored Dec 28, 2021
  
  b8da2a58
- Merge branch 'bachelor' of hacksaar.de:nerdraum/rc3-map into bachelor · b10d8c53
  Georges Kessleer authored Dec 28, 2021
  
  b10d8c53
- re corrected copyrights · 6f64ac9e
  Georges Kessleer authored Dec 28, 2021
  
  6f64ac9e
- changed jitsi · 6c7ab2a6
  Dennis Keller authored Dec 28, 2021
  
  6c7ab2a6
- Merge branch 'bachelor' of hacksaar.de:nerdraum/rc3-map into bachelor · b163f983
  Georges Kessleer authored Dec 28, 2021
  
  b163f983
- removed imagelayer and badges. corrected copyrights. · 0c9c3ecf
  Georges Kessleer authored Dec 28, 2021
  
  0c9c3ecf
- Merge branch 'bachelor' of hacksaar.de:nerdraum/rc3-map into bachelor · 83d7a47e
  Dennis Keller authored Dec 28, 2021
  
  83d7a47e
- enable haxogreen map again · 1c6942ed
  Dennis Keller authored Dec 28, 2021
  
  1c6942ed
- copied rc3 tiles to our tiles. · 9ae84dae
  Georges Kessleer authored Dec 28, 2021
  
  9ae84dae
- fix exitURL · d1d678b1
  Dennis Keller authored Dec 28, 2021
  
  d1d678b1
- temporary disable haxogreen map · 1bcc52a7
  Dennis Keller authored Dec 28, 2021
  
  1bcc52a7
- Fixed some issues · 25e9b075
  Dennis Keller authored Dec 28, 2021
  
  25e9b075
- initial main world · 10905076
  Dennis Keller authored Dec 28, 2021
  
  10905076
- add bens new mining single tiles · de5300e4
  Dennis Keller authored Dec 28, 2021
  
  de5300e4
- add bens new mining tileset · 4ba774a0
  Dennis Keller authored Dec 28, 2021
  
  4ba774a0
- Merge branch 'bachelor' of hacksaar.de:nerdraum/rc3-map into bachelor · e5ac7ce0
  Dennis Keller authored Dec 28, 2021
  
  e5ac7ce0
- changed and added tilets and licenses, added layers in main.json, added audio-snippets · 704de5d6
  Dennis Keller authored Dec 28, 2021
  
  704de5d6
27 Dec, 2021 7 commits
- added level2 map, with licences infos. tiles not yet consolidated · 12b83d6e
  Georges Kessleer authored Dec 27, 2021
  
  12b83d6e
- Merge branch 'master' into 'bachelor' · 9ce84c98
  Wurschdbude authored Dec 27, 2021
```
Master

See merge request !7
```
  9ce84c98
- Merge branch 'bachelor' into 'master' · 7b4e0e33
  Wurschdbude authored Dec 27, 2021
```
repaired map. reduced aerial photo sizes (png->jpg)

See merge request !6
```
  7b4e0e33
- add nerdraum tileset and tiled-project · 6719f4d2
  Dennis Keller authored Dec 27, 2021
  
  6719f4d2
- repaired map. reduced aerial photo sizes (png->jpg) · 489d08a1
  Georges Kessleer authored Dec 27, 2021
  
  489d08a1
- Merge branch 'bachelor' into 'master' · 74ee0b73
  Wurschdbude authored Dec 27, 2021
```
added old haxogreen map, with licenses. Exit links are not correct

See merge request !5
```
  74ee0b73
- added old haxogreen map, with licenses. Exit links are not correct · 768d1e26
  Georges Kessleer authored Dec 27, 2021
  
  768d1e26
23 Dec, 2021 6 commits
- Merge branch 'bachelor' into 'master' · 2d456098
  Wurschdbude authored Dec 23, 2021
```
Bachelor

See merge request !4
```
  2d456098
- Merge branch 'bachelor' of hacksaar.de:nerdraum/rc3-map into bachelor · fe9c1f6e
  Wurschdbude authored Dec 23, 2021
  
  fe9c1f6e
- add dummy-folders · 3f9c71cd
  Wurschdbude authored Dec 23, 2021
  
  3f9c71cd
- add dummy-folders · f1125a09
  Wurschdbude authored Dec 23, 2021
  
  f1125a09
- Merge branch 'bachelor' into 'master' · 2c498a03
  Wurschdbude authored Dec 23, 2021
```
Bachelor

See merge request !3
```
  2c498a03
- Merge branch 'master' into 'bachelor' · 11891321
  Wurschdbude authored Dec 23, 2021
```
Merge branch 'bachelor' into 'master'

See merge request !2
```
  11891321
22 Dec, 2021 4 commits
- Add tiles.rc3.world submodule, update readme · e2b0d829
  Wurschdbude authored Dec 23, 2021
  
  e2b0d829
- Merge branch 'bachelor' into 'master' · 96df57b6
  Wurschdbude authored Dec 22, 2021
```
Test: First Merge

See merge request !1
```
  96df57b6
- Add main.json · 8ebb1629
  Wurschdbude authored Dec 23, 2021
  
  8ebb1629
- Initial commit · b588fd41
  Wurschdbude authored Dec 22, 2021
  
  b588fd41