Merge remote-tracking branch 'origin/main'

main
trivernis 2 years ago
commit 88d7fed3d9
Signed by: Trivernis
GPG Key ID: DFFFCC2C7A02DB45

@ -497,32 +497,32 @@
<property name="target" value="level_herbst.tmx"/>
</properties>
</object>
<object id="14" x="1556" y="2040" width="416" height="150">
<object id="14" x="1598.67" y="2053.33" width="320" height="116.667">
<properties>
<property name="target" value="level_herbst.tmx"/>
</properties>
</object>
<object id="15" x="1986" y="2006" width="284" height="228">
<object id="15" x="1998" y="2043.33" width="205.333" height="132">
<properties>
<property name="target" value="level_sommer.tmx"/>
</properties>
</object>
<object id="16" x="1856" y="2236" width="438" height="444">
<object id="16" x="1856" y="2236" width="382" height="378.667">
<properties>
<property name="target" value="level_winter.tmx"/>
</properties>
</object>
<object id="17" x="1596" y="2236" width="254" height="206">
<object id="17" x="1686.67" y="2312" width="72.6667" height="51.3333">
<properties>
<property name="target" value="level_fruehling.tmx"/>
</properties>
</object>
<object id="20" x="1550" y="2482" width="308" height="154">
<object id="20" x="1600.67" y="2498" width="185.333" height="122">
<properties>
<property name="target" value="level_sommer.tmx"/>
</properties>
</object>
<object id="21" x="692" y="248" width="784" height="460">
<object id="21" x="707.152" y="248" width="768.848" height="453.939">
<properties>
<property name="target" value="level_winter.tmx"/>
</properties>
@ -532,17 +532,17 @@
<property name="target" value="level_sommer.tmx"/>
</properties>
</object>
<object id="24" x="640" y="-12" width="1608" height="208">
<object id="24" x="644" y="2" width="1604" height="194">
<properties>
<property name="target" value="level_fruehling.tmx"/>
</properties>
</object>
<object id="25" x="652" y="764" width="876" height="1280">
<object id="25" x="640" y="764" width="888" height="1280">
<properties>
<property name="target" value="level_herbst.tmx"/>
</properties>
</object>
<object id="26" x="-4" y="1056" width="640" height="1508">
<object id="26" x="-4" y="1054" width="654" height="1510">
<properties>
<property name="target" value="level_winter.tmx"/>
</properties>
@ -617,7 +617,7 @@
<property name="target" value="level_sommer.tmx"/>
</properties>
</object>
<object id="42" x="2932" y="246" width="546" height="376">
<object id="42" x="2947.15" y="246" width="509.636" height="324.485">
<properties>
<property name="target" value="level_sommer.tmx"/>
</properties>
@ -664,11 +664,11 @@
<property name="ground" value="indoor"/>
</properties>
</object>
<object id="8" x="1536" y="1792">
<object id="8" x="1538.67" y="1790.67">
<properties>
<property name="ground" value="indoor"/>
</properties>
<polygon points="0,0 448,0 448,192 768,192 768,896 0,896"/>
<polygon points="0,0 445.667,0 445.667,183.143 764,183.143 764,854.667 0,854.667"/>
</object>
</objectgroup>
<layer id="9" name="Z_Spawn" width="64" height="64" opacity="0.57">

