franconian
/
maps.franconian.net
13
0
Fork 0
Code Pull Requests Releases Activity

Compare commits

base: franconian:a336855e1e2f35145cd2b5a51cc6e80fd5bfdc4a
Branches Tags
franconian:main
franconian:staging
franconian:doom
franconian:oldMainLastStand
franconian:master
franconian:rc21_end_snapshot
franconian:linterHappy_mapOnline
..
compare: franconian:a425de62479825cb5df93eeca196ae5c33cb29e6
Branches Tags
franconian:main
franconian:staging
franconian:doom
franconian:oldMainLastStand
franconian:master
franconian:rc21_end_snapshot
franconian:linterHappy_mapOnline

No commits in common. "a336855e1e2f35145cd2b5a51cc6e80fd5bfdc4a" and "a425de62479825cb5df93eeca196ae5c33cb29e6" have entirely different histories.
a336855e1e ... a425de6247

4 changed files with 522 additions and 47 deletions
Show Stats Expand all files Collapse all files

508
aou.json
View File

@ -345,6 +345,457 @@
"spacing":0,
"tilecount":256,
"tileheight":32,
"tiles":[
{
"id":0,
"properties":[
{
"name":"collides",
"type":"bool",
"value":true
}]
},
{
"id":1,
"properties":[
{
"name":"collides",
"type":"bool",
"value":true
}]
},
{
"id":2,
"properties":[
{
"name":"collides",
"type":"bool",
"value":true
}]
},
{
"id":16,
"properties":[
{
"name":"collides",
"type":"bool",
"value":true
}]
},
{
"id":17,
"properties":[
{
"name":"collides",
"type":"bool",
"value":true
}]
},
{
"id":18,
"properties":[
{
"name":"collides",
"type":"bool",
"value":true
}]
},
{
"id":48,
"properties":[
{
"name":"collides",
"type":"bool",
"value":true
}]
},
{
"id":51,
"properties":[
{
"name":"collides",
"type":"bool",
"value":true
}]
},
{
"id":52,
"properties":[
{
"name":"collides",
"type":"bool",
"value":true
}]
},
{
"id":80,
"properties":[
{
"name":"collides",
"type":"bool",
"value":true
}]
},
{
"id":81,
"properties":[
{
"name":"collides",
"type":"bool",
"value":true
}]
},
{
"id":97,
"properties":[
{
"name":"collides",
"type":"bool",
"value":true
}]
},
{
"id":146,
"properties":[
{
"name":"collides",
"type":"bool",
"value":true
}]
},
{
"id":147,
"properties":[
{
"name":"collides",
"type":"bool",
"value":true
}]
},
{
"id":148,
"properties":[
{
"name":"collides",
"type":"bool",
"value":true
}]
},
{
"id":149,
"properties":[
{
"name":"collides",
"type":"bool",
"value":true
}]
},
{
"id":160,
"properties":[
{
"name":"collides",
"type":"bool",
"value":true
}]
},
{
"id":162,
"properties":[
{
"name":"collides",
"type":"bool",
"value":true
}]
},
{
"id":163,
"properties":[
{
"name":"collides",
"type":"bool",
"value":true
}]
},
{
"id":164,
"properties":[
{
"name":"collides",
"type":"bool",
"value":true
}]
},
{
"id":165,
"properties":[
{
"name":"collides",
"type":"bool",
"value":true
}]
},
{
"id":176,
"properties":[
{
"name":"collides",
"type":"bool",
"value":true
}]
},
{
"id":177,
"properties":[
{
"name":"collides",
"type":"bool",
"value":true
}]
},
{
"id":178,
"properties":[
{
"name":"collides",
"type":"bool",
"value":true
}]
},
{
"id":179,
"properties":[
{
"name":"collides",
"type":"bool",
"value":true
}]
},
{
"id":180,
"properties":[
{
"name":"collides",
"type":"bool",
"value":true
}]
},
{
"id":181,
"properties":[
{
"name":"collides",
"type":"bool",
"value":true
}]
},
{
"id":192,
"properties":[
{
"name":"collides",
"type":"bool",
"value":true
}]
},
{
"id":193,
"properties":[
{
"name":"collides",
"type":"bool",
"value":true
}]
},
{
"id":194,
"properties":[
{
"name":"collides",
"type":"bool",
"value":true
}]
},
{
"id":195,
"properties":[
{
"name":"collides",
"type":"bool",
"value":true
}]
},
{
"id":196,
"properties":[
{
"name":"collides",
"type":"bool",
"value":true
}]
},
{
"id":197,
"properties":[
{
"name":"collides",
"type":"bool",
"value":true
}]
},
{
"id":211,
"properties":[
{
"name":"collides",
"type":"bool",
"value":true
}]
},
{
"id":212,
"properties":[
{
"name":"collides",
"type":"bool",
"value":true
}]
},
{
"id":213,
"properties":[
{
"name":"collides",
"type":"bool",
"value":true
}]
},
{
"id":223,
"properties":[
{
"name":"collides",
"type":"bool",
"value":true
}]
},
{
"id":224,
"properties":[
{
"name":"collides",
"type":"bool",
"value":true
}]
},
{
"id":225,
"properties":[
{
"name":"collides",
"type":"bool",
"value":true
}]
},
{
"id":226,
"properties":[
{
"name":"collides",
"type":"bool",
"value":true
}]
},
{
"id":227,
"properties":[
{
"name":"collides",
"type":"bool",
"value":true
}]
},
{
"id":228,
"properties":[
{
"name":"collides",
"type":"bool",
"value":true
}]
},
{
"id":229,
"properties":[
{
"name":"collides",
"type":"bool",
"value":true
}]
},
{
"id":239,
"properties":[
{
"name":"collides",
"type":"bool",
"value":true
}]
},
{
"id":240,
"properties":[
{
"name":"collides",
"type":"bool",
"value":true
}]
},
{
"id":241,
"properties":[
{
"name":"collides",
"type":"bool",
"value":true
}]
},
{
"id":242,
"properties":[
{
"name":"collides",
"type":"bool",
"value":true
}]
},
{
"id":243,
"properties":[
{
"name":"collides",
"type":"bool",
"value":false
}]
},
{
"id":244,
"properties":[
{
"name":"collides",
"type":"bool",
"value":false
}]
},
{
"id":245,
"properties":[
{
"name":"collides",
"type":"bool",
"value":false
}]
}],
"tilewidth":32
},
{
@ -364,6 +815,61 @@
"spacing":0,
"tilecount":48,
"tileheight":32,
"tiles":[
{
"id":34,
"properties":[
{
"name":"collides",
"type":"bool",
"value":true
}]
},
{
"id":35,
"properties":[
{
"name":"collides",
"type":"bool",
"value":true
}]
},
{
"id":36,
"properties":[
{
"name":"collides",
"type":"bool",
"value":true
}]
},
{
"id":37,
"properties":[
{
"name":"collides",
"type":"bool",
"value":true
}]
},
{
"id":38,
"properties":[
{
"name":"collides",
"type":"bool",
"value":true
}]
},
{
"id":39,
"properties":[
{
"name":"collides",
"type":"bool",
"value":true
}]
}],
"tilewidth":32
},
{
@ -418,4 +924,4 @@
"type":"map",
"version":"1.6",
"width":32
}
}

BIN
blue.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 899 B

BIN
blue.xcf
View File

Binary file not shown.

61
main.json
View File

File diff suppressed because one or more lines are too long