Merge remote-tracking branch 'refs/remotes/origin/development'
Merge remote-tracking branch 'refs/remotes/origin/development'
Merge branch 'refs/heads/development'
Merge remote-tracking branch 'refs/remotes/origin/development'
Merge remote-tracking branch 'refs/remotes/origin/development'
fixed typo in asset file
- Fixed module manager recursion issue when not scanning at root-path only.
- Fixed SpriteBatch problem when turning-off the batch culling.
Merge remote-tracking branch 'refs/remotes/origin/master' into development
- Added batch-query tree initialization during simulation add instead of constructor making it possible to supress its usage in derived types.
- Fixed SpriteBatchItem problem updating local transform.
- Fixed bad formatting and warning under VS2010.
- Add support for user-data pointer on SpriteBatchItem.  Useful when associating a sprite with some custom structure in C++.
- Added a toy category to the Sandbox of "Experiments".
- Added composite experiment.
- PointForceController now has "setTrackedObject()" and "getTrackedObject()" to force it to track that SceneObjects' position.  When tracking an object, the "setPosition()" is used as a tracked-object local-space offset i.e. a position of (0,0) is at the tracked objects center but (1,0) is 1 world-unit along the objects local-space X-axis (including angle).
- Updated the PointForceController to set the controller to track the planetoid (even the planetoid doesn't currently move).
Merge remote-tracking branch 'refs/remotes/upstream/development' into development