Merge pull request #221 from blackberry-gaming/next

Next

gameplay/src/Joystick.cpp

@@ -201,7 +201,7 @@ void Joystick::drawImages(SpriteBatch* spriteBatch, const Rectangle& clip)
     if (_absolute || (!_absolute && _state == ACTIVE))
     {
         if (_absolute)
-            _region = _bounds;
+            _region = _viewportClipBounds;
 
         // Draw the outer image.
         Theme::ThemeImage* outer = getImage("outer", _state);

gameplay/src/PhysicsRigidBody.h

@@ -219,7 +219,6 @@ public:
     void setKinematic(bool kinematic);
 
     /**
-<<<<<<< HEAD
      * Sets whether the rigid body is enabled or disabled in the physics world.
      *
      * @param enable true enables the collision object, false disables it.
@@ -227,10 +226,7 @@ public:
     void setEnabled(bool enable);
 
     /**
-     * Gets the height at the given point (only for rigid bodies of type HEIGHTFIELD).
-=======
      * Gets the height and normal at the given point (only for rigid bodies of type HEIGHTFIELD).
->>>>>>> 0d45c907dd0ead0b5318d9a32bc78b367c01e532
      * 
      * @param x The x position.
      * @param y The y position.