aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
...
| | | | * | | | | | | | | IKNINJA-1662 - fixed js error while resizing brewing in code viewAnanya Sen2012-06-05
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
| | | | * | | | | | | | | Merge branch 'refs/heads/ninja-internal-master' into bugfix-masterAnanya Sen2012-06-05
| | | | |\ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | IKNINJA-1645- fix - don't disable OK button on change of file typeAnanya Sen2012-06-05
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
| | | | | | | * | | | | | | fixing a rotation and zoom bugValerio Virgillito2012-06-06
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| | | | | | | * | | | | | | Merge branch 'refs/heads/master' into element-model-fixesValerio Virgillito2012-06-06
| | | | | | | |\ \ \ \ \ \ \ | | | | |_|_|_|/ / / / / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: js/document/models/html.js js/document/views/design.js Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| | | * | | | | | | | | | | Merge pull request #277 from joseeight/DocumentValerio Virgillito2012-06-06
| | | |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixing referencing, also clean up
| | | | * | | | | | | | | | | Cleaning more.Jose Antonio Marquez2012-06-06
| | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | Cleaning upJose Antonio Marquez2012-06-06
| | | | | |_|/ / / / / / / / | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Removed reference of model in design view, clean up slightly, need to implement binding later.
| | | * | | | | | | | | | | Merge pull request #272 from pushkarjoshi/pentoolValerio Virgillito2012-06-06
| | | |\ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / | | | |/| | | | | | | | | / | | | | | |_|_|_|_|_|_|_|/ | | | | |/| | | | | | | | Pentool
| | | | * | | | | | | | | added gradients to pen path runtimePushkar Joshi2012-06-06
| | | | | |_|_|_|_|_|_|/ | | | | |/| | | | | | |
| | | | * | | | | | | | updated the ninja library version (now contains brushstroke and pen path ↵Pushkar Joshi2012-06-05
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | rendering)
| | | | * | | | | | | | Merge branch 'master' into pentoolPushkar Joshi2012-06-05
| | | | |\ \ \ \ \ \ \ \
| | | | * | | | | | | | | handle switching between multiple documents for Pen tool by having its own ↵Pushkar Joshi2012-06-05
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | selection change handler
| | | | * | | | | | | | | enable gradients for pen stroke and fillPushkar Joshi2012-06-05
| | | | | | | | | | | | |
| | | | * | | | | | | | | Merge branch 'master' into pentoolPushkar Joshi2012-06-04
| | | | |\ \ \ \ \ \ \ \ \ | | | | | |_|_|_|_|_|_|_|/ | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: js/tools/PenTool.js
| | | | * | | | | | | | | change the behavior of what happens when alt is pressed while moving anchor ↵Pushkar Joshi2012-05-31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | handles (the behavior now matches the design)
| | | | * | | | | | | | | somewhat working version of the canvas runtime for pen paths (the runtime ↵Pushkar Joshi2012-05-31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | renders properly if we go through debugger)...also removed calls to getStageElement from pen tool
| | | | * | | | | | | | | Merge branch 'master' into pentoolPushkar Joshi2012-05-31
| | | | |\ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | move all the subpath functions to its prototype, and first version of the ↵Pushkar Joshi2012-05-31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | pen path runtime
| | | | * | | | | | | | | | working version of the pen plus subtoolPushkar Joshi2012-05-30
| | | | | | | | | | | | | |
| | | | * | | | | | | | | | working version of Pen minus subtoolPushkar Joshi2012-05-30
| | | | | | | | | | | | | |
| | | | * | | | | | | | | | More consistent local and global mouse coords which solves a bug with the ↵Pushkar Joshi2012-05-29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Pen minus subtool not removing 1 anchor paths
| | | | * | | | | | | | | | rename dragging plane to dragPlane (for consistency with ShapeTool)Pushkar Joshi2012-05-29
| | | | | |_|_|_|_|_|_|_|/ | | | | |/| | | | | | | |
| | | | * | | | | | | | | allow changes in the pen subtool in options to be seen by the pen tool code ↵Pushkar Joshi2012-05-22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (can now select the pen plus, pen minus subtools) AND add keyboard shortcut for brush tool
| | | | * | | | | | | | | Merge branch 'master' into pentoolPushkar Joshi2012-05-21
| | | | |\ \ \ \ \ \ \ \ \ | | | | | | |_|_|_|_|_|_|/ | | | | | |/| | | | | | |
| | | | * | | | | | | | | handle anchor point deletion correctly (does not yet fully work for ↵Pushkar Joshi2012-05-11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PEN-MINUS subtool)
| | | | * | | | | | | | | Merge branch 'master' into pentoolPushkar Joshi2012-05-11
| | | | |\ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | code cleanup and starting the subtool functionalityPushkar Joshi2012-05-11
| | | | | | | | | | | | | |
| | | | * | | | | | | | | | Merge branch 'master' into pentoolPushkar Joshi2012-05-07
| | | | |\ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | |