aboutsummaryrefslogtreecommitdiff
path: root/js/tools
Commit message (Expand)AuthorAge
...
| | * Merge branch 'text-tool' of https://github.com/dhg637/ninja-internal into int...Valerio Virgillito2012-02-14
| | |\
| | | * Merge branch 'refs/heads/master' into text-toolArmen Kesablyan2012-02-13
| | | |\
| | | * | Fixed Color on text edit. Also Fixed Indent & Outdent button. toggle bullet a...Armen Kesablyan2012-02-13
| | * | | Merge branch 'refs/heads/NinjaInternal' into FileIOJose Antonio Marquez2012-02-10
| | |\ \ \ | | | | |/ | | | |/|
| | * | | 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
| | |\ \ \ \ \ \ \
| | * | | | | | | | Merged old FileIOJose Antonio Marquez2012-01-27
| * | | | | | | | | Get color under mouse point from image or canvas.Nivesh Rajbhandari2012-02-14
| * | | | | | | | | Get color from canvas and images.Nivesh Rajbhandari2012-02-14
| * | | | | | | | | Check if eyedropper is over border or background.Nivesh Rajbhandari2012-02-13
| * | | | | | | | | Fixed issue with tools not drawing their handles when mousing up.Nivesh Rajbhandari2012-02-13
| * | | | | | | | | Fixed eyedropper tool to use new color routines.Nivesh Rajbhandari2012-02-13
| * | | | | | | | | Updated ink bottle tool to use new setColor routine in the mediator and contr...Nivesh Rajbhandari2012-02-13
| | |_|_|_|_|_|/ / | |/| | | | | | |
| * | | | | | | | Merge branch 'text-tool' of https://github.com/dhg637/ninja-internal into fea...Valerio Virgillito2012-02-09
| |\ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / | |/| | | | | | / | | | |_|_|_|_|/ | | |/| | | | |
| | * | | | | | More Text Tool UpdatesArmen Kesablyan2012-02-09
| | * | | | | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into tex...Armen Kesablyan2012-02-07
| | |\ \ \ \ \ \ | | | | |_|/ / / | | | |/| | | |
| | * | | | | | Refactored rich text editor locationArmen Kesablyan2012-02-07
| | * | | | | | Initial Text tool completion.Armen Kesablyan2012-02-07
| | * | | | | | Initial Text Tool ImplementationArmen Kesablyan2012-02-02
| | | |/ / / / | | |/| | | |
* | | | | | | Merge branch 'master' into brushtoolPushkar Joshi2012-02-09
|\| | | | | |
| * | | | | | Merge branch 'refs/heads/ninja-internal' into SnapManagerFixesNivesh Rajbhandari2012-02-09
| |\ \ \ \ \ \ | | | |_|_|_|/ | | |/| | | |
| * | | | | | Fixed runtime error when using 3d tools without any items selected.Nivesh Rajbhandari2012-02-09
| * | | | | | Merging fix for marquee selection that accounts for 3d values.Nivesh Rajbhandari2012-02-08
| | |_|_|_|/ | |/| | | |
* | | | | | first phase of simple resampling to prevent tiny segmentsPushkar Joshi2012-02-09
| |/ / / / |/| | | |
* | | | | Merge branch 'master' into pentoolPushkar Joshi2012-02-08
|\| | | |
| * | | | Merge pull request #21 from mencio/pi_bugsValerio Virgillito2012-02-08
| |\ \ \ \
| | * | | | IKNINJA - 1084: Fixing the custom tag.Valerio Virgillito2012-02-07
| | * | | | IKNINJA-964 - Fixed inconsistent element name in PI/CSS panel.Valerio Virgillito2012-02-07
| | | |/ / | | |/| |
| * | | | Updated tools and PI to get/set materials by binding to appModel's materials ...Nivesh Rajbhandari2012-02-07
| * | | | Support use WebGL checkbox in the PI.Nivesh Rajbhandari2012-02-06
| |/ / /
* | | | bug fixes for better anchor point rotation and removing snapping on hover and...Pushkar Joshi2012-02-08
* | | | some minor bug fixes and code cleanupPushkar Joshi2012-02-07
* | | | Merge branch 'master' into pentoolPushkar Joshi2012-02-07
|\| | |
| * | | Update element planes after shapes are created so stage grid updates.Nivesh Rajbhandari2012-02-03
| * | | Merge branch 'refs/heads/NiveshColor' into ToolFixesNivesh Rajbhandari2012-02-03
| |\ \ \ | | |_|/ | |/| |
| | * | Removed border special-casing from PI since the mediator now handles this gen...Nivesh Rajbhandari2012-02-01
| | * | Updated color code in the PI to go through element mediator.Nivesh Rajbhandari2012-02-01
| | |/
| * | Integrating Pan and Zoom tool and snap manager fixes.Nivesh Rajbhandari2012-02-02
* | | 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
| * | | mouse wheel for zoom toolhwc4872012-02-01
| * | | Merge branch 'ToolFixes' of github.com:mqg734/ninja-internal into workinghwc4872012-01-31
| |\| |
| | * | Forgot to remove a require in previous checkin.Nivesh Rajbhandari2012-01-30
| | * | Syncing stage view when rotating stage.Nivesh Rajbhandari2012-01-30
| | |/
| * / updated from old repohwc4872012-01-27
| |/
* | avoid overriding GlGeomObj translate methodPushkar Joshi2012-02-01