Merge branch 'release/1.20'

.gitignore

@@ -1,11 +1,11 @@
-Resources/shaders/
-Resources/User/
-docs/jazzy_output/
+Assets/User/*
+Demo/shaders/*
+Develop/*
+docs/jazzy_output/*
+.swiftlint.yml
+IDETemplateMacros.plist
+SKTiled.xcodeproj/xcshareddata/xcschemes/Demo*
 *.psd
 *.html
 *.js
 *.css
-SKTiled.playground/
-SKTiled.xcworkspace/
-Notes.md
-.swiftlint.yml

.swift-version

@@ -1 +1 @@
-3.3
+4.2

.travis.yml

@@ -1,7 +1,10 @@
 language: swift
-osx_image: xcode9.0
+osx_image: xcode10
 xcode_project: SKTiled.xcodeproj
-xcode_scheme: SKTiled-iOS
+xcode_scheme: 
+  - SKTiled-iOS
+  - SKTiled-macOS
+  - SKTiled-tvOS
 branches:
   except:
-    - develop
+    - develop

Resources/CREDITS → Assets/CREDITS

@@ -18,3 +18,11 @@ http://opengameart.org/content/sticker-knight-platformer.
 
 Pac-Man:
 Pac-Man is a trademark of Bandai Namco, Inc.
+
+LoFi Roguelike:
+@Oryx
+http://realmofthemadgod.wikia.com/wiki/Pixel_Art
+
+Tiny 16:
+@Sharm
+https://opengameart.org/content/tiny-16-basic

Assets/dungeon-16x16.tmx

@@ -0,0 +1,234 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<map version="1.2" tiledversion="1.2.0" orientation="orthogonal" renderorder="right-down" width="22" height="21" tilewidth="16" tileheight="16" infinite="0" backgroundcolor="#211e26" nextlayerid="20" nextobjectid="149">
+ <properties>
+  <property name="displayName" value="dungeon-16x16"/>
+  <property name="frameColor" type="color" value="#ff63a4b2"/>
+  <property name="gridColor" type="color" value="#ff80d1e2"/>
+  <property name="stackColor" type="color" value="#663a3a3a"/>
+  <property name="uiColor" type="color" value="#4C332C"/>
+ </properties>
+ <tileset firstgid="1" source="dungeon-16x16.tsx"/>
+ <tileset firstgid="553" source="dungeon-32x32.tsx"/>
+ <tileset firstgid="558" source="dungeon-16x32.tsx"/>
+ <group id="1" name="Lower">
+  <layer id="2" name="Level1" width="22" height="21">
+   <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,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,346,5,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,24,58,2,3,348,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,7,54,25,25,25,25,26,4,27,0,0,0,0,185,187,0,
+0,0,0,0,0,0,32,77,93,95,96,48,48,25,50,0,0,1,2,59,51,0,
+0,0,1,3,5,0,32,0,76,77,119,232,50,50,50,0,0,208,209,1610613228,97,0,
+0,143,491,36,51,0,32,0,0,0,0,34,51,0,259,0,0,118,119,32,120,0,
+0,166,117,93,97,0,32,0,0,0,0,34,28,0,32,0,0,0,0,32,0,0,
+0,166,0,116,120,0,32,0,0,0,0,34,3221225964,54,55,0,143,54,54,55,0,0,
+0,93,3,3,5,0,1073741871,3,2,131,26,57,28,77,78,0,168,118,0,119,0,0,
+0,116,93,36,51,0,24,25,44,133,25,27,3221225964,54,54,54,191,0,101,0,0,0,
+0,0,116,93,97,0,295,109,67,69,17,18,28,77,77,77,77,0,30,0,0,0,
+0,0,0,122,122,0,24,49,62,22,40,204,28,0,139,352,352,352,399,0,0,0,
+0,0,0,0,0,0,47,49,49,62,1073741893,64,28,0,162,117,118,119,120,0,0,0,
+0,0,0,0,0,0,93,94,95,96,249,96,97,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,116,117,118,119,272,119,120,0,0,0,0,0,0,0,0,0
+</data>
+  </layer>
+  <layer id="3" name="Objects" width="22" height="21">
+   <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,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,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,82,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,105,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,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,0,0,0,0
+</data>
+  </layer>
+  <layer id="4" name="Bridges" width="22" height="21">
+   <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,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,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,148,149,150,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,172,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,195,0,0,0,0,0,0,0,0,0,0,0,0,0,0,172,0,0,0,
+0,0,0,218,0,0,0,0,0,0,0,0,0,0,0,0,0,0,195,0,0,0,
+0,0,0,0,148,149,150,0,0,0,0,0,0,0,0,0,0,0,218,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,148,149,150,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
+</data>
+  </layer>
+  <group id="5" name="Lower Objects">
+   <objectgroup id="6" name="Lower Objects">
+    <object id="79" name="crate9" gid="151" x="310" y="146" width="16" height="16"/>
+    <object id="80" name="crate10" gid="151" x="317" y="146" width="16" height="16"/>
+    <object id="81" name="chest1" gid="103" x="136" y="118" width="16" height="16"/>
+    <object id="82" name="barrel3" gid="152" x="32" y="174" width="16" height="16"/>
+    <object id="85" name="barrel1" gid="152" x="44" y="174" width="16" height="16"/>
+    <object id="88" name="crate3" gid="151" x="49" y="267" width="16" height="16"/>
+    <object id="87" name="crate1" gid="151" x="58" y="266" width="16" height="16"/>
+    <object id="89" name="barrel4" gid="152" x="275" y="172" width="16" height="16"/>
+    <object id="94" name="barrel5" gid="152" x="100" y="316" width="16" height="16"/>
+    <object id="95" name="barrel6" gid="152" x="176" y="256" width="16" height="16"/>
+    <object id="96" name="barrel6" gid="152" x="144" y="144" width="16" height="16"/>
+    <object id="101" name="crate4" gid="151" x="173" y="175" width="16" height="16"/>
+    <object id="102" name="crate5" gid="151" x="180" y="175" width="16" height="16"/>
+    <object id="103" name="crate6" gid="2147483799" x="170" y="175" width="16" height="16"/>
+    <object id="104" name="crate7" gid="151" x="176" y="183" width="16" height="16"/>
+    <object id="105" name="crate8" gid="151" x="176" y="183" width="16" height="16"/>
+    <object id="106" name="barrel5" gid="152" x="111" y="314" width="16" height="16"/>
+    <object id="107" name="barrel5" gid="152" x="106" y="304" width="16" height="16"/>
+   </objectgroup>
+   <objectgroup id="7" name="Top Objects">
+    <object id="125" name="barrel2" gid="152" x="38" y="166" width="16" height="16"/>
+    <object id="128" name="crate-error" gid="151" x="313" y="141" width="16" height="16"/>
+    <object id="130" name="crate2" gid="151" x="52" y="260" width="16" height="16"/>
+   </objectgroup>
+   <objectgroup id="8" name="Characters-Lower">
+    <object id="129" name="knight1" gid="556" x="295" y="172" width="32" height="32"/>
+    <object id="131" name="wizard1" gid="554" x="46" y="204" width="32" height="32"/>
+   </objectgroup>
+  </group>
+ </group>
+ <group id="9" name="Upper">
+  <layer id="10" name="Level2" width="22" height="21">
+   <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,32,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,32,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,32,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,32,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,441,0,0,351,469,145,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,212,0,1,3758096851,462,168,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,70,51,485,37,0,0,0,0,
+0,0,0,0,0,0,0,0,0,185,467,190,2147484115,186,59,28,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,490,468,0,490,370,27,97,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,393,32,0,212,393,60,421,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,416,32,0,0,444,0,444,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,277,190,191,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,300,202,214,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,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
+</data>
+  </layer>
+  <layer id="11" name="Level3" width="22" height="21">
+   <data encoding="csv">
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,208,209,210,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,461,285,462,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,484,0,485,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,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,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,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
+</data>
+  </layer>
+  <group id="12" name="Upper Objects">
+   <objectgroup id="13" name="Upper Objects">
+    <object id="141" name="brazier1" type="light" gid="558" x="208" y="172" width="16" height="32"/>
+    <object id="142" name="brazier2" type="light" gid="558" x="235" y="172" width="16" height="32"/>
+   </objectgroup>
+   <objectgroup id="14" name="Characters-Upper">
+    <object id="119" name="dwarf1" gid="557" x="144" y="170" width="32" height="32"/>
+   </objectgroup>
+  </group>
+ </group>
+ <group id="15" name="Graphs">
+  <layer id="16" name="Graph-Lower" width="22" height="21" visible="0">
+   <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,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,341,341,341,341,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,341,341,341,0,341,341,341,341,0,0,0,341,0,0,0,0,
+0,0,0,0,0,0,341,0,341,341,341,341,341,341,0,0,0,341,341,341,341,0,
+0,0,0,0,341,0,341,0,0,0,0,0,0,0,0,0,0,0,341,341,341,0,
+0,341,341,341,341,341,341,0,0,0,0,0,0,0,341,0,0,0,0,341,0,0,
+0,341,0,341,341,0,341,0,0,0,0,341,341,0,341,0,0,0,0,341,0,0,
+0,341,0,341,0,0,341,0,0,0,0,341,341,341,341,0,342,341,341,341,0,0,
+0,341,341,341,341,0,341,341,0,0,0,341,341,0,0,0,341,0,341,0,0,0,
+0,0,341,341,341,341,341,341,341,0,0,0,341,341,341,341,341,0,341,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,341,0,0,0,0,0,341,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,341,341,341,341,341,341,341,364,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,341,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,341,341,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
+</data>
+  </layer>
+  <layer id="17" name="Graph-Upper" width="22" height="21" visible="0">
+   <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,342,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,341,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,341,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,341,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,341,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,341,341,341,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,341,341,0,341,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,341,341,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,341,341,341,341,341,341,341,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,341,341,0,341,0,341,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,341,0,0,0,341,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,341,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,341,341,341,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,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
+</data>
+  </layer>
+ </group>
+</map>