Commit message (Collapse) | Author | Age | |
---|---|---|---|
* | changed the registration point of the brush tool icon and | Pushkar Joshi | 2012-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 Joshi | 2012-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 brushtool | Pushkar Joshi | 2012-02-28 |
|\ | |||
| * | Merge branch 'master' into pentool | Pushkar Joshi | 2012-02-28 |
| |\ | | | | | | | | | | | | | Conflicts: manifest.json | ||
| | * | Moved all color updating routines to a single function. | Nivesh Rajbhandari | 2012-02-24 |
| | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
| | * | Distinguish between border top/right/bottom/left colors. Also, fall back to ↵ | Nivesh Rajbhandari | 2012-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 Rajbhandari | 2012-02-24 |
| | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
| * | | new anchor control guide rendering (smaller handles) | Pushkar Joshi | 2012-02-28 |
| | | | | | | | | | | | | | | | and clamp min. width and height to 1 while resizing subpaths | ||
| * | | Bug fixes: | Pushkar Joshi | 2012-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 'pentool' into brushtool | Pushkar Joshi | 2012-02-24 |
|\| | | | | | | | | | | | Conflicts: imports/codemirror/mode/scheme/scheme.js js/tools/BrushTool.js | ||
| * | Integrating Zoom tool fixes. | Nivesh Rajbhandari | 2012-02-22 |
| | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
| * | Merge branch 'refs/heads/ninja-internal' into ToolFixes | Nivesh Rajbhandari | 2012-02-22 |
| |\ | |||
| | * | enabling nested selection | Valerio Virgillito | 2012-02-20 |
| | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| | * | formatting cleanup | Valerio Virgillito | 2012-02-20 |
| | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| * | | Fixing eyedropper tool to get color from image data. This required us to ↵ | Nivesh Rajbhandari | 2012-02-22 |
| | | | | | | | | | | | | | | | | | | workaround having inconsistent color object. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
| * | | Merge branch 'refs/heads/ninja-internal' into ToolFixes | Nivesh Rajbhandari | 2012-02-20 |
| |\| | |||
| | * | Adding a data-RDGE-id attribute to each canvas to save/load canvas data | Valerio Virgillito | 2012-02-16 |
| | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| | * | Merge branch 'text-tool' of https://github.com/dhg637/ninja-internal into ↵ | Valerio Virgillito | 2012-02-14 |
| | |\ | | | | | | | | | | | | | integration | ||
| | | * | Merge branch 'refs/heads/master' into text-tool | Armen Kesablyan | 2012-02-13 |
| | | |\ | |||
| | | * | | Fixed Color on text edit. Also Fixed Indent & Outdent button. toggle bullet ↵ | Armen Kesablyan | 2012-02-13 |
| | | | | | | | | | | | | | | | | | | | | and numbered now bound to text tool | ||
| | * | | | Merge branch 'refs/heads/NinjaInternal' into FileIO | Jose Antonio Marquez | 2012-02-10 |
| | |\ \ \ | | | | |/ | | | |/| | | | | | | | | | | | | | | | | Conflicts: js/ninja.reel/ninja.html js/stage/stage.reel/stage.html | ||
| | * | | | Merge branch 'refs/heads/NinjaInternal' into FileIO | Jose Antonio Marquez | 2012-02-09 |
| | |\ \ \ | |||
| | * \ \ \ | Merge branch 'refs/heads/NinjaInternal' into FileIO | Jose Antonio Marquez | 2012-02-09 |
| | |\ \ \ \ | |||
| | * \ \ \ \ | Merge branch 'refs/heads/NinjaInternal' into FileIO | Jose Antonio Marquez | 2012-02-08 |
| | |\ \ \ \ \ | |||
| | * \ \ \ \ \ | Merge branch 'refs/heads/NinjaInternal' into FileIO | Jose Antonio Marquez | 2012-02-06 |
| | |\ \ \ \ \ \ | |||
| | * \ \ \ \ \ \ | Merge branch 'refs/heads/NinjaInternal' into FileIO | Jose Antonio Marquez | 2012-02-02 |
| | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: .gitignore js/ninja.reel/ninja.js | ||
| | * | | | | | | | | Merged old FileIO | Jose Antonio Marquez | 2012-01-27 |
| | | | | | | | | | | |||
| * | | | | | | | | | Get color under mouse point from image or canvas. | Nivesh Rajbhandari | 2012-02-14 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
| * | | | | | | | | | Get color from canvas and images. | Nivesh Rajbhandari | 2012-02-14 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
| * | | | | | | | | | Check if eyedropper is over border or background. | Nivesh Rajbhandari | 2012-02-13 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
| * | | | | | | | | | Fixed issue with tools not drawing their handles when mousing up. | Nivesh Rajbhandari | 2012-02-13 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
| * | | | | | | | | | Fixed eyedropper tool to use new color routines. | Nivesh Rajbhandari | 2012-02-13 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
| * | | | | | | | | | Updated ink bottle tool to use new setColor routine in the mediator and ↵ | Nivesh Rajbhandari | 2012-02-13 |
| | |_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | controllers. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
| * | | | | | | | | Merge branch 'text-tool' of https://github.com/dhg637/ninja-internal into ↵ | Valerio Virgillito | 2012-02-09 |
| |\ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / | |/| | | | | | / | | | |_|_|_|_|/ | | |/| | | | | | feature-branch | ||
| | * | | | | | | More Text Tool Updates | Armen Kesablyan | 2012-02-09 |
| | | | | | | | | |||
| | * | | | | | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into ↵ | Armen Kesablyan | 2012-02-07 |
| | |\ \ \ \ \ \ | | | | |_|/ / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | text-tool Conflicts: _scss/compass_app_log.txt css/ninja.css | ||
| | * | | | | | | Refactored rich text editor location | Armen Kesablyan | 2012-02-07 |
| | | | | | | | | |||
| | * | | | | | | Initial Text tool completion. | Armen Kesablyan | 2012-02-07 |
| | | | | | | | | |||
| | * | | | | | | Initial Text Tool Implementation | Armen Kesablyan | 2012-02-02 |
| | | |/ / / / | | |/| | | | | | | | | | | | | | | | | | | Has rich-text-editor in place need to place with finalized version when complete | ||
* | | | | | | | Merge branch 'master' into brushtool | Pushkar Joshi | 2012-02-09 |
|\| | | | | | | |||
| * | | | | | | Merge branch 'refs/heads/ninja-internal' into SnapManagerFixes | Nivesh Rajbhandari | 2012-02-09 |
| |\ \ \ \ \ \ | | | |_|_|_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: js/helper-classes/RDGE/Materials/FlatMaterial.js Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
| * | | | | | | Fixed runtime error when using 3d tools without any items selected. | Nivesh Rajbhandari | 2012-02-09 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
| * | | | | | | Merging fix for marquee selection that accounts for 3d values. | Nivesh Rajbhandari | 2012-02-08 |
| | |_|_|_|/ | |/| | | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
* | | | | | | first phase of simple resampling to prevent tiny segments | Pushkar Joshi | 2012-02-09 |
| |/ / / / |/| | | | | |||
* | | | | | Merge branch 'master' into pentool | Pushkar Joshi | 2012-02-08 |
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: js/helper-classes/RDGE/GLWorld.js js/helper-classes/RDGE/MaterialsLibrary.js | ||
| * | | | | Merge pull request #21 from mencio/pi_bugs | Valerio Virgillito | 2012-02-08 |
| |\ \ \ \ | | | | | | | | | | | | | Pi bugs fixes for 964, 616, 1084 | ||
| | * | | | | IKNINJA - 1084: Fixing the custom tag. | Valerio Virgillito | 2012-02-07 |
| | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| | * | | | | IKNINJA-964 - Fixed inconsistent element name in PI/CSS panel. | Valerio Virgillito | 2012-02-07 |
| | | |/ / | | |/| | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| * | | | | Updated tools and PI to get/set materials by binding to appModel's materials ↵ | Nivesh Rajbhandari | 2012-02-07 |
| | | | | | |< |