Merge branch 'master' into rc3-release

This commit is contained in:
Robert Köpferl 2021-12-27 00:51:26 +01:00
commit 9ccbddd0bd
4 changed files with 3 additions and 13 deletions

View File

@ -7302,16 +7302,6 @@
"spacing":0, "spacing":0,
"tilecount":320, "tilecount":320,
"tileheight":32, "tileheight":32,
"tiles":[
{
"id":223,
"properties":[
{
"name":"openWebsite",
"type":"string",
"value":"https:\/\/archive.org\/embed\/msdos_Commander_Keen_4_-_Secret_of_the_Oracle_1991&autoplay=1"
}]
}],
"tilewidth":32 "tilewidth":32
}, },
{ {

View File

@ -64,7 +64,7 @@
{ {
"name":"getBadge", "name":"getBadge",
"type":"string", "type":"string",
"value":"csrfmiddlewaretoken=t8hlyHbYK6vD9hv2Ki4sc1stAhhfsrFlqNyp5MW1RiS8vpS4ZB &badge_class=map" "value":"t8hlyHbYK6vD9hv2Ki4sc1stAhhfsrFlqNyp5MW1RiS8vpS4ZB"
}], }],
"rotation":0, "rotation":0,
"type":"", "type":"",

View File

@ -205,7 +205,7 @@
"id":21, "id":21,
"properties":[ "properties":[
{ {
"name":"collide", "name":"collides",
"type":"bool", "type":"bool",
"value":true "value":true
}] }]

View File

@ -379,7 +379,7 @@
"id":21, "id":21,
"properties":[ "properties":[
{ {
"name":"collide", "name":"collides",
"type":"bool", "type":"bool",
"value":true "value":true
}] }]