[pull] master from mapeditor:master

.gitignore

@@ -33,13 +33,18 @@ build/
 # Ronn html outputs
 man/*.1.html
 
-# Doxygen and Sphinx
+# Doxygen (writes its HTML output to ./html, see Doxyfile: HTML_OUTPUT)
 html/
-docs/_build/html/
-docs/_build/gettext/.doctrees
-docs/_build/doctrees/
+
+# Sphinx
 docs/.venv/
 *.mo
+docs/_build/html/
+docs/_build/doctrees/
+# Only the .pot files here are source; ignore the other output the gettext
+# builder writes alongside them (static asset dirs, etc.).
+docs/_build/gettext/*
+!docs/_build/gettext/*.pot
 
 # tsdoc generation results
 docs/scripting-doc/out/

NEWS.md

@@ -8,6 +8,7 @@
 * Scripting: Added 'tiled.cell' function, 'cell.flags' property and 'TileLayerEdit.setCell' function (#4538)
 * Scripting: Added MapObject.resolvedClassName() (by MatusGuy, #4529)
 * Fixed crash when the selection becomes empty while starting a move (#4536)
+* Linux: Added file associations for .tmj, .tsj, .tiled-project and .world files (by miffe, #4550)
 * snap: Updated to Qt 6
 * Raised the minimum Qt version to 6.2 (drops Qt 5 support)
 

docs/conf.py

@@ -87,6 +87,7 @@
 # This patterns also effect to html_static_path and html_extra_path
 exclude_patterns = [
     '.DS_Store',
+    '.venv',
     'README.md',
     'Thumbs.db',
     '_build',

docs/manual/worlds.rst

@@ -81,7 +81,7 @@ Adding Maps
     can be accessed by right-clicking in the map editor.
 
 Removing Maps
-    Hit the 'Remove the current map from the current world' button on the 
+    Hit the 'Remove the current map from the current world' button on the
     toolbar. Alternatively, right-click a map in the map editor and select the
     'Remove ... from World ...' action from the context menu.
 
@@ -92,11 +92,37 @@ Moving Maps
     Alternatively you can use the arrow keys to move the current selected map
     - holding Shift will perform bigger steps.
 
+.. raw:: html
+
+    <div class="new">New in Tiled 1.13</div>
+
+Resizing Maps
+    Hover over a map with the World Tool to show resize handles on its corners
+    and edges, then drag a handle to resize the map within the world. The map's
+    existing content keeps its position within the world, with the map's world
+    position adjusted when necessary to achieve this. You can abort a resize
+    by hitting 'Escape' or by right-clicking.
+
 Saving World files
     You can save manipulated world files by using the *World > Save World*
     menu. Worlds will also automatically be saved if you launch any external
     tool that has the 'Save Map Before Executing' option enabled.
 
+.. raw:: html
+
+    <div class="new">New in Tiled 1.13</div>
+
+The World Grid
+--------------
+
+A grid can be shown across the world to help align maps. Toggle it with
+*View > Show World Grid*, and toggle snapping with *View > Snapping > Snap Maps
+to World Grid*. While snapping is enabled, maps snap to the grid as they are
+moved or resized. Hold 'Ctrl' during the drag to temporarily turn off snapping,
+letting you position the map freely.
+
+The grid size is set per world in the *World > World Properties* dialog.
+
 Using Pattern Matching
 ----------------------
 

mime/org.mapeditor.Tiled.xml

@@ -12,4 +12,28 @@
     <glob pattern="*.tsx"/>
     <sub-class-of type="application/xml"/>
   </mime-type>
+  <mime-type type="application/x-tiled-tmj">
+    <comment>Tiled map</comment>
+    <generic-icon name="application-x-tiled"/>
+    <glob pattern="*.tmj"/>
+    <sub-class-of type="application/json"/>
+  </mime-type>
+  <mime-type type="application/x-tiled-tsj">
+    <comment>Tiled tileset</comment>
+    <generic-icon name="application-x-tiled"/>
+    <glob pattern="*.tsj"/>
+    <sub-class-of type="application/json"/>
+  </mime-type>
+  <mime-type type="application/x-tiled-project">
+    <comment>Tiled project</comment>
+    <generic-icon name="application-x-tiled"/>
+    <glob pattern="*.tiled-project"/>
+    <sub-class-of type="application/json"/>
+  </mime-type>
+  <mime-type type="application/x-tiled-world">
+    <comment>Tiled world</comment>
+    <generic-icon name="application-x-tiled"/>
+    <glob pattern="*.world"/>
+    <sub-class-of type="application/json"/>
+  </mime-type>
 </mime-info>

org.mapeditor.Tiled.desktop

@@ -10,4 +10,4 @@ Icon=tiled
 Categories=Graphics;2DGraphics;
 StartupNotify=true
 X-Desktop-File-Install-Version=0.1
-MimeType=application/x-tiled-tmx;application/x-tiled-tsx;
+MimeType=application/x-tiled-tmx;application/x-tiled-tsx;application/x-tiled-tmj;application/x-tiled-tsj;application/x-tiled-project;application/x-tiled-world;