aboutsummaryrefslogtreecommitdiff
path: root/js
Commit message (Collapse)AuthorAge
...
| | * | | | | | Don't update the plane matrix of subpaths that already have a plane matrixPushkar Joshi2012-04-06
| | | | | | | |
| | * | | | | | code cleanup and working version of selected path anchor point and overlay ↵Pushkar Joshi2012-04-06
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | display for new paths
| | * | | | | | complete version of the code for rendering selected subpath anchor points ↵Pushkar Joshi2012-04-06
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | and path overlay (code needs cleanup)...still buggy if creating new paths
| | * | | | | | Merge branch 'master' into pentoolPushkar Joshi2012-04-04
| | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: js/tools/PenTool.js
| | * | | | | | | draw the path overlay (and anchor points) taking into account the ↵Pushkar Joshi2012-04-04
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | transformation applied to the element canvas and the stage canvas. Still quite buggy.
| | * | | | | | | Merge branch 'master' into pentoolPushkar Joshi2012-04-03
| | |\ \ \ \ \ \ \
| | * | | | | | | | working File I/O for pen tool created paths and some minor bug fixes ↵Pushkar Joshi2012-04-03
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (correctly setting the canvas for brush stroke file I/O, correct plane matrix for file I/O)
| | * | | | | | | | track the canvas top left position instead of the center position to figure ↵Pushkar Joshi2012-04-03
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | out when to translate the subpath per canvas translation...this one seems to not drift (no floating point issues uncovered so far)
| | * | | | | | | | First attempt at preventing the drifting of the canvas due to floating point ↵Pushkar Joshi2012-04-03
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | roundoff errors when constantly changing stroke width
| | * | | | | | | | render the pen path with local coordinates, but use stage world coordinates ↵Pushkar Joshi2012-04-02
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | to position the canvas on which the path is rendered AND add data-montage- to the ids in the pen and brush reels AND fix a bug with pen stroke transparency not working
| | * | | | | | | | adjust the position for the pen tool feedback cursor AND fix a bug where ↵Pushkar Joshi2012-03-28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | everything selected gets deleted (even if we have a selected subpath)
| | * | | | | | | | change cursors for pen tool realtime feedback....still need to position the ↵Pushkar Joshi2012-03-28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | cursors correctly over the exact mouse position AND reduce the radius (distance threshold) for picking paths
| | * | | | | | | | Merge branch 'brushtool' into pentoolPushkar Joshi2012-03-28
| | |\ \ \ \ \ \ \ \
| | * | | | | | | | | added cursors to the pen tool UI AND change cursor when the user hovers over ↵Pushkar Joshi2012-03-27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | an anchor point or handles of thte selected anchor
| * | | | | | | | | | Fixed materials editor popup not refreshing correctly.Nivesh Rajbhandari2012-04-16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
* | | | | | | | | | | Merge branch 'refs/heads/Ninja-Internal' into DocumentJose Antonio Marquez2012-04-24
|\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|/ / | |/| | | | | | | | |
| * | | | | | | | | | Merge branch 'refs/heads/master' into stage-document-architectureValerio Virgillito2012-04-23
| |\ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|/ | | |/| | | | | | | |
| | * | | | | | | | | Merge branch 'refs/heads/master' into cleanupValerio Virgillito2012-04-19
| | |\ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|/ | | | |/| | | | | | |
| | | * | | | | | | | Merge pull request #168 from mqg734/EricMergeValerio Virgillito2012-04-19
| | | |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Merging Eric's snapping and tool fixes into master.
| | | | * | | | | | | | Moving initialzeSnapping routine from RotateObject3DTool tool to ↵Nivesh Rajbhandari2012-04-18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Rotate3DToolBase so Rotate Stage uses the same code. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| | | | * | | | | | | | Merge branch 'refs/heads/ninja-internal' into EricMergeNivesh Rajbhandari2012-04-18
| | | | |\ \ \ \ \ \ \ \
| | | | * | | | | | | | | Fixing some more merge issues.Nivesh Rajbhandari2012-04-18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| | | | * | | | | | | | | Merge branch 'refs/heads/ninja-internal' into EricMergeNivesh Rajbhandari2012-04-18
| | | | |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: js/tools/Rotate3DToolBase.js js/tools/RotateStage3DTool.js js/tools/Translate3DToolBase.js js/tools/modifier-tool-base.js Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| | | | * \ \ \ \ \ \ \ \ \ Merge branch 'refs/heads/Snapping_II' into EricMergeNivesh Rajbhandari2012-04-18
| | | | |\ \ \ \ \ \ \ \ \ \
| | | | | * | | | | | | | | | Allow snapping to unselected objectshwc4872012-04-17
| | | | | | | | | | | | | | |
| | | | | * | | | | | | | | | snapping for stage rotation toolhwc4872012-04-16
| | | | | | | | | | | | | | |
| | | | | * | | | | | | | | | 3D translation fixeshwc4872012-04-16
| | | | | | | | | | | | | | |
| | | | | * | | | | | | | | | 3D rotationhwc4872012-04-13
| | | | | | | | | | | | | | |
| | | | | * | | | | | | | | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into ↵hwc4872012-04-13
| | | | | |\ \ \ \ \ \ \ \ \ \ | | | | | | | |_|/ / / / / / / | | | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Snapping_II Conflicts: js/helper-classes/3D/view-utils.js js/panels/presets/animations-presets.reel/animations-presets.js js/panels/presets/style-presets.reel/style-presets.js js/panels/presets/transitions-presets.reel/transitions-presets.js js/tools/Translate3DToolBase.js
| | | | | * | | | | | | | | | 3D Rotate changeshwc4872012-04-13
| | | | | | | | | | | | | | |
| |</