aboutsummaryrefslogtreecommitdiff
path: root/js/tools
Commit message (Collapse)AuthorAge
* Merge branch 'ToolFixes' of github.com:mqg734/ninja-internal into integrationhwc4872012-02-29
|\
| * 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>
| * Fix for "jumping" issue when using the selection tool repeatedly.Nivesh Rajbhandari2012-02-28
| | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| * 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>
* | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into ↵hwc4872012-02-28
|\| | | | | | | integration
| * 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>
* | 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 'refs/heads/ninja-internal' into ToolFixesNivesh Rajbhandari2012-02-22
| |\
| * | 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 'master' of github.com:Motorola-Mobility/ninja-internal into ↵hwc4872012-02-22
|\ \ \ | | |/ | |/| | | | integration
| * | 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>
* | | Adding bug fixes.hwc4872012-02-22
| |/ |/|
* | 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
| |\ \ \ \
| * \ \ \ \ Merge branch 'refs/heads/NinjaInternal' into FileIOJose Antonio Marquez2012-02-08
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'refs/heads/NinjaInternal' into FileIOJose Antonio Marquez2012-02-06
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'refs/heads/NinjaInternal' into FileIOJose Antonio Marquez2012-02-02
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: .gitignore js/ninja.reel/ninja.js
| * | | | | | | | Merged old FileIOJose Antonio Marquez2012-01-27
| | | | | | | | |
* | | | | | | | | Get color under mouse point from image or canvas.Nivesh Rajbhandari2012-02-14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
* | | | | | | | | Get color from canvas and images.Nivesh Rajbhandari2012-02-14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
* | | | | | | | | Check if eyedropper is over border or background.Nivesh Rajbhandari2012-02-13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
* | | | | | | | | Fixed issue with tools not drawing their handles when mousing up.Nivesh Rajbhandari2012-02-13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
* | | | | | | | | Fixed eyedropper tool to use new color routines.Nivesh Rajbhandari2012-02-13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
* | | | | | | | | Updated ink bottle tool to use new setColor routine in the mediator and ↵Nivesh Rajbhandari2012-02-13
| |_|_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | controllers. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
* | | | | | | | Merge branch 'text-tool' of https://github.com/dhg637/ninja-internal into ↵Valerio Virgillito2012-02-09
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / |/| | | | | | / | | |_|_|_|_|/ | |/| | | | | feature-branch
| * | | | | | More Text Tool UpdatesArmen Kesablyan2012-02-09
| | | | | | |
| * | | | | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into ↵Armen Kesablyan2012-02-07
| |\ \ \ \ \ \ | | | |_|/ / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | text-tool Conflicts: _scss/compass_app_log.txt css/ninja.css
| * | | | | | Refactored rich text editor locationArmen Kesablyan2012-02-07
| | | | | | |
| * | | | | | Initial Text tool completion.Armen Kesablyan2012-02-07
| | | | | | |
| * | | | | | Initial Text Tool ImplementationArmen Kesablyan2012-02-02
| | |/ / / / | |/| | | | | | | | | | | | | | | | Has rich-text-editor in place need to place with finalized version when complete
* | | | | | Merge branch 'refs/heads/ninja-internal' into SnapManagerFixesNivesh Rajbhandari2012-02-09
|\ \ \ \ \ \ | | |_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: js/helper-classes/RDGE/Materials/FlatMaterial.js Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| * | | | | Merge branch 'master' into pentoolPushkar Joshi2012-02-08
| |\ \ \ \ \ | | | |_|_|/ | | |/| | | | | | | | | | | | | | | | | | | | | Conflicts: js/helper-classes/RDGE/GLWorld.js js/helper-classes/RDGE/MaterialsLibrary.js
| * | | | | bug fixes for better anchor point rotation and removing snapping on hover ↵Pushkar Joshi2012-02-08
| | | | | | | | | | | | | | | | | | | | | | | | and mouse down
| * | | | | some minor bug fixes and code cleanupPushkar Joshi2012-02-07
| | | | | |
| * | | | | Merge branch 'master' into pentoolPushkar Joshi2012-02-07
| |\ \ \ \ \ | | | |_|/ / | | |/| | |
| * | | | | Merge branch 'working' of c:/Code/github/emueller/ninja-internal/ into pentoolPushkar Joshi2012-02-02
| |\ \ \ \ \
| | * | | | | listen for the appMouseUp event in the Pan toolhwc4872012-02-01
| | | | | | |
| | * | | | | Fix for a marquee zoom bug.hwc4872012-02-01
| | | | | | |