Merge branch '0.12'

Closes #956
mapeditor · May 19, 2015 · bb9b609 · bb9b609
2 parents 1146c3a + f3b8965
commit bb9b609
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 13 deletions.
diff --git a/examples/desert.tsx b/examples/desert.tsx
@@ -37,22 +37,22 @@
  <tile id="27" terrain="1,0,1,1"/>
  <tile id="28" terrain="0,1,1,1"/>
  <tile id="29" terrain="0,0,0,0"/>
- <tile id="30" terrain="0,0,0,0" probability="0.5"/>
- <tile id="31" terrain="0,0,0,0" probability="0.5"/>
+ <tile id="30" terrain="0,0,0,0" probability="0.01"/>
+ <tile id="31" terrain="0,0,0,0" probability="0.01"/>
  <tile id="32" terrain="0,2,0,2"/>
  <tile id="33" terrain="2,2,2,2"/>
  <tile id="34" terrain="2,0,2,0"/>
  <tile id="35" terrain="2,2,2,0"/>
  <tile id="36" terrain="2,2,0,2"/>
- <tile id="37" terrain="0,0,0,0" probability="0.5"/>
- <tile id="38" terrain="0,0,0,0" probability="0.5"/>
- <tile id="39" terrain="0,0,0,0" probability="0.5"/>
+ <tile id="37" terrain="0,0,0,0" probability="0.01"/>
+ <tile id="38" terrain="0,0,0,0" probability="0.01"/>
+ <tile id="39" terrain="0,0,0,0" probability="0.01"/>
  <tile id="40" terrain="0,2,0,0"/>
  <tile id="41" terrain="2,2,0,0"/>
  <tile id="42" terrain="2,0,0,0"/>
  <tile id="43" terrain="2,0,2,2"/>
  <tile id="44" terrain="0,2,2,2"/>
  <tile id="45" terrain="0,0,0,0" probability="0"/>
- <tile id="46" terrain="0,0,0,0" probability="0.5"/>
- <tile id="47" terrain="0,0,0,0" probability="0.5"/>
+ <tile id="46" terrain="0,0,0,0" probability="0.01"/>
+ <tile id="47" terrain="0,0,0,0" probability="0.01"/>
 </tileset>
diff --git a/src/tiled/objectselectiontool.cpp b/src/tiled/objectselectiontool.cpp
@@ -842,7 +842,7 @@ void ObjectSelectionTool::objectsRemoved(const QList<MapObject *> &objects)
 
         if (objects.contains(mapObject)) {
             // Avoid referencing the removed object
-            mMovingObjects.removeAt(i);
+            mMovingObjects.remove(i);
         } else {
             mapObject->setPosition(object.oldPosition);
             mapObject->setSize(object.oldSize);

diff --git a/src/tiled/propertybrowser.cpp b/src/tiled/propertybrowser.cpp
@@ -529,11 +529,11 @@ void PropertyBrowser::addTileProperties()
     QtProperty *groupProperty = mGroupManager->addProperty(tr("Tile"));
     createProperty(IdProperty, QVariant::Int, tr("ID"), groupProperty)->setEnabled(false);
 
-    QtProperty *probabilityProperty = createProperty(TileProbabilityProperty,
-                                                     QVariant::Double,
-                                                     tr("Probability"),
-                                                     groupProperty);
-
+    QtVariantProperty *probabilityProperty = createProperty(TileProbabilityProperty,
+                                                            QVariant::Double,
+                                                            tr("Probability"),
+                                                            groupProperty);
+    probabilityProperty->setAttribute(QLatin1String("decimals"), 3);
     probabilityProperty->setToolTip(tr("Relative chance this tile will be "
                                        "picked while painting terrain"));