[pull] master from mapeditor:master

NEWS.md

@@ -27,6 +27,7 @@
 * Scripting: Added TileMap.chunkSize and TileMap.compressionLevel properties
 * AutoMapping: Don't match rules based on empty input indexes
 * AutoMapping: Optimized reloading of rule maps and load rule maps on-demand
+* tBIN plugin: Added support for the tIDE XML format (by Casey Warrington, #4308)
 * Windows: Fixed issue with opening Tile Animation Editor (#4223)
 * macOS: Fixed crash when JS code is JIT-compiled (#4218)
 * Workaround tileset view layout regression in Qt 6.9

docs/manual/export-tbin.rst

@@ -1,25 +1,32 @@
 .. raw:: html
 
-   <div class="new new-prev">Since Tiled 1.1</div>
+   <div class="new new-prev">tBIN since Tiled 1.1</div>
+   <div class="new">tIDE new in Tiled 1.12</div>
 
-tBIN
-----
+tBIN and tIDE
+-------------
 
-The tBIN map format is a binary format used by the `tIDE Tile Map Editor`_.
+The tBIN map format is a binary format used by the `tIDE Tile Map Editor`_,
+while the tIDE map format is an XML-based format used by it as well.
 tIDE was used by `Stardew Valley`_, a successful game that spawned many
 `community mods <https://www.nexusmods.com/stardewvalley/?>`__.
 
 Tiled ships with a plugin that enables direct editing of Stardew Valley
-maps (and any other maps using the tBIN format). This plugin needs to be
-enabled in *Edit > Preferences > Plugins*. It is not enabled by default
+maps (and any other maps using the tBIN or tIDE formats). This plugin needs to
+be enabled in *Edit > Preferences > Plugins*. It is not enabled by default
 because it won't store everything (most notably it doesn't support
 object layers in general, nor external tilesets), so you need to know
 what you are doing.
 
 .. note::
 
-   The tBIN format supports setting custom properties on the tiles of a
-   tile layer. Since Tiled does not support this directly, "TileData"
+   There is only one plugin, called `tbin`. Despite its name, it enables
+   support for both tBIN and tIDE maps.
+
+.. note::
+
+   The tBIN and tIDE formats support setting custom properties on the tiles of
+   a tile layer. Since Tiled does not support this directly, "TileData"
    objects are created that match the location of the tile, on which
    such properties are then stored.
 

org.mapeditor.Tiled.appdata.xml

@@ -379,10 +379,12 @@
   <!-- GPL 2 by TMW -->
   <screenshot type="default" width="800" height="600">
     <image>https://www.mapeditor.org/img/appdata/screenshot_objects.png</image>
+    <caption>Annotate your map with objects</caption>
   </screenshot>
   <!-- CC BY SA 3.0 By Clint Bellanger -->
   <screenshot width="800" height="600">
     <image>https://www.mapeditor.org/img/appdata/screenshot_terrain.png</image>
+    <caption>Automate placement of terrain transitions</caption>
   </screenshot>
  </screenshots>
  <kudos>

src/plugins/tbin/tbin.qbs

@@ -5,13 +5,17 @@ TiledPlugin {
         "tbin_global.h",
         "tbinplugin.cpp",
         "tbinplugin.h",
+        "tbinmapformat.cpp",
+        "tbinmapformat.h",
+        "tidemapformat.cpp",
+        "tidemapformat.h",
         "plugin.json",
         "tbin/Layer.hpp",
         "tbin/Map.cpp",
         "tbin/Map.hpp",
         "tbin/PropertyValue.hpp",
         "tbin/Tile.hpp",
         "tbin/TileSheet.hpp",
-        "tbin/FakeSfml.hpp",
+        "tbin/Vector2i.hpp",
     ]
 }

src/plugins/tbin/tbin/Layer.hpp

@@ -1,6 +1,6 @@
 /*
  * TBIN
- * Copyright 2017, Chase Warrington <spacechase0.and.cat@gmail.com>
+ * Copyright 2017, Casey Warrington <spacechase0.and.cat@gmail.com>
  *
  * MIT License
  *
@@ -30,7 +30,7 @@
 #include <string>
 #include <vector>
 
-#include "FakeSfml.hpp"
+#include "Vector2i.hpp"
 #include "PropertyValue.hpp"
 #include "Tile.hpp"
 
@@ -42,8 +42,8 @@ namespace tbin
             std::string id;
             bool visible;
             std::string desc;
-            sf::Vector2i layerSize;
-            sf::Vector2i tileSize;
+            tbin::Vector2i layerSize;
+            tbin::Vector2i tileSize;
             Properties props;
             std::vector< Tile > tiles;
     };