Commit message (Expand) | Author | Age | |
---|---|---|---|
* | Merge branch 'refs/heads/NINJAmaster' into TimelineUber | Jonathan Duran | 2012-06-19 |
|\ | |||
| * | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into Tex... | hwc487 | 2012-06-14 |
| |\ | |||
| * \ | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into Tex... | hwc487 | 2012-06-13 |
| |\ \ | |||
| * | | | Removed references to NJUtils | hwc487 | 2012-06-12 |
| * | | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into Tex... | hwc487 | 2012-06-12 |
| |\ \ \ | |||
| * \ \ \ | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into Tex... | hwc487 | 2012-06-05 |
| |\ \ \ \ | |||
| * \ \ \ \ | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into Tex... | hwc487 | 2012-06-04 |
| |\ \ \ \ \ | |||
| * \ \ \ \ \ | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into Tex... | hwc487 | 2012-06-04 |
| |\ \ \ \ \ \ | |||
| * \ \ \ \ \ \ | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into Tex... | hwc487 | 2012-05-31 |
| |\ \ \ \ \ \ \ | |||
| * \ \ \ \ \ \ \ | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into Tex... | hwc487 | 2012-05-17 |
| |\ \ \ \ \ \ \ \ | |||
| * \ \ \ \ \ \ \ \ | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into Tex... | hwc487 | 2012-05-11 |
| |\ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | | Update materials to the new texture model. | hwc487 | 2012-04-26 |
* | | | | | | | | | | | Merge remote-tracking branch 'ninja-internal/master' into test-merge | Jon Reid | 2012-06-15 |
|\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | |||
| * | | | | | | | | | | Merge pull request #300 from mqg734/IKNinja_1715 | Valerio Virgillito | 2012-06-13 |
| |\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | |||
| | * | | | | | | | | | IKNinja-1715 - GIO: canvas tag is not saved after switching WebGL option On/O... | Nivesh Rajbhandari | 2012-06-13 |
| | | |_|_|_|_|_|_|/ | | |/| | | | | | | | |||
| * | | | | | | | | | Merge branch 'refs/heads/master' into montage-v10-integration | Valerio Virgillito | 2012-06-11 |
| |\| | | | | | | | | |||
| * | | | | | | | | | Merge branch 'refs/heads/master' into montage-v10-integration | Valerio Virgillito | 2012-06-06 |
| |\ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | | first iteration of adding serializable to ninja plus other changes to run the... | Valerio Virgillito | 2012-06-06 |
| | |_|_|_|_|_|_|/ / | |/| | | | | | | | | |||
* | | | | | | | | | | F6 support for keyframes | Jonathan Duran | 2012-06-15 |
* | | | | | | | | | | Merge branch 'refs/heads/TimelineUberjd' into TimelineUber | Kruti Shah | 2012-06-12 |
|\ \ \ \ \ \ \ \ \ \ | |||
| * \ \ \ \ \ \ \ \ \ | Merge branch 'refs/heads/NINJAmaster' into TimelineUber | Jonathan Duran | 2012-06-11 |
| |\ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / | | |/| | | | | | | | | |||
| | * | | | | | | | | | Merge branch 'refs/heads/Ninja-Internal' into FileIO | Jose Antonio Marquez | 2012-06-07 |
| | |\ \ \ \ \ \ \ \ \ | |||
| | | * \ \ \ \ \ \ \ \ | Merge branch 'refs/heads/master' into element-model-fixes | Valerio Virgillito | 2012-06-06 |
| | | |\ \ \ \ \ \ \ \ \ | |||
| | | * \ \ \ \ \ \ \ \ \ | Merge branch 'refs/heads/master' into element-model-fixes | Valerio Virgillito | 2012-06-05 |
| | | |\ \ \ \ \ \ \ \ \ \ | | | | | |_|/ / / / / / / | | | | |/| | | | | | | | | |||
| | | * | | | | | | | | | | removing all model creators. | Valerio Virgillito | 2012-06-05 |
| | | | |_|_|_|_|_|_|_|/ | | | |/| | | | | | | | | |||
| | * | | | | | | | | | | Adding unique ID to canvas data folders | Jose Antonio Marquez | 2012-06-07 |
| | | |_|/ / / / / / / | | |/| | | | | | | | | |||
| | * | | | | | | | | | Merge pull request #272 from pushkarjoshi/pentool | Valerio Virgillito | 2012-06-06 |
| | |\ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / | | |/| | | | | | | | | |||
| | | * | | | | | | | | Merge branch 'master' into pentool | Pushkar Joshi | 2012-06-05 |
| | | |\| | | | | | | | |||
| | | * | | | | | | | | Merge branch 'master' into pentool | Pushkar Joshi | 2012-06-04 |
| | | |\ \ \ \ \ \ \ \ | | | | | |/ / / / / / | | | | |/| | | | | | | |||
| | | * | | | | | | | | Merge branch 'master' into pentool | Pushkar Joshi | 2012-05-31 |
| | | |\ \ \ \ \ \ \ \ | | | | | |_|_|_|_|/ / | | | | |/| | | | | | | |||
| | | * | | | | | | | | allow changes in the pen subtool in options to be seen by the pen tool code (... | Pushkar Joshi | 2012-05-22 |
| | | | |_|_|_|_|/ / | | | |/| | | | | | | |||
| * | | | | | | | | | Merge branch 'refs/heads/NINJAmaster' into TimelineUber | Jonathan Duran | 2012-06-06 |
| |\| | | | | | | | | |||
| | * | | | | | | | | Merge pull request #267 from mqg734/ToolOptions | Valerio Virgillito | 2012-06-05 |
| | |\ \ \ \ \ \ \ \ | | | |_|_|_|/ / / / | | |/| | | | | | | | |||
| | | * | | | | | | | Updated ink bottle tool to support color-chip's checkbox and undo/redo for st... | Nivesh Rajbhandari | 2012-06-05 |
| | | * | | | | | | | Fill and Ink-Bottle fixes. | Nivesh Rajbhandari | 2012-06-04 |
| | | | |_|/ / / / | | | |/| | | | | | |||
| | * | | | | | | | Adding saving blocking screen | Jose Antonio Marquez | 2012-06-04 |
| | * | | | | | | | Adding lib copy blocking to preview | Jose Antonio Marquez | 2012-06-04 |
| | * | | | | | | | Merge branch 'refs/heads/Ninja-Internal' into Components | Jose Antonio Marquez | 2012-06-04 |
| | |\| | | | | | | |||
| | * | | | | | | | Creating template mediator class | Jose Antonio Marquez | 2012-06-01 |
| | | |_|_|_|_|/ | | |/| | | | | | |||
| * | | | | | | | Merge branch 'refs/heads/NINJAmaster' into TimelineUber | Jonathan Duran | 2012-06-05 |
| |\ \ \ \ \ \ \ | | | |/ / / / / | | |/| | | | | | |||
| | * | | | | | | Merge branch 'refs/heads/master' into document-bindings-fix | Valerio Virgillito | 2012-06-01 |
| | |\| | | | | | |||
| | | * | | | | | Fixing CSS overwrite issue | Jose Antonio Marquez | 2012-05-30 |
| | | * | | | | | Attempting to track clean nodes | Jose Antonio Marquez | 2012-05-30 |
| | | | |/ / / | | | |/| | | | |||
| | * / | | | | document bindings phase 1 | Valerio Virgillito | 2012-05-29 |
| | |/ / / / | |||
* | | | | | | Sub Props | Kruti Shah | 2012-06-12 |
* | | | | | | Color Chip | Kruti Shah | 2012-05-31 |
|/ / / / / | |||
* | | | | | Merge branch 'refs/heads/NINJAmaster' into TimelineUber | Jonathan Duran | 2012-05-31 |
|\| | | | | |||
| * | | | | Merge branch 'refs/heads/Ninja-DOM-Architecture' into Document | Jose Antonio Marquez | 2012-05-24 |
| |\ \ \ \ | |||
| | * | | | | Keyboard arrows were not working because some code had not been updated to ch... | Nivesh Rajbhandari | 2012-05-24 |
| | * | | | | - don't redraw stage for code document - fixes a switching bug | Ananya Sen | 2012-05-22 |