Merge branch '0.9'

.gitattributes

@@ -12,3 +12,5 @@
 .gitattributes      export-ignore
 .mailmap            export-ignore
 .tx                 export-ignore
+.LICENSE-HEADER     export-ignore
+.travis.yml         export-ignore

NEWS

@@ -1,3 +1,25 @@
+0.9.1 (.. July 2013)
+* Added saving of map background to JSON format (by Petr Viktorin)
+* Added saving of terrain information to JSON format (by Petr Viktorin)
+* Object Selection tool now always start selecting objects when holding Shift
+* Increased maximum for tileset margin and spacing to 9999
+* Some updates to libtiled-java (by Oskar Wiksten)
+* Install the automappingconverter application (relevant on Linux)
+* Avoid using Windows 95 style (was used on some Linux desktop environments)
+* Removed layer name checks from the Flare export plugin (by Stefan Beller)
+* Double-clicking an object now opens the Object Properties dialog
+* Fixed Object Properties dialog not remembering its size
+* Fixed object drawing order for image saving and mini-map
+* Fixed some plurals in English translation
+* Fixed line widths when zooming in Qt 5
+* Fixed updating of image layer when its opacity or image is changed
+* Fixed display of grid in tileset view on certain zoom levels
+* Fixed save in wrong format after opening a map with plugin (by Mike Hendricks)
+* Fixed closing Tiled being very slow with many maps
+* Fixed saving of image layer properties in the Lua format
+* Fixed escaping of special characters in the Lua format
+* Fixed handling of relative paths for image layers in the JSON plugin
+
 0.9.0 (27 January 2013)
 * Added objects dock and per-object visibility toggle (by Tim Baker)
 * Added maps dock (by Tim Baker)

dist/win/README.txt

@@ -27,7 +27,7 @@ tiled into that variable. The commands to set those may look like the
 following:
 set QTDIR="C:\Qt\4.8.2"
 set MINGW="C:\MinGW"
-set VERSION="0.9.0"
+set VERSION="0.9.1"
 
 Optionally you can also set the program architecture which is then used to
 deduce the resulting installer filename. It can either be 32 or 64 and defaults

dist/win/build_installer.bat

