Created by mapeditor.org and last modified
Get this branch:
bzr branch lp:tiled

Branch merges

Related bugs

Related blueprints

Branch information


Import details

Import Status: Failed

This branch is an import of the HEAD branch of the Git repository at https://github.com/bjorn/tiled.git.

The import has been suspended because it failed 5 or more times in succession.

Last successful import was .

Import started on juju-1e3bde-prod-lp-code-import-12 and finished taking 10 seconds — see the log
Import started on juju-1e3bde-prod-lp-code-import-13 and finished taking 5 seconds — see the log
Import started on alnitak and finished taking 15 seconds — see the log
Import started on alnitak and finished taking 15 seconds — see the log

Recent revisions

2857. By Thorbjørn Lindeijer

Merge branch '1.2'

2856. By Thorbjørn Lindeijer

Travis CI: Update macOS builds to Qt 5.9.7

Previously the builds were done against Qt 5.6.3, but the support for
scripting relies on more recent features.

Barring possible regressions we should also benefit from a lot of other
fixes and improvements on the Qt size.

As a result of this, Tiled will now require at least macOS 10.10,
whereas previous versions have required macOS 10.7.

2855. By Thorbjørn Lindeijer

Console: Fixed truncated text in case of '<' characters

Needed to HTML-escape the string.

2854. By Thorbjørn Lindeijer

Scripting: Added mechanism for modifying tile layers

To avoid excessive creation of undo commands and emitting of signals,
edits to tile layers have to go through a dedicated "edit object", and
need to be explicitly applied when done.

This change enables the following example function:

    function fillFirstLayerWithFirstTile() {
        var tileLayer = tiled.activeAsset.layerAt(0)
        var tile = tileLayer.tileAt(0, 0)
        var e = tileLayer.edit()

        for (var y = 0; y < tileLayer.height; y++)
            for (var x = 0; x < tileLayer.width; x++)
                e.setTile(x, y, tile)


2853. By Thorbjørn Lindeijer

Fixed compile of autotest when using clang

Clang is being a little bit more strict here than GCC it seems:

test_mapreader.cpp:27:5: error: no viable conversion from 'std::unique_ptr<Tiled::Map, std::default_delete<Tiled::Map> >' to 'bool'
/opt/qt56/include/QtTest/qtestcase.h:60:25: note: expanded from macro 'QVERIFY'
    if (!QTest::qVerify((statement), #statement, "", __FILE__, __LINE__))\

2852. By Thorbjørn Lindeijer

Qbs: Build the autotests

Also fixed a compilation issue, which I would have caught had the
autotests been included in the project already.

2851. By Thorbjørn Lindeijer

Scripting: Added preliminary access to tiles in a tileset

2850. By Thorbjørn Lindeijer

Python plugin: Fixed compile

The plugin was disabled in my development environment...

2849. By Thorbjørn Lindeijer

Used std::unique_ptr in a few more places

Preferred to returning raw pointers that expect a new owner, or
function/constructor arguments where it needs to be documented that they
will take ownership.

2848. By Thorbjørn Lindeijer

Scripting: Allow creating new stuff from scripts

This change enables the following constructors from script:

    new MapObject([name])
    new ObjectGroup([name])
    new TileLayer([name]) # Not very useful yet
    new TileMap() # Not useful yet
    new Tileset([name]) # Not useful yet

Newly created map objects can be added to new or existing object groups,
and newly created object groups can be added to an existing map.

Tilesets can't yet be added to the map, and it's also still not possible
to actually make a non-empty tileset.

Tile layers aren't very useful yet because you still can't modify them.

The map class is called 'TileMap' because in JavaScript, the global name
'Map' is taken.

Branch metadata

Branch format:
Branch format 7
Repository format:
Bazaar repository format 2a (needs bzr 1.16 or later)
This branch contains Public information 
Everyone can see this information.