| Commit message (Collapse) | Author | Age | |
|---|---|---|---|
| * | twist vertex material changes | hwc487 | 2012-04-30 |
| | | |||
| * | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into ↵ | hwc487 | 2012-04-27 |
| |\ | | | | | | | Textures | ||
| | * | Merge cleanup | Valerio Virgillito | 2012-04-27 |
| | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| | * | Merge branch 'refs/heads/serialization' | Valerio Virgillito | 2012-04-27 |
| | |\ | |||
| | | * | Merge branch 'stage-document-architecture' of ↵ | Valerio Virgillito | 2012-04-26 |
| | | |\ | | | | | | | | | | | | | https://github.com/mencio/ninja-internal into serialization | ||
| | | | * | Merge branch 'refs/heads/master' into stage-document-architecture | Valerio Virgillito | 2012-04-26 |
| | | | |\ | |||
| | | | * | | Fixed the stage border and layout in the new template | Valerio Virgillito | 2012-04-26 |
| | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| | | | * | | Simplifying the getElement method from stage and adding an exclusion list to ↵ | Valerio Virgillito | 2012-04-26 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | the new template Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| | | | * | | Merge branch 'refs/heads/master' into stage-document-architecture | Valerio Virgillito | 2012-04-26 |
| | | | |\ \ | |||
| | | | * | | | Fixing the element model and adding get element | Valerio Virgillito | 2012-04-26 |
| | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| | | | * | | | Merge branch 'refs/heads/master' into stage-document-architecture | Valerio Virgillito | 2012-04-24 |
| | | | |\ \ \ | |||
| | | | * | | | | Added a body controller | Valerio Virgillito | 2012-04-24 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| | | * | | | | | Merge branch 'master' of https://github.com/mayhewinator/ninja-internal into ↵ | Valerio Virgillito | 2012-04-26 |
| | | |\ \ \ \ \ | | | |_|_|_|/ | | |/| | | | | | | | | | | | serialization | ||
| | | | * | | | | Removing all "module" declarations and replaced with "prototype" in ↵ | John Mayhew | 2012-04-26 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | preparation for montage converting to the new "prototype" format fully | ||
| | * | | | | | | Merge pull request #181 from imix23ways/TimelineUber | Valerio Virgillito | 2012-04-27 |
| | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | Timeline uber | ||
| | | * | | | | | | Refix brush tool elementAdded event | Jonathan Duran | 2012-04-27 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com> | ||
| | | * | | | | | | Merge branch 'refs/heads/NINJAmaster' into TimelineUber | Jonathan Duran | 2012-04-27 |
| | | |\ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | | |||
| | * | | | | | | | Merge pull request #176 from pushkarjoshi/brushtool | Valerio Virgillito | 2012-04-27 |
| | |\ \ \ \ \ \ \ | | |_|/ / / / / | |/| | | | | | | Brushtool | ||
| | | * | | | | | | track the dragging plane based on the hit record so that the file IO works ↵ | Pushkar Joshi | 2012-04-26 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | again (bug fix) | ||
| | | * | | | | | | Merge branch 'master' into brushtool | Pushkar Joshi | 2012-04-25 |
| | | |\ \ \ \ \ \ | | | | |_|_|/ / | | | |/| | | | | |||
| | | * | | | | | | render the calligraphic brush stroke in realtime on a rotated canvas | Pushkar Joshi | 2012-04-25 |
| | | | | | | | | | |||
| | | * | | | | | | allow the realtime drawing of brush strokes drawn off the standard XY plane ↵ | Pushkar Joshi | 2012-04-24 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | by passing in the transformation matrix | ||
| | * | | | | | | | Merge pull request #178 from mqg734/PerspectiveFix | Valerio Virgillito | 2012-04-26 |
| | |\ \ \ \ \ \ \ | | |_|_|_|/ / / | |/| | | | | | | IKNINJA-1511 - We don't currently support perspective values on individual elements, so removing perspective values from the animation presets. | ||
| | | * | | | | | | We don't currently support perspective values on individual elements, so ↵ | Nivesh Rajbhandari | 2012-04-26 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | removing perspective values from the animation presets. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
| | | | | | * | | | Revert "Fix Brush tool not broadcasting elementAdded event" | Jonathan Duran | 2012-04-27 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 12fadd1494a9b5fcdaa17fde2f4847277237cf79. Signed-off-by: Jonathan Duran <jduran@motorola.com> | ||
| | | | | | * | | | Fix WEbGL not rendering on stage with timeline | Jonathan Duran | 2012-04-26 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com> | ||
| | | | | | * | | | Timeline: Deleting elements now deletes associated layers. | Jon Reid | 2012-04-26 |
| | | | | | | | | | |||
| | | | | | * | | | Timeline: comment out a conditional debugger; re-enable layer name storage. | Jon Reid | 2012-04-26 |
| | | | | | | | | | |||
| | | | | | * | | | Merge remote-tracking branch 'ninja-jduran/TimelineUber' into timeline-local | Jon Reid | 2012-04-26 |
| | | | | | |\ \ \ | |||
| | | | | | | * \ \ | Merge branch 'refs/heads/NINJAmaster' into TimelineUber | Jonathan Duran | 2012-04-26 |
| | | | | | | |\ \ \ | | | | | | | | |/ | | | | | | | |/| | |||
| | | | | | | * | | | Merge branch 'refs/heads/timeline-local' into TimelineUber | Jonathan Duran | 2012-04-26 |
| | | | | | | |\ \ \ | |||
| | | | | | | * \ \ \ | Merge branch 'refs/heads/NINJAmaster' into TimelineUber | Jonathan Duran | 2012-04-26 |
| | | | | | | |\ \ \ \ | | | |_|_|_|/ / / / | | |/| | | | | | | | |||
| | | | | | * | | | | | Timeline: Decouple Timeline and Breadcrumb. Remove most document change | Jon Reid | 2012-04-26 |
| | | | | | | |/ / / | | | | | |/| | | | | | | | | | | | | | | | | | | | | | event handlers. Bind Timeline to currentSelectedElement. Various bug fixes. | ||
| | | | | | * | | | | Merge remote-tracking branch 'ninja-jduran/TimelineUber' into timeline-local | Jon Reid | 2012-04-25 |
| | | | | | |\| | | | |||
| | | | | | | * | | | Timeline Bug Fix : 1541 | Kruti Shah | 2012-04-25 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Kruti Shah <kruti.shah@motorola.com> | ||
| | | | | | * | | | | Timeline: Handling of multiselect of elements from stage. | Jon Reid | 2012-04-25 |
| | | | | | | | | | | |||
| | | | | | * | | | | Timeline: New tracking for multiple selected layers. | Jon Reid | 2012-04-25 |
| | | | | | |/ / / | |||
| | | | | | * | | | Merge branch 'refs/heads/NINJAmaster' into TimelineUber | Jonathan Duran | 2012-04-25 |
| | | | | | |\ \ \ | | | | | |/ / / | | | | |/| | | | |||
| | | | | | * | | | Revert "Fix Pen Tool not broadcasting elementAdded event" | Jonathan Duran | 2012-04-25 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 0475cb7e37601366ec07d77fcea44269d3d49633. Signed-off-by: Jonathan Duran <jduran@motorola.com> | ||
| | | | | | * | | | Merge branch 'refs/heads/NINJAmaster' into TimelineUber | Jonathan Duran | 2012-04-24 |
| | | | | | |\ \ \ | | | | | | | |/ | | | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: js/components/layout/bread-crumb.reel/bread-crumb.js Signed-off-by: Jonathan Duran <jduran@motorola.com> | ||
| | | | | | * | | | Turn on width and height as tweenable properties | Jonathan Duran | 2012-04-24 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com> | ||
| | | | | | * | | | Fix Brush tool not broadcasting elementAdded event | Jonathan Duran | 2012-04-23 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com> | ||
| | | | | | * | | | Fix Pen Tool not broadcasting elementAdded event | Jonathan Duran | 2012-04-23 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com> | ||
| | | | | | * | | | Change sublayer property names to match css property names | Jonathan Duran | 2012-04-23 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com> | ||
| | | | | | * | | | Merge branch 'refs/heads/NINJAmaster' into TimelineUber | Jonathan Duran | 2012-04-23 |
| | | | | | |\ \ \ | |||
| | | | | | * | | | | Fix Select All bug and remove debuggers | Jonathan Duran | 2012-04-23 |
| | | | | | | | | | | | | | | | | | | | | | | |||