Permalink
Commits on Jun 24, 2012
Commits on Jun 10, 2012
  1. Coding style fixes

    Make sure there is a whitespace between ) and {.
    stefanbeller committed with bjorn Apr 29, 2012
Commits on Jun 9, 2012
  1. Improved handling of external tilesets in Lua export

    Since referring to the external .tsx file in XML format is generally
    not very useful in a map exported to Lua, all the tileset information
    is now included in the export.
    
    Previously, tile properties were already being included, but this had
    been by accident.
    bjorn committed Jun 9, 2012
  2. Added name labels for objects on isometric maps

    For rectangles, polygons and tile objects.
    Werdn committed with bjorn May 25, 2012
  3. Merge pull request #220 from stefanbeller/multipleLayerRules

    Automapping: 2 bugfixes and an updated sewers example.
    bjorn committed Jun 9, 2012
  4. Share the line drawing code between StampBrush and TerrainBrush

    I've introduced a new module called 'geometry' which now contains
    rasterization of ellipse and line, as well as the 'coherent regions'
    function which existed in the 'utils' module.
    bjorn committed Jun 9, 2012
  5. Automapping: Correct comments in sewers rules file.

    Also two rules have been added, which use layers as input, which
    have been generated by the rules before.
    stefanbeller committed Jun 7, 2012
  6. Automapping: Handle non existing input layers in working map.

    If there is an input layer required by the rule map, which does not
    exist in the working map, the rules will not get applied, as the rules
    are not met.
    
    Before there was no check if input layers existed, so you could crash
    tiled.
    
    Thanks to Giancarlo Todone for spotting the bug.
    
    Fixes #219
    stefanbeller committed Jun 9, 2012
  7. Automapping: remove beforehand check if rules are used.

    D. Knuth: Premature optimisation is the root of all evil.
    And he is right again.
    
    The checks if rules are used have been done before all Automapping takes
    place, but a rule can alter the situation for the following rules
    drastically, so either we try to correct the checks if rules are applied
    or just drop these checks.
    
    The intention of the checking before was to speed up Automapping by only
    executing the needed rules, but as the checks would take more and more
    code for just being correct, it might be better to remove the speedup
    things completely and have a smaller code base.
    
    Thanks to Giancarlo Todone for spotting the bug.
    stefanbeller committed Jun 7, 2012
Commits on Jun 4, 2012
  1. Fixed crash on closing a map

    This is a crash introduced with
    1afabff. We can't always call
    TerrainBrush::updateBrush since it expects the current layer to be a
    tile layer, which is not the case when the map is being closed (and the
    brush set back to a null map).
    
    Reviewed-by: Manu Evans
    bjorn committed Jun 4, 2012
  2. Tweaked default dockwidget configuration

    * Tabify the Terrains dock with the Tilesets dock
    * Show the Layers and Tilesets docks in front by default
    * Shortened "Terrain Types" to "Terrains"
    * Fixed the objectName of the terrain dock, which caused it to share
      settings with the tileset dock
    bjorn committed Jun 4, 2012
  3. Fixed handling of tileset renaming by terrains dock

    By adding missing slot implementation.
    
    Also removed an unused variable.
    bjorn committed Jun 4, 2012
  4. Fixed crash when opening a map without tilesets

    In particular this crash would always happen when creating a new map.
    The crash was caused by TerrainBrush::mapDocumentChanged, which did not
    handle the case where the new map did not have any tilesets correctly.
    bjorn committed Jun 4, 2012
Commits on Jun 3, 2012
  1. Added climits include for INT_MAX

    Fixes compilation error on Ubuntu Lucid.
    Hanmac committed with bjorn Jun 3, 2012
Commits on Jun 1, 2012
  1. Merge branch 'TurkeyMan/master'

    Conflicts:
    	src/tiled/mainwindow.cpp
    bjorn committed Jun 1, 2012
Commits on May 31, 2012
  1. Added vertex painting mode

    TurkeyMan committed May 29, 2012
  2. Fixed the run away terrain generation when encountering unknown tiles…

    …, added support for tile randomness factor.
    TurkeyMan committed May 29, 2012
  3. Added Terrain palette.

    TurkeyMan committed May 31, 2012
  4. Distant terrain transitions working now.

    Also:
    - Updated desert example with terrain painting data.
    TurkeyMan committed May 29, 2012
Commits on May 29, 2012
  1. Automapping: Removed setting the layer index

    Setting the layerindex was needed once the AutomapperWrapper
    used to replace layers for undo/redo functionality.
    As of 1defe85
    the AutomapperWrapper only patches the layerdata, so no
    replacement of layers takes place, which keeps the current
    index set correctly.
    stefanbeller committed with bjorn May 29, 2012
  2. Added ability to specify background color

    Reviewed-by: Thorbjørn Lindeijer
    sparkart committed with bjorn May 14, 2012
Commits on May 27, 2012
Commits on May 26, 2012
  1. Some cleanups and optimizations related to Objects dock

    Manual emitting of signals via MapDocument was no longer being used, so
    I removed those methods. The signals emitted from MapObjectModel are now
    directly forwarded.
    
    Some optimizations were made (though probably not noticable) in that
    searching for the index of an ObjectGroup or MapObject was avoided in
    several places.
    
    Remove Object and Object Properties tool bar buttons now use theme icons
    when appropriate.
    
    Other than that most changes are line length reduction.
    bjorn committed May 25, 2012
Commits on May 17, 2012
  1. Added the Objects dock and per-MapObject visibility.

    Tim Baker committed May 17, 2012
  2. Some tweaks to zoom combo box

    Just a typo fix, line length reduction, preferring QVector::last over
    QVector::back and removing an unnecessary check on whether a MapView has
    a Zoomable instance.
    bjorn committed May 17, 2012
  3. Added scale combobox to MainWindow and TilesetDock.

    Zoomable can be associated with a QComboBox.
    Each TilesetView shares the Zoomable of the TilesetDock.
    Tim Baker committed with bjorn May 8, 2012
Commits on May 16, 2012
  1. Preferred grid color can now be used

    Fixes #134
    stefanbeller committed with bjorn Mar 17, 2012
Commits on May 12, 2012
  1. Made tileset tabs no longer closable

    It's enough that you can remove them using the 'Remove Tileset' button
    in the tool bar. The close buttons on the tabs are only taking up
    possibly valuable space.
    bjorn committed May 12, 2012
  2. Fixed another type of returned value

    GCC 4.7 warned about this.
    bjorn committed May 12, 2012
Commits on May 7, 2012
  1. Merge branch '0.8'

    Conflicts:
    	dist/win/tiled.nsi
    	src/tiled/bucketfilltool.cpp
    	src/tiled/bucketfilltool.h
    bjorn committed May 7, 2012