aboutsummaryrefslogtreecommitdiff
path: root/js/tools
Commit message (Collapse)AuthorAge
* Fixing selection tool when moving multiple selection in 3d mode.Nivesh Rajbhandari2012-03-12
| | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
* Fixing snapping bugs in Selection, translate and rotate tools.Nivesh Rajbhandari2012-03-12
| | | | | | | We should show snap marker on mouse move for selection tool prior to mousing down as well. We should create drag plane parallel to the view and where the user moused down. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
* Squashed commit of preload-fix into MasterValerio Virgillito2012-03-06
| | | | | | | - Requiring all the previously pre-loaded files - RDGE, Codemirror and gl-matrix are not included via a script tag. Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* Fixing flying off into space bug for translate tool too.Nivesh Rajbhandari2012-03-02
| | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
* Don't draw transform handles if the stage is the target element.Nivesh Rajbhandari2012-03-02
| | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
* Fix for jumping issue when moving items that have any 3d on them.Nivesh Rajbhandari2012-03-02
| | | | | | We can't translate 3d moves into 2d space due to perspective, so we must update the matrix3d values instead of the top-left values if items have 3d. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
* Fix for elements flying off into space when moving elements that overlap.Nivesh Rajbhandari2012-03-01
| | | | | | This was happening because our hit record's element and the browser's element from point did not match. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
* Fixed logic error when resizing with the top-left transform handles.Nivesh Rajbhandari2012-03-01
| | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
* Re-fixing IKNinja-940 - Can't select objects when in side/top view.Nivesh Rajbhandari2012-03-01
| | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
* Last-used material (instead of FlatMaterial) is applied to shape when ↵Nivesh Rajbhandari2012-02-29
| | | | | | turning on use WebGL checkbox in the PI. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
* Merge pull request #88 from mqg734/ToolFixesValerio Virgillito2012-02-29
|\ | | | | Fix for performance issue when moving shapes.
| * Fix for performance issue when moving shapes. We don't need to call render ↵Nivesh Rajbhandari2012-02-29
| | | | | | | | | | | | | | | | except if the geometry and materials change. This is more easy to see with shapes like the brush tool. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
* | Merge pull request #85 from pushkarjoshi/brushtoolValerio Virgillito2012-02-29
|\ \ | | | | | | Brushtool
| * | changed the registration point of the brush tool icon andPushkar Joshi2012-02-29
| | | | | | | | | | | | added a temporary check to prevent extremely long brush strokes
| * | resample the brush stroke so we don't have gaps if the path is drawn rapidly,Pushkar Joshi2012-02-29
| | | | | | | | | | | | | | | | | | | | | and, allow to change the stroke color, and, more efficient stroke rendering by drawing translated radial gradients (instead of creating new gradients for each stroke sample)
| * | Merge branch 'pentool' into brushtoolPushkar Joshi2012-02-28
| |\ \
| * \ \ Merge branch 'pentool' into brushtoolPushkar Joshi2012-02-24
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: imports/codemirror/mode/scheme/scheme.js js/tools/BrushTool.js
| * \ \ \ Merge branch 'master' into brushtoolPushkar Joshi2012-02-09
| |\ \ \ \
| * | | | | first phase of simple resampling to prevent tiny segmentsPushkar Joshi2012-02-09
| | | | | |
* | | | | | Merge branch 'integration-candidate' of ↵Valerio Virgillito2012-02-28
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | github.com:Motorola-Mobility/ninja-internal into integration-candidate
| * \ \ \ \ \ Merge pull request #79 from pushkarjoshi/pentoolValerio Virgillito2012-02-28
| |\ \ \ \ \ \ | | | |_|_|/ / | | |/| | | | Pentool
| | * | | | | Merge branch 'master' into pentoolPushkar Joshi2012-02-28
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: manifest.json
| | * | | | | | new anchor control guide rendering (smaller handles)Pushkar Joshi2012-02-28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | and clamp min. width and height to 1 while resizing subpaths
| | * | | | | | Bug fixes:Pushkar Joshi2012-02-28
| | | |_|_|/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1152: allow deleting of multiple paths from inside pen tool 1128: keyboard hotkey shortcut 'P' for pen tool 941: changing width or height of the path scales the path
* | | | | | | Merge branch 'ToolFixes' of https://github.com/mqg734/ninja-internal into ↵Valerio Virgillito2012-02-28
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | / | | |_|_|_|/ | |/| | | | integration-candidate
| * | | | | Fix for "jumping" issue when using the selection tool repeatedly.Nivesh Rajbhandari2012-02-28
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
* | | | | | Merge branch 'integration' of https://github.com/ericmueller/ninja-internal ↵Valerio Virgillito2012-02-28
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | | | | | | into integration-candidate
| * | | | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into ↵hwc4872012-02-28
| |\ \ \ \ \ | | | |/ / / | | |/| | | | | | | | | integration
| * | | | | Enable shift key constraint for Pan Tool.hwc4872012-02-27
| | | | | |
| * | | | | bug fixes for canvas 2d shape drawing.hwc4872012-02-23
| | | | | |
| * | | | | Merge branch 'ToolFixes' of github.com:mqg734/ninja-internal into integrationhwc4872012-02-22
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into ↵hwc4872012-02-22
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | integration
| * | | | | | | Adding bug fixes.hwc4872012-02-22
| | | | | | | |
* | | | | | | | Reset translation values as well when double-clicking to reset the rotation ↵Nivesh Rajbhandari2012-02-27
| |_|_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | values. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
* | | | | | | Moved all color updating routines to a single function.Nivesh Rajbhandari2012-02-24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
* | | | | | | Distinguish between border top/right/bottom/left colors. Also, fall back to ↵Nivesh Rajbhandari2012-02-24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | snapping routine when selecting only if the active tool allows snapping. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
* | | | | | | Adjusting fill and ink bottle cursors to match the tips of the icons.Nivesh Rajbhandari2012-02-24
| |_|_|/ / / |/| | | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
* | | | | | Integrating Zoom tool fixes.Nivesh Rajbhandari2012-02-22
| |_|/ / / |/| | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
* | | | | Merge branch 'refs/heads/ninja-internal' into ToolFixesNivesh Rajbhandari2012-02-22
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | enabling nested selectionValerio Virgillito2012-02-20
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * | | | formatting cleanupValerio Virgillito2012-02-20
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* | | | | Fixing eyedropper tool to get color from image data. This required us to ↵Nivesh Rajbhandari2012-02-22
| |/ / / |/| | | | | | | | | | | | | | | | | | | workaround having inconsistent color object. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
* | | | Merge branch 'refs/heads/ninja-internal' into ToolFixesNivesh Rajbhandari2012-02-20
|\| | |
| * | | Adding a data-RDGE-id attribute to each canvas to save/load canvas dataValerio Virgillito2012-02-16
| | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * | | Merge branch 'text-tool' of https://github.com/dhg637/ninja-internal into ↵Valerio Virgillito2012-02-14
| |\ \ \ | | | | | | | | | | | | | | | integration
| | * \ \ Merge branch 'refs/heads/master' into text-toolArmen Kesablyan2012-02-13
| | |\ \ \
| | * | | | Fixed Color on text edit. Also Fixed Indent & Outdent button. toggle bullet ↵Armen Kesablyan2012-02-13
| | | | | | | | | | | | | | | | | | | | | | | | and numbered now bound to text tool
| * | | | | Merge branch 'refs/heads/NinjaInternal' into FileIOJose Antonio Marquez2012-02-10
| |\ \ \ \ \ | | | |/ / / | | |/| | | | | | | | | | | | | | | | | | | | | Conflicts: js/ninja.reel/ninja.html js/stage/stage.reel/stage.html
| * | | | | Merge branch 'refs/heads/NinjaInternal' into FileIOJose Antonio Marquez2012-02-09
| |\ \ \ \ \ | | | |_|_|/ | | |/| | |
| * | | | | Merge branch 'refs/heads/NinjaInternal' into FileIOJose Antonio Marquez2012-02-09
| |\ \ \ \ \ | | | |_|_|/ | | |/| | |