aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
...
| * | | | | | | | | | 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
| |\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | handle delete more correctly than before (selected subpaths are ↵Pushkar Joshi2012-05-04
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | deleted)....this is buggy when the second anchor of a two-anchor subpath is deleted (since the first anchor needs to be converted back into stage world coords)
| * | | | | | | | | | | flip the action of the alt key when modifying anchor handles (this ↵Pushkar Joshi2012-05-02
| | |_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | essentially forces the need for a keyboard...must be addressed by a fix later on)
| * | | | | | | | | | undo some previous change that was halving the alpha value of the strokePushkar Joshi2012-05-01
| | | | | | | | | | |
| * | | | | | | | | | small code changes (mostly re-org)Pushkar Joshi2012-05-01
| | | | | | | | | | |
| * | | | | | | | | | handle left button up correctly for the brush toolPushkar Joshi2012-05-01
| | | | | | | | | | |
| * | | | | | | | | | Fixed 1436 Brush: Calligraphic brushstroke is slightly thicker than the ↵Pushkar Joshi2012-05-01
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | round tip brushstroke
| * | | | | | | | | | prevent alpha values from accumulating over 1 due to rounding...fixes 1443 ↵Pushkar Joshi2012-05-01
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Brush: Odd painting behavior when Hardness is 99%. A solid outline is shown on the brushstroke.
| * | | | | | | | | | scale the brush stroke according to the input width and heightPushkar Joshi2012-04-27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes: 1444 Brush: Unable to scale brushstroke using the Transform handles
| * | | | | | | | | | Merge branch 'master' into pentoolPushkar Joshi2012-04-27
| |\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Fix for 1524 Pen: Unable to add anchor to a closed pathPushkar Joshi2012-04-27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ---behavior is unchanged, but the realtime feedback for the tool (i.e. mouse cursor) will correctly reflect that a click after closing a path will start a new path, not add to that path
| * | | | | | | | | | | add event handlers for open, close, and switch document to pen tool, fixes:Pushkar Joshi2012-04-27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1532 Pen: Anchor points get carried over to the new document
| * | | | | | | | | | | Fix for 1525 Pen: "Uncaught RangeError: Maximum call stack size exceeded".Pushkar Joshi2012-04-27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (check if the second mouse click actually selects the existing first anchor point)
| | | | | | | | | | | * Merge branch 'refs/heads/master' into element-model-fixesValerio Virgillito2012-06-05
| | | | | | | | | | | |\ | |_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: js/mediators/element-mediator.js Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* | | | | | | | | | | | Merge pull request #273 from mqg734/TransformToolValerio Virgillito2012-06-05
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | | | Free Transform tool's handle should stop when it reaches the other end.
| * | | | | | | | | | | Free Transform tool's handle should stop when it reaches the other end.Nivesh Rajbhandari2012-06-05
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | IKNINJA-1335 - Free Transform tool: When one of the handles reaches the other end, the tool should stop. IKNINJA-1261 - [WebGL] [Shape] [Selection] Material shows in the middle of Canvas area if the shape is transformed toward negative coordinate. (This was happening because setting a canvas' width to 0 resets the canvas' width to 300.) Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
* | | | | | | | | | | | Merge pull request #267 from mqg734/ToolOptionsValerio Virgillito2012-06-05
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|/ / / |/| | | | | | | | | | | Updated ink bottle and fill tools to support tool options checkboxes and materials.
| * | | | | | | | | | | Merge branch 'refs/heads/ninja-internal' into ToolOptionsNivesh Rajbhandari2012-06-05
| |\ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|/ / | | |/| | | | | | | | |
| *