@@ -20,7 +20,12 @@ if not defined MAKE (
 :: Check for Qt
 if not defined QTDIR (
     :get_qt_path
-    call:get_path Qt QTDIR
+    call :get_path Qt QTDIR
+)
+
+:: Check for the Tiled build directory
+if not defined TILED_BUILD_DIR (
+    call :get_path "the Tiled build" TILED_BUILD_DIR
 )
 
 call :check_path "!QTDIR!" qmake.exe Qt QMAKE

dist/win/tiled.nsi

@@ -16,7 +16,7 @@ SetCompressor /FINAL /SOLID lzma
 !define P "Tiled"                             ; Program name
 !define P_NORM "tiled"                        ; Program name (normalized)
 !define ROOT_DIR "..\.."                      ; Program root directory
-!define BUILD_DIR "${ROOT_DIR}"               ; Build dir
+!define BUILD_DIR $%TILED_BUILD_DIR%          ; Build dir
 !define ADD_REMOVE "Software\Microsoft\Windows\CurrentVersion\Uninstall\Tiled"
 !define PRODUCT_REG_KEY "Tiled Map Editor"
 
@@ -170,16 +170,17 @@ File /oname=COPYING.txt ${ROOT_DIR}\COPYING
 File /oname=AUTHORS.txt ${ROOT_DIR}\AUTHORS
 File /oname=README.txt ${ROOT_DIR}\README.md
 File /oname=NEWS.txt ${ROOT_DIR}\NEWS
+File /oname=LICENSE.APACHE.txt ${ROOT_DIR}\LICENSE.APACHE
 File /oname=LICENSE.BSD.txt ${ROOT_DIR}\LICENSE.BSD
 File /oname=LICENSE.GPL.txt ${ROOT_DIR}\LICENSE.GPL
 File ${BUILD_DIR}\${P_NORM}.dll
 File ${BUILD_DIR}\${P_NORM}.exe
 File ${BUILD_DIR}\tmxviewer.exe
 File ${BUILD_DIR}\tmxrasterizer.exe
 File ${BUILD_DIR}\automappingconverter.exe
-File ${MINGW_DIR}\bin\mingwm10.dll
-File ${MINGW_DIR}\bin\libgcc_s_dw2-1.dll
-File ${MINGW_DIR}\bin\libstdc++-6.dll
+;File ${MINGW_DIR}\bin\mingwm10.dll
+;File ${MINGW_DIR}\bin\libgcc_s_dw2-1.dll
+;File ${MINGW_DIR}\bin\libstdc++-6.dll
 File ${QT_DIR}\bin\QtCore4.dll
 File ${QT_DIR}\bin\QtGui4.dll
 File ${QT_DIR}\bin\QtOpenGL4.dll
@@ -201,7 +202,7 @@ SetOutPath $INSTDIR\plugins\tiled
 File /r ${BUILD_DIR}\plugins\tiled\*.dll
 
 SetOutPath $INSTDIR\translations
-File  ${ROOT_DIR}\translations\*.qm
+File  ${BUILD_DIR}\translations\*.qm
 File  ${QT_DIR}\translations\qt_cs.qm
 File  ${QT_DIR}\translations\qt_de.qm
 File  ${QT_DIR}\translations\qt_es.qm
@@ -246,9 +247,9 @@ Delete $INSTDIR\COPYING.txt
 Delete $INSTDIR\AUTHORS.txt
 Delete $INSTDIR\README.txt
 Delete $INSTDIR\NEWS.txt
+Delete $INSTDIR\LICENSE.APACHE.txt
 Delete $INSTDIR\LICENSE.BSD.txt
 Delete $INSTDIR\LICENSE.GPL.txt
-Delete $INSTDIR\LICENSE.LGPL.txt
 Delete $INSTDIR\tiled.dll
 Delete $INSTDIR\tiled.exe
 Delete $INSTDIR\tmxviewer.exe

src/tiled/Info.plist

@@ -7,7 +7,7 @@
 	<key>CFBundleExecutable</key>
 	<string>Tiled</string>
 	<key>CFBundleGetInfoString</key>
-	<string>Tiled 0.9.0, Copyright 2008-2012 Thorbjørn Lindeijer, GNU General Public License</string>
+	<string>Tiled 0.9.1, Copyright 2008-2013 Thorbjørn Lindeijer, GNU General Public License</string>
 	<key>CFBundleIconFile</key>
 	<string>tiled-icon-mac</string>
 	<key>CFBundleIdentifier</key>
@@ -17,13 +17,13 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>0.9.0</string>
+	<string>0.9.1</string>
 	<key>CFBundleVersion</key>
-	<string>0.9.0</string>
+	<string>0.9.1</string>
 	<key>CSResourcesFileMapped</key>
 	<true/>
 	<key>NSHumanReadableCopyright</key>
-	<string>Copyright 2008-2012 Thorbjørn Lindeijer</string>
+	<string>Copyright 2008-2013 Thorbjørn Lindeijer</string>
 	<key>NSHighResolutionCapable</key>
 	<true/>
 	<key>CFBundleDocumentTypes</key>

src/tiled/main.cpp

@@ -135,7 +135,7 @@ int main(int argc, char *argv[])
 #ifdef BUILD_INFO_VERSION
     a.setApplicationVersion(QLatin1String(AS_STRING(BUILD_INFO_VERSION)));
 #else
-    a.setApplicationVersion(QLatin1String("0.9.0"));
+    a.setApplicationVersion(QLatin1String("0.9.1"));
 #endif
 
 #ifdef Q_OS_MAC