blaudioslave/chaos-darmstadt
1
0
Fork 0
forked from Kraut.World/chaos-darmstadt-rcda
Code Issues Pull requests Projects Releases Packages Wiki Activity

w17.tmx: applied exit fix: https://chaos.social/@tropf/105453367372228675 & Spaß mit git

Browse source
This commit is contained in:
litschi 2020-12-27 18:45:08 +01:00
parent be63041632
commit f48c55b02a
2 changed files with 2 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
main.json
View file

@ -14,7 +14,7 @@
"id":38, "id":38,
"image":"imgs\/heic1806b_2.jpg", "image":"imgs\/heic1806b_2.jpg",
"name":"background", "name":"background",
"offsetx":-293.333333333333, "offsetx":-293.333,
"offsety":-548, "offsety":-548,
"opacity":1, "opacity":1,
"type":"imagelayer", "type":"imagelayer",
@ -44,11 +44,7 @@
{ {
"name":"exitUrl", "name":"exitUrl",
"type":"string", "type":"string",
<<<<<<< HEAD
"value":"{lobby.maps.at.rc3.world\/maps\/erfas-south.json#start_ccc-darmstadt}" "value":"{lobby.maps.at.rc3.world\/maps\/erfas-south.json#start_ccc-darmstadt}"
=======
"value":"{<lobby>\/maps\/erfas-south.json#start_ccc-darmstadt}"
>>>>>>> cfdbe5bc8e1a751fd6ca767ce27ece6aec769db1
}], }],
"type":"tilelayer", "type":"tilelayer",
"visible":true, "visible":true,
@ -353,7 +349,7 @@
"nextobjectid":1, "nextobjectid":1,
"orientation":"orthogonal", "orientation":"orthogonal",
"renderorder":"right-down", "renderorder":"right-down",
"tiledversion":"1.4.3", "tiledversion":"1.4.2",
"tileheight":32, "tileheight":32,
"tilesets":[ "tilesets":[
{ {

4
w17.tmx
View file

@ -1338,11 +1338,7 @@
</layer> </layer>
<layer id="40" name="exit" width="51" height="40"> <layer id="40" name="exit" width="51" height="40">
<properties> <properties>
<<<<<<< HEAD
<property name="exitUrl" value="{lobby.maps.at.rc3.world/maps/erfas-south.json#start_ccc-darmstadt}"/> <property name="exitUrl" value="{lobby.maps.at.rc3.world/maps/erfas-south.json#start_ccc-darmstadt}"/>
=======
<property name="exitUrl" value="{&lt;lobby&gt;/maps/erfas-south.json#start_ccc-darmstadt}"/>
>>>>>>> cfdbe5bc8e1a751fd6ca767ce27ece6aec769db1
</properties> </properties>
<data encoding="csv"> <data encoding="csv">
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,