| Commit message (Collapse) | Author | Age | ||
|---|---|---|---|---|
| ... | ||||
| * | | | | | | | | | Merge branch 'refs/heads/ninja-internal' into StageWebTemplate | Nivesh Rajbhandari | 2012-05-01 | |
| |\| | | | | | | | | ||||
| | * | | | | | | | | Removing some console logs | Valerio Virgillito | 2012-04-30 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | |||
| * | | | | | | | | | Get working plane grid to draw for new stage web template workflow. | Nivesh Rajbhandari | 2012-05-01 | |
| |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | |||
| * | | | | | | | | Squashed commit of stage architecture | Valerio Virgillito | 2012-04-30 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | |||
| * | | | | | | | | Merge pull request #182 from ericmueller/Canvas-interaction | Valerio Virgillito | 2012-04-30 | |
| |\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | | Canvas interaction | |||
| | * | | | | | | | added a console.log to show the working plane during a drag | hwc487 | 2012-04-27 | |
| | | | | | | | | | ||||
| | * | | | | | | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into ↵ | hwc487 | 2012-04-27 | |
| | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Canvas-interaction | |||
| | * | | | | | | | | Creating shapes in a container | hwc487 | 2012-04-27 | |
| | | | | | | | | | | ||||
| | * | | | | | | | | canvas interaction | hwc487 | 2012-04-26 | |
| | | | | | | | | | | ||||
| | * | | | | | | | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into ↵ | hwc487 | 2012-04-25 | |
| | |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Canvas-interaction | |||
| | * \ \ \ \ \ \ \ \ | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into ↵ | hwc487 | 2012-04-25 | |
| | |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Canvas-interaction | |||
| | * | | | | | | | | | | Snapping tocontained objects | hwc487 | 2012-04-24 | |
| | | | | | | | | | | | | ||||
| | * | | | | | | | | | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into ↵ | hwc487 | 2012-04-24 | |
| | |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Canvas-interaction | |||
| | * | | | | | | | | | | | canvas interaction | hwc487 | 2012-04-23 | |
| | | | | | | | | | | | | | ||||
| | * | | | | | | | | | | | limits | hwc487 | 2012-04-23 | |
| | | |_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | ||||
| * | | | | | | | | | | | 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 | |||
| * | | | | | | | | | | | | | 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) | |||
| | | * | | | | | | | | | | | 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 | |
| | | | |_|/ / / / / / / / | | |/| | | | | | | | | | | | | | ||||