Merge branch 'sdf6' into github_changelog_7

.hgignore → .gitignore

@@ -1,4 +1,3 @@
-syntax: glob
 
 build
 build_*

Migration.md

@@ -90,7 +90,7 @@ but with improved human-readability..
 
 1. **Lump:: prefix in link names**
  + Changed to \_fixed_joint_lump__ to avoid confusion with scoped names
- + [BitBucket pull request 245](https://osrf-migration.github.io/sdformat-gh-pages/#!/osrf/sdformat/pull-request/245)
+ + [BitBucket pull request 245](https://osrf-migration.github.io/sdformat-gh-pages/#!/osrf/sdformat/pull-requests/245)
 
 ## SDF protocol 1.5 to 1.6
 
@@ -177,7 +177,7 @@ but with improved human-readability..
  + [BitBucket pull request 495](https://osrf-migration.github.io/sdformat-gh-pages/#!/osrf/sdformat/pull-requests/495)
 
 1. **state.sdf** allow `light` tags within `insertions` element
- * [BitBucket pull request 325](https://osrf-migration.github.io/sdformat-gh-pages/#!/osrf/sdformat/pull-request/325)
+ * [BitBucket pull request 325](https://osrf-migration.github.io/sdformat-gh-pages/#!/osrf/sdformat/pull-requests/325)
 
 1. **surface.sdf** `category_bitmask` element
  + description: Bitmask for category of collision filtering.

sdf/1.4/physics.sdf

@@ -177,7 +177,7 @@
  <description>
  Flag to enable dynamic rescaling of moment of inertia in constrained directions.
  See gazebo pull request 1114 for the implementation of this feature.
- https://bitbucket.org/osrf/gazebo/pull-request/1114
+ https://osrf-migration.github.io/gazebo-gh-pages/#!/osrf/gazebo/pull-request/1114
  </description>
  </element>
  </element> <!-- End Solver -->

sdf/1.5/joint.sdf

@@ -55,7 +55,7 @@
  <description>
  Flag to interpret the axis xyz element in the parent model frame instead
  of joint frame. Provided for Gazebo compatibility
- (see https://bitbucket.org/osrf/gazebo/issue/494 ).
+ (see https://github.com/osrf/gazebo/issue/494 ).
  </description>
  </element>
  <element name="dynamics" required="0">
@@ -114,7 +114,7 @@
  <description>
  Flag to interpret the axis xyz element in the parent model frame instead
  of joint frame. Provided for Gazebo compatibility
- (see https://bitbucket.org/osrf/gazebo/issue/494 ).
+ (see https://github.com/osrf/gazebo/issue/494 ).
  </description>
  </element>
  <element name="dynamics" required="0">

sdf/1.5/physics.sdf

@@ -189,7 +189,7 @@
  <description>
  Flag to enable dynamic rescaling of moment of inertia in constrained directions.
  See gazebo pull request 1114 for the implementation of this feature.
- https://bitbucket.org/osrf/gazebo/pull-request/1114
+ https://osrf-migration.github.io/gazebo-gh-pages/#!/osrf/gazebo/pull-request/1114
  </description>
  </element>
  </element> <!-- End Solver -->

sdf/1.6/joint.sdf

@@ -61,7 +61,7 @@
  <description>
  Flag to interpret the axis xyz element in the parent model frame instead
  of joint frame. Provided for Gazebo compatibility
- (see https://bitbucket.org/osrf/gazebo/issue/494 ).
+ (see https://github.com/osrf/gazebo/issue/494 ).
  </description>
  </element>
  <element name="dynamics" required="0">
@@ -125,7 +125,7 @@
  <description>
  Flag to interpret the axis xyz element in the parent model frame instead
  of joint frame. Provided for Gazebo compatibility
- (see https://bitbucket.org/osrf/gazebo/issue/494 ).
+ (see https://github.com/osrf/gazebo/issue/494 ).
  </description>
  </element>
  <element name="dynamics" required="0">

sdf/1.6/physics.sdf

@@ -200,7 +200,7 @@
  <description>
  Flag to enable dynamic rescaling of moment of inertia in constrained directions.
  See gazebo pull request 1114 for the implementation of this feature.
- https://bitbucket.org/osrf/gazebo/pull-request/1114
+ https://osrf-migration.github.io/gazebo-gh-pages/#!/osrf/gazebo/pull-request/1114
  </description>
  </element>
  <element name="friction_model" type="string" default="pyramid_model" required="0">
@@ -213,8 +213,8 @@
  cone_model: friction force magnitude limited in proportion to normal force.
 
  See gazebo pull request 1522 for the implementation of this feature.
- https://bitbucket.org/osrf/gazebo/pull-request/1522
- https://bitbucket.org/osrf/gazebo/commits/8c05ad64967c
+ https://osrf-migration.github.io/gazebo-gh-pages/#!/osrf/gazebo/pull-request/1522
+ https://github.com/osrf/gazebo/commit/968dccafdfbfca09c9b3326f855612076fed7e6f
  </description>
  </element>
  </element> <!-- End Solver -->

sdf/Migration.md

@@ -24,14 +24,14 @@ but with improved human-readability.
  + type: unsigned int
  + default: 2
  + required: 0
- + [pull request 293](https://bitbucket.org/osrf/sdformat/pull-requests/293)
+ + [Bitbucket pull request 293](https://osrf-migration.github.io/sdformat-gh-pages/#!/osrf/sdformat/pull-requests/293)
 
 1. **link.sdf** `enable_wind` element
  + description: If true, the link is affected by the wind
  + type: bool
  + default: false
  + required: 0
- + [pull request 240](https://bitbucket.org/osrf/sdformat/pull-requests/240)
+ + [Bitbucket pull request 240](https://osrf-migration.github.io/sdformat-gh-pages/#!/osrf/sdformat/pull-requests/240)
 
 1. **model.sdf** `enable_wind` element
  + description: If set to true, all links in the model
@@ -40,54 +40,54 @@ but with improved human-readability.
  + type: bool
  + default: false
  + required: 0
- + [pull request 240](https://bitbucket.org/osrf/sdformat/pull-requests/240)
+ + [Bitbucket pull request 240](https://osrf-migration.github.io/sdformat-gh-pages/#!/osrf/sdformat/pull-requests/240)
 
 1. **model_state.sdf** `scale` element
  + description: Scale for the 3 dimensions of the model.
  + type: vector3
  + default: "1 1 1"
  + required: 0
- + [pull request 246](https://bitbucket.org/osrf/sdformat/pull-requests/246)
+ + [Bitbucket pull request 246](https://osrf-migration.github.io/sdformat-gh-pages/#!/osrf/sdformat/pull-requests/246)
 
 1. **physics.sdf** `friction_model` element
  + description: Name of ODE friction model to use. Valid values include:
  + pyramid_model: (default) friction forces limited in two directions
  in proportion to normal force.
  + box_model: friction forces limited to constant in two directions.
  + cone_model: friction force magnitude limited in proportion to normal force.
- See [gazebo pull request 1522](https://bitbucket.org/osrf/gazebo/pull-request/1522)
- (merged in [gazebo 8c05ad64967c](https://bitbucket.org/osrf/gazebo/commits/8c05ad64967c))
+ See [gazebo pull request 1522](https://osrf-migration.github.io/gazebo-gh-pages/#!/osrf/gazebo/pull-request/1522)
+ (merged in [gazebo 8c05ad64967c](https://github.com/osrf/gazebo/commit/968dccafdfbfca09c9b3326f855612076fed7e6f))
  for the implementation of this feature.
  + type: string
  + default: "pyramid_model"
  + required: 0
- + [pull request 294](https://bitbucket.org/osrf/sdformat/pull-requests/294)
+ + [Bitbucket pull request 294](https://osrf-migration.github.io/sdformat-gh-pages/#!/osrf/sdformat/pull-requests/294)
 
 1. **world.sdf** `wind` element
  + description: The wind tag specifies the type and properties of the wind.
  + required: 0
- + [pull request 240](https://bitbucket.org/osrf/sdformat/pull-requests/240)
+ + [Bitbucket pull request 240](https://osrf-migration.github.io/sdformat-gh-pages/#!/osrf/sdformat/pull-requests/240)
 
 1. **world.sdf** `wind::linear_velocity` element
  + description: Linear velocity of the wind.
  + type: vector3
  + default: "0 0 0"
  + required: 0
- + [pull request 240](https://bitbucket.org/osrf/sdformat/pull-requests/240)
+ + [Bitbucket pull request 240](https://osrf-migration.github.io/sdformat-gh-pages/#!/osrf/sdformat/pull-requests/240)
 
 ### Modifications
 
 1. `gravity` and `magnetic_field` elements are moved
  from `physics` to `world`
- + [pull request 247](https://bitbucket.org/osrf/sdformat/pull-requests/247)
- + [gazebo pull request 2090](https://bitbucket.org/osrf/gazebo/pull-requests/2090)
+ + [Bitbucket pull request 247](https://osrf-migration.github.io/sdformat-gh-pages/#!/osrf/sdformat/pull-requests/247)
+ + [gazebo pull request 2090](https://osrf-migration.github.io/gazebo-gh-pages/#!/osrf/gazebo/pull-requests/2090)
 
 1. A new style for representing the noise properties of an `imu` was implemented
- in [pull request 199](https://bitbucket.org/osrf/sdformat/pull-requests/199)
+ in [Bitbucket pull request 199](https://osrf-migration.github.io/sdformat-gh-pages/#!/osrf/sdformat/pull-requests/199)
  for sdf 1.5 and the old style was declared as deprecated.
  The old style has been removed from sdf 1.6 with the conversion script
  updating to the new style.
- + [pull request 199](https://bitbucket.org/osrf/sdformat/pull-requests/199)
- + [pull request 243](https://bitbucket.org/osrf/sdformat/pull-requests/243)
- + [pull request 244](https://bitbucket.org/osrf/sdformat/pull-requests/244)
+ + [Bitbucket pull request 199](https://osrf-migration.github.io/sdformat-gh-pages/#!/osrf/sdformat/pull-requests/199)
+ + [Bitbucket pull request 243](https://osrf-migration.github.io/sdformat-gh-pages/#!/osrf/sdformat/pull-requests/243)
+ + [Bitbucket pull request 244](https://osrf-migration.github.io/sdformat-gh-pages/#!/osrf/sdformat/pull-requests/244)
 

src/Param_TEST.cc

@@ -158,7 +158,7 @@ TEST(Param, HexUInt)
 TEST(Param, HexFloat)
 {
 // Microsoft does not parse hex values properly.
-// https://bitbucket.org/osrf/sdformat/issues/114
+// https://github.com/osrf/sdformat/issues/114
 #ifndef _MSC_VER
  sdf::Param floatParam("key", "float", "0", false, "description");
  float value;
@@ -193,7 +193,7 @@ TEST(Param, HexDouble)
  EXPECT_DOUBLE_EQ(value, 0.0);
 
 // Microsoft does not parse hex values properly.
-// https://bitbucket.org/osrf/sdformat/issues/114
+// https://github.com/osrf/sdformat/issues/114
 #ifndef _MSC_VER
  EXPECT_TRUE(doubleParam.SetFromString("0x01"));
  EXPECT_TRUE(doubleParam.Get<double>(value));