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

Merge branch 'master' of git.darmstadt.ccc.de:cda/rcda into master

Browse source
This commit is contained in:
litschi 2020-12-27 18:43:36 +01:00
commit be63041632
2 changed files with 13 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
main.json
View file

@ -14,8 +14,8 @@
"id":38, "id":38,
"image":"imgs\/heic1806b_2.jpg", "image":"imgs\/heic1806b_2.jpg",
"name":"background", "name":"background",
"offsetx":-448, "offsetx":-293.333333333333,
"offsety":-408, "offsety":-548,
"opacity":1, "opacity":1,
"type":"imagelayer", "type":"imagelayer",
"visible":true, "visible":true,
@ -44,7 +44,11 @@
{ {
"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,
@ -349,7 +353,7 @@
"nextobjectid":1, "nextobjectid":1,
"orientation":"orthogonal", "orientation":"orthogonal",
"renderorder":"right-down", "renderorder":"right-down",
"tiledversion":"1.4.2", "tiledversion":"1.4.3",
"tileheight":32, "tileheight":32,
"tilesets":[ "tilesets":[
{ {

8
w17.tmx
View file

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<map version="1.4" tiledversion="1.4.2" orientation="orthogonal" renderorder="right-down" width="51" height="40" tilewidth="32" tileheight="32" infinite="0" nextlayerid="41" nextobjectid="1"> <map version="1.4" tiledversion="1.4.3" orientation="orthogonal" renderorder="right-down" width="51" height="40" tilewidth="32" tileheight="32" infinite="0" nextlayerid="41" nextobjectid="1">
<editorsettings> <editorsettings>
<export target="w17.json" format="json"/> <export target="w17.json" format="json"/>
</editorsettings> </editorsettings>
@ -1289,7 +1289,7 @@
<tileset firstgid="10904" name="rc3-mullana-functionary" tilewidth="32" tileheight="32" tilecount="256" columns="16"> <tileset firstgid="10904" name="rc3-mullana-functionary" tilewidth="32" tileheight="32" tilecount="256" columns="16">
<image source="imgs/tilesheets/rc3-mullana-functionary.png" width="512" height="512"/> <image source="imgs/tilesheets/rc3-mullana-functionary.png" width="512" height="512"/>
</tileset> </tileset>
<imagelayer id="38" name="background" offsetx="-448" offsety="-408"> <imagelayer id="38" name="background" offsetx="-293.333" offsety="-548">
<image source="imgs/heic1806b_2.jpg" width="2849" height="2112"/> <image source="imgs/heic1806b_2.jpg" width="2849" height="2112"/>
</imagelayer> </imagelayer>
<layer id="6" name="start" width="51" height="40"> <layer id="6" name="start" width="51" height="40">
@ -1338,7 +1338,11 @@
</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,