Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Prepare for Tiled 1.11 release #3918

Merged
merged 1 commit into from
Jun 21, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion NEWS.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
### Unreleased
### Tiled 1.11.0 (Unreleased)

* Added --project command-line parameter for use when exporting (#3797)
* Added group layer names in "Move Object to Layer" menu (#3454)
Expand Down
4 changes: 2 additions & 2 deletions docs/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -66,9 +66,9 @@
# built documents.
#
# The short X.Y version.
version = '1.10'
version = '1.11'
# The full version, including alpha/beta/rc tags.
release = '1.10.2'
release = '1.11.0'

# The language for content autogenerated by Sphinx. Refer to documentation
# for a list of supported languages.
Expand Down
6 changes: 3 additions & 3 deletions docs/manual/automapping.md
Original file line number Diff line number Diff line change
Expand Up @@ -113,8 +113,8 @@ Everything after the first underscore is the **name**, which determines which la

The **index** is optional, and is not related to the input indices. Instead, output indices are used to randomize the output: every time the rule finds a match, a random output index is chosen and only the output layers with that index will have their contents placed into the working map.

{bdg-primary}`New in Tiled 1.10.3`
For convenience, Tiled 1.10.3 introduced two changes to the behavior related to indexes. If an output index is completely empty for a given rule, it will never be chosen for that rule. This is useful when some rules have more random options than others. Also, when no index is specified, that part of the rule's output will always apply when the rule matches. This can be used to combine an unconditional part of a rule's output with a random part.
{bdg-primary}`New in Tiled 1.11`
For convenience, Tiled 1.11 introduced two changes to the behavior related to indexes. If an output index is completely empty for a given rule, it will never be chosen for that rule. This is useful when some rules have more random options than others. Also, when no index is specified, that part of the rule's output will always apply when the rule matches. This can be used to combine an unconditional part of a rule's output with a random part.

#### Random Output Example

Expand Down Expand Up @@ -217,7 +217,7 @@ AutoEmpty (alias: StrictEmpty)

Normally, empty tiles are simply ignored. When **AutoEmpty** is `true`, empty tiles within the input region match empty tiles in the target layer. This can only happen when you have multiple input/inputnot layers and some of the tiles that are part of the same rule are empty while others are not. Usually, using the [Empty]{.tile .empty} [special tile](#specialtiles) is the best way to specify an empty tile, but this property is useful when you have multiple input layers, some of which need to match many empty tiles. Note that the input region is defined by *all* input layers, regardless of index.

IgnoreHorizontalFlip {bdg-primary}`New in Tiled 1.10.3`
IgnoreHorizontalFlip {bdg-primary}`New in Tiled 1.11`
: This boolean layer property can be added to `input` and `inputnot` layers to also match horizontally flipped versions of the input tile.

IgnoreVerticalFlip
Expand Down
4 changes: 2 additions & 2 deletions docs/manual/export-tscn.rst
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ Tilesets support the following property:
**Deprecated:** The ``exportAlternates`` property is necessary when using
flipped or rotated tiles in Godot 4.0 and 4.1. This will create 7 alternate
tiles for each tile, allowing all flipped and rotation combinations. This
has been deprecated in Tiled 1.10.3 in favour of Godot 4.2's native rotation
has been deprecated in Tiled 1.11 in favour of Godot 4.2's native rotation
and flipping support.

Tile Properties
Expand Down Expand Up @@ -93,7 +93,7 @@ overwritten every time the map is exported.

.. raw:: html

<div class="new">Since Tiled 1.10.3</div>
<div class="new">Since Tiled 1.11</div>

Object Properties
~~~~~~~~~~~~~~~~~
Expand Down
34 changes: 17 additions & 17 deletions docs/scripting-doc/index.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -290,7 +290,7 @@ interface FilePath {
* The local file path, or empty if the current URL value doesn't refer
* to a local file.
*
* @since 1.10.3
* @since 1.11
*/
localFile: string;
}
Expand Down Expand Up @@ -1154,7 +1154,7 @@ declare class Project extends TiledObject {
/**
* Details of a map that is added to a {@link World}.
*
* @since 1.10.3
* @since 1.11
*/
declare class WorldMapEntry {
/**
Expand All @@ -1174,7 +1174,7 @@ declare class WorldMapEntry {
* Matching](https://doc.mapeditor.org/en/stable/manual/worlds/#using-pattern-matching)
* section in the manual for more information.
*
* @since 1.10.3
* @since 1.11
*/
declare class WorldPattern {
/**
Expand Down Expand Up @@ -1220,7 +1220,7 @@ declare class WorldPattern {
* Worlds](https://doc.mapeditor.org/en/stable/manual/worlds/) page in the
* manual for more information.
*
* @since 1.10.3
* @since 1.11
*/
declare class World extends Asset {
/**
Expand Down Expand Up @@ -1500,7 +1500,7 @@ declare class MapObject extends TiledObject {
* The top-level assets supported by Tiled. Not all of these assets have
* associated editors.
*
* @since 1.10.3
* @since 1.11
*/
declare enum AssetType {
TileMap = 1,
Expand Down Expand Up @@ -1556,7 +1556,7 @@ declare class Asset extends TiledObject {
/**
* The type of this asset.
*
* @since 1.10.3
* @since 1.11
*/
readonly assetType: AssetType;

Expand Down Expand Up @@ -1607,7 +1607,7 @@ declare class Asset extends TiledObject {
* tiled.mapFormat} or {@link tiled.tilesetFormat}. This is currently not
* supported for worlds.
*
* @since 1.10.3
* @since 1.11
*/
save(): boolean;
}
Expand Down Expand Up @@ -2243,7 +2243,7 @@ declare class ImageLayer extends Layer {
/**
* Reference to the image rendered by this layer.
*
* @since 1.10.3
* @since 1.11
*/
imageFileName: string;

Expand Down Expand Up @@ -2469,7 +2469,7 @@ declare class Tile extends TiledObject {
* You can assign an {@link Image} to this property to change the tile's
* image. See {@link setImage} for more information.
*
* @since 1.10.3
* @since 1.11
*/
image: Image;

Expand Down Expand Up @@ -2525,7 +2525,7 @@ declare class Tile extends TiledObject {
* when saving the tileset the image data will be embedded for formats that
* support this (currently only TMX/TSX).
*
* @note Before Tiled 1.10.3, this function did not change the image file
* @note Before Tiled 1.11, this function did not change the image file
* name. For compatibility, set {@link imageFileName} before calling this
* function, if necessary.
*
Expand Down Expand Up @@ -3510,7 +3510,7 @@ declare class Tileset extends Asset {
*
* @note Map files are supported tileset image source as well.
*
* @since 1.10.3
* @since 1.11
*/
imageFileName : string

Expand Down Expand Up @@ -4637,31 +4637,31 @@ declare namespace tiled {

/**
* A list of all currently loaded {@link World|worlds}.
* @since 1.10.3
* @since 1.11
*/
export const worlds : World[];

/**
* Load a world contained in a .world file in the path fileName.
* @since 1.10.3
* @since 1.11
*/
export function loadWorld(fileName : string) : void;

/**
* Unload a world contained in a .world file in the path fileName.
* @since 1.10.3
* @since 1.11
*/
export function unloadWorld(fileName : string) : void;

/**
* Unload all currently loaded worlds.
* @since 1.10.3
* @since 1.11
*/
export function unloadAllWorlds() : void;

/**
* Signal emitted when any world is loaded, unloaded, reloaded or changed.
* @since 1.10.3
* @since 1.11
*/
export const worldsChanged : Signal<void>;
}
Expand Down Expand Up @@ -4794,7 +4794,7 @@ declare class FileEdit extends Qt.QWidget {
/**
* The current file path.
*
* @since 1.10.3
* @since 1.11
*/
fileName: string;

Expand Down
2 changes: 1 addition & 1 deletion tiled.qbs
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ Project {
qbsSearchPaths: "qbs"
minimumQbsVersion: "1.13"

property string version: Environment.getEnv("TILED_VERSION") || "1.10.2";
property string version: Environment.getEnv("TILED_VERSION") || "1.11.0";
property bool snapshot: Environment.getEnv("TILED_SNAPSHOT") == "true"
property bool release: Environment.getEnv("TILED_RELEASE") == "true"
property string libDir: "lib"
Expand Down
Loading