@ -499,7 +499,7 @@
</object>
<object id="8" x="704" y="252" width="772" height="444">
<properties>
<property name="target" value="level_.tmx"/>
<property name="target" value="level_fruehling.tmx"/>
</properties>
</object>
<object id="9" x="4" y="0" width="640" height="1084">
@ -527,27 +527,27 @@
<property name="target" value="level_fruehling.tmx"/>
</properties>
</object>
<object id="15" x="1857.33" y="2244" width="444" height="438.667">
<object id="15" x="1905.81" y="2274.3" width="295.515" height="329.576">
<properties>
<property name="target" value="level_sommer.tmx"/>
</properties>
</object>
<object id="16" x="1560" y="2046.67" width="412" height="130.667">
<object id="16" x="1617.58" y="2070.91" width="278.667" height="76.1215">
<properties>
<property name="target" value="level_sommer.tmx"/>
</properties>
</object>
<object id="17" x="1985.33" y="1990.67" width="257.333" height="248">
<object id="17" x="2018.66" y="2042.19" width="172.485" height="144.97">
<properties>
<property name="target" value="level_winter.tmx"/>
</properties>
</object>
<object id="18" x="1582.67" y="2234.67" width="261.333" height="209.333">
<object id="18" x="1582.67" y="2234.67" width="88.6057" height="60.8482">
<properties>
<property name="target" value="level_sommer.tmx"/>
</properties>
</object>
<object id="19" x="1546.67" y="2448" width="301.333" height="212">
<object id="19" x="1595.15" y="2502.55" width="183.151" height="75.6364">
<properties>
<property name="target" value="level_winter.tmx"/>
</properties>
@ -629,7 +629,7 @@
<property name="item" value="key"/>
</properties>
</object>
<object id="7" x="1600" y="2242" width="58" height="56">
<object id="7" x="1684.85" y="2305.64" width="58" height="56">
<properties>
<property name="item" value="screwdriver"/>
</properties>

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<map version="1.9" tiledversion="1.9.2" orientation="orthogonal" renderorder="right-down" width="64" height="64" tilewidth="64" tileheight="64" infinite="0" nextlayerid="12" nextobjectid="57">
<map version="1.9" tiledversion="1.9.2" orientation="orthogonal" renderorder="right-down" width="64" height="64" tilewidth="64" tileheight="64" infinite="0" nextlayerid="12" nextobjectid="58">
<properties>
<property name="description" value="12.06.2003"/>
<property name="id" type="int" value="1"/>
@ -482,7 +482,7 @@
</data>
</layer>
<objectgroup id="10" name="Teleporter">
<object id="2" x="1664" y="1856" width="192" height="128">
<object id="2" x="1667.03" y="1849.94" width="192" height="128">
<properties>
<property name="target" value="level_fruehling.tmx"/>
</properties>
@ -492,7 +492,7 @@
<property name="target" value="level_sommer.tmx"/>
</properties>
</object>
<object id="9" x="1861.33" y="2246.67" width="418.667" height="373.333">
<object id="9" x="1861.33" y="2246.67" width="376.243" height="361.212">
<properties>
<property name="target" value="level_herbst.tmx"/>
</properties>
@ -602,17 +602,17 @@
<property name="target" value="level_fruehling.tmx"/>
</properties>
</object>
<object id="52" x="657.576" y="187.879" width="872.727" height="575.758">
<object id="52" x="733.334" y="254.546" width="724.242" height="451.516">
<properties>
<property name="target" value="level_herbst.tmx"/>
</properties>
</object>
<object id="53" x="1545.33" y="2489.33" width="309.333" height="138.667">
<object id="53" x="1590.78" y="2495.39" width="212.363" height="81.0912">
<properties>
<property name="target" value="levl_winter.tmx"/>
</properties>
</object>
<object id="54" x="1545.33" y="1988" width="440" height="189.333">
<object id="54" x="1615.03" y="2063.76" width="288.485" height="86.3027">
<properties>
<property name="target" value="level_herbst.tmx"/>
</properties>
@ -622,6 +622,11 @@
<property name="target" value="level_fruehling.tmx"/>
</properties>
</object>
<object id="57" x="1669.7" y="2312.12" width="112.121" height="51.5152">
<properties>
<property name="target" value="level_sommer.tmx"/>
</properties>
</object>
</objectgroup>
<objectgroup id="11" name="Collectibles">
<properties>

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<map version="1.9" tiledversion="1.9.2" orientation="orthogonal" renderorder="right-down" width="64" height="64" tilewidth="64" tileheight="64" infinite="0" nextlayerid="12" nextobjectid="39">
<map version="1.9" tiledversion="1.9.2" orientation="orthogonal" renderorder="right-down" width="64" height="64" tilewidth="64" tileheight="64" infinite="0" nextlayerid="12" nextobjectid="42">
<properties>
<property name="description" value="10.12.2001"/>
<property name="id" type="int" value="1"/>
@ -577,7 +577,7 @@
<property name="target" value="level_fruehling.tmx"/>
</properties>
</object>
<object id="28" x="672.727" y="212.121" width="851.515" height="536.364">
<object id="28" x="814.727" y="272.121" width="597.515" height="400.364">
<properties>
<property name="target" value="level_winter.tmx"/>
</properties>
@ -587,27 +587,27 @@
<property name="target" value="level_sommer.tmx"/>
</properties>
</object>
<object id="30" x="1548.48" y="2036.36" width="415.152" height="142.424">
<object id="30" x="1634.48" y="2060.36" width="255.152" height="80.424">
<properties>
<property name="target" value="level_herbst.tmx"/>
</properties>
</object>
<object id="31" x="1978.79" y="1993.94" width="300" height="242.424">
<object id="31" x="2034.79" y="2055.94" width="150" height="110.424">
<properties>
<property name="target" value="level_sommer.tmx"/>
</properties>
</object>
<object id="32" x="1848.48" y="2239.39" width="430.303" height="409.091">
<object id="32" x="1880.48" y="2281.39" width="342.303" height="313.091">
<properties>
<property name="target" value="level_fruehling.tmx"/>
</properties>
</object>
<object id="33" x="1598.67" y="2233.33" width="240" height="216">
<object id="33" x="1678.67" y="2301.33" width="98" height="60">
<properties>
<property name="target" value="level_winter.tmx"/>
</properties>
</object>
<object id="34" x="1545.33" y="2457.33" width="298.667" height="197.333">
<object id="34" x="1597.33" y="2499.33" width="194.667" height="87.333">
<properties>
<property name="target" value="level_herbst.tmx"/>
</properties>

Loading…
Cancel
Save