ChCh
/
workadventure-map_github
mirror of https://github.com/ChaosChemnitz/workadventure-map.git
5
0
Fork 0
Code Issues Projects Releases Wiki Activity

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
This commit is contained in:
Robert Köpferl 2021-12-27 00:21:47 +01:00
parent 579883e84d ce1e1e8dbf
commit af0efcffe1
10 changed files with 50630 additions and 50572 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
chch/a102_2OG.json
View File

@ -91,7 +91,7 @@
{
"name":"exitUrl",
"type":"string",
"value":"_\/global\/r2r.computertruhe.de\/workshop.json#start_chch"
"value":"world:\/\/computertruhe\/workshop.json#start_chch"
}],
"type":"tilelayer",
"visible":true,
@ -282,7 +282,7 @@
"value":"ChCh Map (cc0by) https:\/\/chch.it"
}],
"renderorder":"right-down",
"tiledversion":"1.4.3",
"tiledversion":"1.4.2",
"tileheight":32,
"tilesets":[
{

72
kreuzung/kosmonautenzentrum.json
View File

@ -1,11 +1,4 @@
{ "compressionlevel":-1,
"editorsettings":
{
"export":
{
"target":"."
}
},
"height":100,
"infinite":false,
"layers":[
@ -97,7 +90,7 @@
{
"name":"exitUrl",
"type":"string",
"value":"\/_\/global\/c0c0bird.codeberg.page\/main.json#start_chaoschemnitz\n"
"value":"world:\/\/lobby\/chaoszone.json#start_chch"
}],
"type":"tilelayer",
"visible":true,
@ -252,18 +245,13 @@
"nextobjectid":1,
"orientation":"orthogonal",
"properties":[
{
"name":"exitUrl",
"type":"string",
"value":"\/_\/global\/c0c0bird.codeberg.page\/main.json#start_chaoschemnitz"
},
{
"name":"mapCopyright",
"type":"string",
"value":"ChCh Map (cc0by) https:\/\/chch.it"
}],
"renderorder":"right-down",
"tiledversion":"1.4.3",
"tiledversion":"1.7.2",
"tileheight":32,
"tilesets":[
{
@ -274,6 +262,12 @@
"imagewidth":256,
"margin":0,
"name":"floortileset",
"properties":[
{
"name":"tilesetCopyright",
"type":"string",
"value":"(CC-BY-SA 3.0) 512x512px by 3lv3n https:\/\/www.deviantart.com\/3lv3n\/art\/Grass-and-dungeon-floor-tile-map-with-some-snow-700702945"
}],
"spacing":0,
"tilecount":64,
"tileheight":32,
@ -297,6 +291,12 @@
"imagewidth":1024,
"margin":0,
"name":"chaos_zone_shared",
"properties":[
{
"name":"tilesetCopyright",
"type":"string",
"value":"(CC) by ChaosZoneShared https:\/\/github.com\/chaosz0ne\/shared\/blob\/main\/tiles\/chaos_zone_shared.png"
}],
"spacing":0,
"tilecount":2048,
"tileheight":32,
@ -343,6 +343,12 @@
"imagewidth":512,
"margin":0,
"name":"tilesets_deviant_milkian_1",
"properties":[
{
"name":"tilesetCopyright",
"type":"string",
"value":"FREE TO USE Tileset 512x512px by milkian https:\/\/www.deviantart.com\/milkian\/art\/Tilesets-FSM-RM2K3-para-VX-Ace-Set-Escritorio-651542743"
}],
"spacing":0,
"tilecount":256,
"tileheight":32,
@ -356,6 +362,12 @@
"imagewidth":512,
"margin":0,
"name":"milkian_2",
"properties":[
{
"name":"tilesetCopyright",
"type":"string",
"value":"FREE TO USE Tileset 512x512px by milkian https:\/\/www.deviantart.com\/milkian\/art\/Tilesets-FSM-RM2K3-para-VX-Ace-Set-Hospital-651534818"
}],
"spacing":0,
"tilecount":256,
"tileheight":32,
@ -2674,6 +2686,12 @@
"imagewidth":512,
"margin":0,
"name":"milkian_3",
"properties":[
{
"name":"tilesetCopyright",
"type":"string",
"value":"FREE TO USE Tileset 512x512px by milkian https:\/\/www.deviantart.com\/milkian"
}],
"spacing":0,
"tilecount":256,
"tileheight":32,
@ -4992,6 +5010,12 @@
"imagewidth":256,
"margin":0,
"name":"fantasy",
"properties":[
{
"name":"tilesetCopyright",
"type":"string",
"value":"FREE RPG Tileset 32x32 by pipoya https:\/\/pipoya.itch.io\/pipoya-rpg-tileset-32x32"
}],
"spacing":0,
"tilecount":1064,
"tileheight":32,
@ -7391,6 +7415,12 @@
"imagewidth":320,
"margin":0,
"name":"chemnitz_all",
"properties":[
{
"name":"tilesetCopyright",
"type":"string",
"value":"CC0BY Chaostreff Chemnitz https:\/\/chch.it"
}],
"spacing":0,
"tilecount":320,
"tileheight":32,
@ -7404,6 +7434,12 @@
"imagewidth":320,
"margin":0,
"name":"chemnitz_sign",
"properties":[
{
"name":"tilesetCopyright",
"type":"string",
"value":"CC0BY Chaostreff Chemnitz https:\/\/chch.it"
}],
"spacing":0,
"tilecount":320,
"tileheight":32,
@ -7417,6 +7453,12 @@
"imagewidth":512,
"margin":0,
"name":"divoc-functional",
"properties":[
{
"name":"tilesetCopyright",
"type":"string",
"value":"CC0"
}],
"spacing":0,
"tilecount":256,
"tileheight":32,
@ -7424,6 +7466,6 @@
}],
"tilewidth":32,
"type":"map",
"version":1.4,
"version":"1.6",
"width":100
}

2
kreuzung/rakete1.json
View File

@ -138,7 +138,7 @@
"value":"ChCh Map (cc0by) https:\/\/chch.it"
}],
"renderorder":"right-down",
"tiledversion":"1.4.3",
"tiledversion":"1.4.2",
"tileheight":32,
"tilesets":[
{

50
lokomov/anniversaryadventure.json
View File

@ -1134,7 +1134,7 @@
"id":1129,
"properties":[
{
"name":"collide",
"name":"collides",
"type":"bool",
"value":true
}]
@ -1143,7 +1143,7 @@
"id":1130,
"properties":[
{
"name":"collide",
"name":"collides",
"type":"bool",
"value":true
}]
@ -1152,7 +1152,7 @@
"id":1131,
"properties":[
{
"name":"collide",
"name":"collides",
"type":"bool",
"value":true
}]
@ -1170,7 +1170,7 @@
"id":1175,
"properties":[
{
"name":"collide",
"name":"collides",
"type":"bool",
"value":true
}]
@ -1179,7 +1179,7 @@
"id":1176,
"properties":[
{
"name":"collide",
"name":"collides",
"type":"bool",
"value":true
}]
@ -1323,7 +1323,7 @@
"id":1534,
"properties":[
{
"name":"collide",
"name":"collides",
"type":"bool",
"value":true
}]
@ -1332,7 +1332,7 @@
"id":1535,
"properties":[
{
"name":"collide",
"name":"collides",
"type":"bool",
"value":true
}]
@ -1341,7 +1341,7 @@
"id":1536,
"properties":[
{
"name":"collide",
"name":"collides",
"type":"bool",
"value":true
}]
@ -1350,7 +1350,7 @@
"id":1575,
"properties":[
{
"name":"collide",
"name":"collides",
"type":"bool",
"value":true
}]
@ -1359,7 +1359,7 @@
"id":1576,
"properties":[
{
"name":"collide",
"name":"collides",
"type":"bool",
"value":true
}]
@ -1368,7 +1368,7 @@
"id":1577,
"properties":[
{
"name":"collide",
"name":"collides",
"type":"bool",
"value":true
}]
@ -1377,7 +1377,7 @@
"id":1578,
"properties":[
{
"name":"collide",
"name":"collides",
"type":"bool",
"value":true
}]
@ -1386,7 +1386,7 @@
"id":1579,
"properties":[
{
"name":"collide",
"name":"collides",
"type":"bool",
"value":true
}]
@ -1395,7 +1395,7 @@
"id":1580,
"properties":[
{
"name":"collide",
"name":"collides",
"type":"bool",
"value":true
}]
@ -1404,7 +1404,7 @@
"id":1581,
"properties":[
{
"name":"collide",
"name":"collides",
"type":"bool",
"value":true
}]
@ -1768,7 +1768,7 @@
"id":360,
"properties":[
{
"name":"collide",
"name":"collides",
"type":"bool",
"value":true
}]
@ -1777,7 +1777,7 @@
"id":361,
"properties":[
{
"name":"collide",
"name":"collides",
"type":"bool",
"value":true
}]
@ -1786,7 +1786,7 @@
"id":362,
"properties":[
{
"name":"collide",
"name":"collides",
"type":"bool",
"value":true
}]
@ -1795,7 +1795,7 @@
"id":363,
"properties":[
{
"name":"collide",
"name":"collides",
"type":"bool",
"value":true
}]
@ -1804,7 +1804,7 @@
"id":364,
"properties":[
{
"name":"collide",
"name":"collides",
"type":"bool",
"value":true
}]
@ -1813,7 +1813,7 @@
"id":384,
"properties":[
{
"name":"collide",
"name":"collides",
"type":"bool",
"value":true
}]
@ -1822,7 +1822,7 @@
"id":385,
"properties":[
{
"name":"collide",
"name":"collides",
"type":"bool",
"value":true
}]
@ -1831,7 +1831,7 @@
"id":386,
"properties":[
{
"name":"collide",
"name":"collides",
"type":"bool",
"value":true
}]
@ -1840,7 +1840,7 @@
"id":387,
"properties":[
{
"name":"collide",
"name":"collides",
"type":"bool",
"value":true
}]
@ -1849,7 +1849,7 @@
"id":388,
"properties":[
{
"name":"collide",
"name":"collides",
"type":"bool",
"value":true
}]

99
main.json
View File

File diff suppressed because one or more lines are too long

6
zietenaugust/baumhaus.json
View File

@ -51,12 +51,6 @@
"id":9,
"name":"Mauern",
"opacity":1,
"properties":[
{
"name":"collides",
"type":"bool",
"value":true
}],
"type":"tilelayer",
"visible":true,
"width":18,

11
zietenaugust/main.json
View File

@ -1,11 +1,4 @@
{ "compressionlevel":-1,
"editorsettings":
{
"export":
{
"target":"."
}
},
"height":60,
"infinite":false,
"layers":[
@ -361,7 +354,7 @@
"value":"ChCh Map (cc0by) https:\/\/chch.it"
}],
"renderorder":"right-down",
"tiledversion":"1.4.3",
"tiledversion":"1.7.2",
"tileheight":32,
"tilesets":[
{
@ -10170,6 +10163,6 @@
}],
"tilewidth":32,
"type":"map",
"version":1.4,
"version":"1.6",
"width":74
}