Merge pull request mapeditor#3 from jessetrem/pablo/update-to-latest

Pablo/update to latest

.github/workflows/packages.yml

@@ -15,7 +15,7 @@ on:
     - '.travis.yml'
 
 env:
-  QBS_VERSION: 1.23.1
+  QBS_VERSION: 2.0.2
   TILED_RELEASE: ${{ startsWith(github.ref, 'refs/tags/v') }}
   TILED_SNAPSHOT: ${{ !startsWith(github.ref, 'refs/tags/v') }}
 
@@ -43,7 +43,7 @@ jobs:
     strategy:
       matrix:
         include:
-        - qt_version: 6.5.1
+        - qt_version: 6.5.2
           qt_version_major: 6
           qt_toolchain: win64_mingw
           arch: 64
@@ -145,4 +145,3 @@ jobs:
         asset_path: Tiled-win32.msi/Tiled-${{ needs.version.outputs.version }}-win32.msi
         asset_name: Tiled-${{ needs.version.outputs.version }}_Windows-7-8_x86.msi
         asset_content_type: application/x-msi
-

NEWS.md

@@ -1,18 +1,30 @@
 ### Unreleased
 
+* JSON format: Fixed tile order when loading a tileset using the old format
+* tmxrasterizer: Added --hide-object and --show-object arguments (by Lars Luz, #3819)
+
+### Tiled 1.10.2 (4 August 2023)
+
 * Added support for setting custom properties on the project (#2903)
+* Added feedback when Terrain Brush and Terrain Fill Mode can't find a tile
 * Removed Space and Ctrl+Space shortcuts from Layers view to avoid conflict with panning (#3672)
+* Display the image base name for unnamed tile objects referring to single images
 * Scripting: Added API for editing tile layers using terrain sets (with a-morphous, #3758)
+* Scripting: Added file dialog API (with dogboydog, #3782)
 * Scripting: Support erasing tiles in Tool.preview and TileMap.merge
+* Scripting: Added Geometry interface with line and ellipse helpers
 * Scripting: Added WangSet.effectiveTypeForColor
+* Fixed crash when changing file property of custom class (#3783)
+* Fixed loading of invalid color properties (#3793)
+* Fixed handling of enum values with 31 flags and fixed the applied limit (#3658)
 * Fixed object preview position with parallax factor on group layer (#3669)
 * Fixed hover highlight rendering with active parallax factor (#3669)
 * Fixed updating of object selection outlines when changing parallax factor (#3669)
 * Fixed "Offset Map" action to offset all objects when choosing "Whole Map" as bounds
 * Fixed several issues with drawing ellipses (#3776)
 * Fixed Terrain Fill Mode for sets containing transitions to empty (#3774)
 * Godot 4 plugin: Export custom tile properties as Custom Data Layers (with Kevin Harrison, #3653)
-* AppImage: Updated to Sentry 0.6.4
+* AppImage: Updated to Sentry 0.6.5
 * Qt 6: Increased the image allocation limit from 1 GB to 4 GB (#3616)
 * macOS: The macOS 10.14+ build is now a Universal macOS Binary (#3707)
 

appveyor.yml

@@ -35,7 +35,7 @@ environment:
 configuration: Release
 
 install:
-  - choco install -y qbs --version 1.21.0
+  - choco install -y qbs --version 2.0.2
   - nuget install secure-file -ExcludeVersion
   - set PATH=%PATH%;%QTDIR%\bin;%MINGW%\bin
 

dist/win/installer.qbs

@@ -54,7 +54,8 @@ WindowsInstallerPackage {
 
         defs.push("WindowsVistaStyle")
 
-        if (File.exists(Environment.getEnv("PYTHONHOME")))
+        var pythonHome = Environment.getEnv("PYTHONHOME");
+        if (pythonHome && File.exists(pythonHome))
             defs.push("Python");
 
         var rpMapEnabled = !qbs.toolchain.contains("msvc")

docs/conf.py

@@ -67,7 +67,7 @@
 # The short X.Y version.
 version = '1.10'
 # The full version, including alpha/beta/rc tags.
-release = '1.10.1'
+release = '1.10.2'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.

docs/manual/custom-properties.rst

@@ -89,7 +89,7 @@ readable whereas the latter could easier and more efficient to load.
 Finally, an enum can also allow multiple values to be chosen. In this case
 each option is displayed with a checkbox. When saving as string, a
 comma-separated list is used and when saving as number the selected indexes are
-encoded as bitflags. In both cases, the maximum number of flags supported is 30,
+encoded as bitflags. In both cases, the maximum number of flags supported is 31,
 since internally a 32-bit signed integer is used to store the value.
 
 .. _custom-classes:

docs/reference/global-tile-ids.rst

@@ -133,7 +133,7 @@ clear, it deals with flags and deduces the appropriate tileset:
          Tileset *tileset = tilesets[i];
 
          if (tileset->first_gid() <= global_tile_id) {
-           tiles[y][x] = tileset->tileAt(global_tile_id - tileset->first_gid());
+           tiles[y][x] = tileset->get_tile(global_tile_id - tileset->first_gid());
            break;
          }
        }