aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* First round of moving color chips into the sub tools. Shape and Pen tool now ↵John Mayhew2012-05-03
| | | | have chips in the sub tool bar. Still need to complete adding chips to the Brush tool and finalizing the subtool bar layout to our spec for all of the subtools.
* Merge pull request #182 from ericmueller/Canvas-interactionValerio Virgillito2012-04-30
|\ | | | | Canvas interaction
| * added a console.log to show the working plane during a draghwc4872012-04-27
| |
| * Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into ↵hwc4872012-04-27
| |\ | | | | | | | | | Canvas-interaction
| * | Creating shapes in a containerhwc4872012-04-27
| | |
| * | canvas interactionhwc4872012-04-26
| | |
| * | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into ↵hwc4872012-04-25
| |\ \ | | | | | | | | | | | | Canvas-interaction
| * \ \ Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into ↵hwc4872012-04-25
| |\ \ \ | | | | | | | | | | | | | | | Canvas-interaction
| * | | | Snapping tocontained objectshwc4872012-04-24
| | | | |
| * | | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into ↵hwc4872012-04-24
| |\ \ \ \ | | | | | | | | | | | | | | | | | | Canvas-interaction
| * | | | | canvas interactionhwc4872012-04-23
| | | | | |
| * | | | | limitshwc4872012-04-23
| | | | | |
* | | | | | Merge cleanupValerio Virgillito2012-04-27
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* | | | | | Merge branch 'refs/heads/serialization'Valerio Virgillito2012-04-27
|\ \ \ \ \ \
| * \ \ \ \ \ Merge branch 'stage-document-architecture' of ↵Valerio Virgillito2012-04-26
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | https://github.com/mencio/ninja-internal into serialization
| | * \ \ \ \ \ Merge branch 'refs/heads/master' into stage-document-architectureValerio Virgillito2012-04-26
| | |\ \ \ \ \ \
| | * | | | | | | Fixed the stage border and layout in the new templateValerio Virgillito2012-04-26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| | * | | | | | | Simplifying the getElement method from stage and adding an exclusion list to ↵Valerio Virgillito2012-04-26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | the new template Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| | * | | | | | | Merge branch 'refs/heads/master' into stage-document-architectureValerio Virgillito2012-04-26
| | |\ \ \ \ \ \ \
| | * | | | | | | | Fixing the element model and adding get elementValerio Virgillito2012-04-26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| | * | | | | | | | Merge branch 'refs/heads/master' into stage-document-architectureValerio Virgillito2012-04-24
| | |\ \ \ \ \ \ \ \ | | | | |_|_|_|/ / / | | | |/| | | | | |
| | * | | | | | | | Added a body controllerValerio Virgillito2012-04-24
| | | |_|_|_|/ / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * | | | | | | | Merge branch 'master' of https://github.com/mayhewinator/ninja-internal into ↵Valerio Virgillito2012-04-26
| |\ \ \ \ \ \ \ \ | | |_|_|_|/ / / / | |/| | | | | | | | | | | | | | | | serialization
| | * | | | | | | Removing all "module" declarations and replaced with "prototype" in ↵John Mayhew2012-04-26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | preparation for montage converting to the new "prototype" format fully
* | | | | | | | | Merge pull request #181 from imix23ways/TimelineUberValerio Virgillito2012-04-27
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ |/| | | | | | | | Timeline uber
| * | | | | | | | Refix brush tool elementAdded eventJonathan Duran2012-04-27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com>
| * | | | | | | | Merge branch 'refs/heads/NINJAmaster' into TimelineUberJonathan Duran2012-04-27
| |\ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | |
* | | | | | | | | Merge pull request #176 from pushkarjoshi/brushtoolValerio Virgillito2012-04-27
|\ \ \ \ \ \ \ \ \ | |_|/ / / / / / / |/| | | | | | | | Brushtool
| * | | | | | | | track the dragging plane based on the hit record so that the file IO works ↵Pushkar Joshi2012-04-26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | again (bug fix)
| * | | | | | | | Merge branch 'master' into brushtoolPushkar Joshi2012-04-25
| |\ \ \ \ \ \ \ \ | | | |_|_|/ / / / | | |/| | | | | |
| * | | | | | | | render the calligraphic brush stroke in realtime on a rotated canvasPushkar Joshi2012-04-25
| | | | | | | | |
| * | | | | | | | allow the realtime drawing of brush strokes drawn off the standard XY plane ↵Pushkar Joshi2012-04-24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | by passing in the transformation matrix
* | | | | | | | | Merge pull request #178 from mqg734/PerspectiveFixValerio Virgillito2012-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 Rajbhandari2012-04-26
| | |_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | removing perspective values from the animation presets. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
* | | | | | | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internalValerio Virgillito2012-04-26
|\ \ \ \ \ \ \ \ | | |_|_|_|_|/ / | |/| | | | | |
* | | | | | | | Fixing the eye dropper shortcut.Valerio Virgillito2012-04-26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| | | | | * | | Revert "Fix Brush tool not broadcasting elementAdded event"Jonathan Duran2012-04-27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 12fadd1494a9b5fcdaa17fde2f4847277237cf79. Signed-off-by: Jonathan Duran <jduran@motorola.com>
| | | | | * | | Fix WEbGL not rendering on stage with timelineJonathan Duran2012-04-26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com>
| | | | | * | | Timeline: Deleting elements now deletes associated layers.Jon Reid2012-04-26
| | | | | | | |
| | | | | * | | Timeline: comment out a conditional debugger; re-enable layer name storage.Jon Reid2012-04-26
| | | | | | | |
| | | | | * | | Merge remote-tracking branch 'ninja-jduran/TimelineUber' into timeline-localJon Reid2012-04-26
| | | | | |\ \ \
| | | | | | * \ \ Merge branch 'refs/heads/NINJAmaster' into TimelineUberJonathan Duran2012-04-26
| | | | | | |\ \ \ | | |_|_|_|_|/ / / | |/| | | | | | |
| * | | | | | | | Merge pull request #179 from joseeight/FileIOValerio Virgillito2012-04-26
|/| | | | | | | | | | | | | | | | | | | | | | | | | | Fixing duplicate layer bug
| * | | | | | | | Merge branch 'refs/heads/Ninja-Internal' into FileIOJose Antonio Marquez2012-04-26
| |\| | | | | | |
| * | | | | | | | Fixing duplicate layer errorJose Antonio Marquez2012-04-26
| | | | | | | | |
| * | | | | | | | Fixing duplicate layer bugJose Antonio Marquez2012-04-26
| | | | |