| Commit message (Collapse) | Author | Age | |
|---|---|---|---|
| * | Merge branch 'refs/heads/NINJAmaster' into TimelineUber | Jonathan Duran | 2012-03-29 |
| |\ | |||
| | * | Merge pull request #145 from ericguzman/PresetsPI | Valerio Virgillito | 2012-03-28 |
| | |\ | | | | | | | Presets - Adding presets controller | ||
| | | * | Text Tool - Remove inline style from user document | Eric Guzman | 2012-03-27 |
| | | | | |||
| | * | | Check for webGLWorld before calling draw. | Nivesh Rajbhandari | 2012-03-27 |
| | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
| | * | | Handle no-color/null. | Nivesh Rajbhandari | 2012-03-26 |
| | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
| | * | | Updating EyeDropper tool to support new JSON data format for WebGL. | Nivesh Rajbhandari | 2012-03-26 |
| | |/ | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
| * / | Timeline : Bug Fix : IKNINJA 1374 | Jonathan Duran | 2012-03-23 |
| |/ | | | | | Signed-off-by: Kruti Shah <kruti.shah@motorola.com> Signed-off-by: Jonathan Duran <jduran@motorola.com> | ||
| * | Squashed commit of SnapManagerFixes | Valerio Virgillito | 2012-03-16 |
| | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| * | Merge branch 'master' into pentool | Pushkar Joshi | 2012-03-13 |
| |\ | |||
| | * | Merge pull request #110 from mqg734/WebGLFixes | Valerio Virgillito | 2012-03-13 |
| | |\ | | | | | | | Gradient Support for Shapes and Eyedropper support for gradients. Also fixed 3d bug when moving multiple selections in 3d using the Selection Tool | ||
| | | * | Fixed element mediator, PI, and eye-dropper to handle different borders ↵ | Nivesh Rajbhandari | 2012-03-12 |
| | | | | | | | | | | | | | | | | | | | sides and gradients. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
| | | * | Fixing selection tool when moving multiple selection in 3d mode. | Nivesh Rajbhandari | 2012-03-09 |
| | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
| | | * | Eyedropper support for getting color value from webgl shapes. | Nivesh Rajbhandari | 2012-03-09 |
| | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
| | | * | Eyedropper now supports strokes in rectangle shapes. | Nivesh Rajbhandari | 2012-03-07 |
| | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
| | | * | Merge branch 'refs/heads/ninja-internal' into WebGLFixes | Nivesh Rajbhandari | 2012-03-06 |
| | | |\ | |||
| | | * | | Create drag plane parallel to working plane and offset by where the user ↵ | Nivesh Rajbhandari | 2012-03-06 |
| | | | | | | | | | | | | | | | | | | | | | | | | | clicked in z. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
| | | * | | Do not use transform code if transform mode is off. | Nivesh Rajbhandari | 2012-03-05 |
| | | | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
| | | * | | We should show snap marker on mouse move even if user hasn't moused down yet. | Nivesh Rajbhandari | 2012-03-02 |
| | | | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
| * | | | | turn off the fill color for pen tool paths by default | Pushkar Joshi | 2012-03-13 |
| |/ / / | |||
| * | | | bug fixes for spline interpolation | Pushkar Joshi | 2012-03-12 |
| | | | | | | | | | | | | | | | | | | | | | | AND Laplacian smoothing for denoising AND code cleanup (removing blocks of commented code) | ||
| * | | | brush stroke options for calligraphic brush style | Pushkar Joshi | 2012-03-08 |
| | | | | |||
| * | | | implement stroke hardness such that it is percentage of the stroke width ↵ | Pushkar Joshi | 2012-03-07 |
| | | | | | | | | | | | | | | | | | | | | | | that's fully the color of the brush AND add a smoothing flag for the brush options | ||
| * | | | Merge branch 'master' into pentool | Pushkar Joshi | 2012-03-06 |
| |\ \ \ | | |/ | |/| | |||
| | * | | Squashed commit of preload-fix into Master | Valerio Virgillito | 2012-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> | ||
| * | | Merge branch 'master' into pentool | Pushkar Joshi | 2012-03-05 |
| |\| | |||
| | * | Fixing flying off into space bug for translate tool too. | Nivesh Rajbhandari | 2012-03-02 |
| | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
| | * | Don't draw transform handles if the stage is the target element. | Nivesh Rajbhandari | 2012-03-02 |
| | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
| | * | Fix for jumping issue when moving items that have any 3d on them. | Nivesh Rajbhandari | 2012-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 Rajbhandari | 2012-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 Rajbhandari | 2012-03-01 |
| | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
| | * | Re-fixing IKNinja-940 - Can't select objects when in side/top view. | Nivesh Rajbhandari | 2012-03-01 |
| | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
| | * | Last-used material (instead of FlatMaterial) is applied to shape when ↵ | Nivesh Rajbhandari | 2012-02-29 |
| | | | | | | | | | | | | | turning on use WebGL checkbox in the PI. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
| * | | Merge branch 'brushtool' into pentool | Pushkar Joshi | 2012-03-02 |
| |\ \ | |||
| | * | | Merge branch 'master' into brushtool | Pushkar Joshi | 2012-03-02 |
| | |\| | |||
| | | * | Merge pull request #88 from mqg734/ToolFixes | Valerio Virgillito | 2012-02-29 |
| | | |\ | | | | | | | | | Fix for performance issue when moving shapes. | ||
| | | | * | Fix for performance issue when moving shapes. We don't need to call render ↵ | Nivesh Rajbhandari | 2012-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/brushtool | Valerio Virgillito | 2012-02-29 |
| | | |\ \ | | | | | | | | | | | Brushtool | ||
| | | * \ \ | Merge branch 'integration-candidate' of ↵ | Valerio Virgillito | 2012-02-28 |
| | | |\ \ \ | | | | | | | | | | | | | | | | | | | github.com:Motorola-Mobility/ninja-internal into integration-candidate | ||
| | | | * \ \ | Merge pull request #79 from pushkarjoshi/pentool | Valerio Virgillito | 2012-02-28 |
| | | | |\ \ \ | | | | | | | | | | | | | | | Pentool | ||
| | | * | \ \ \ | Merge branch 'ToolFixes' of https://github.com/mqg734/ninja-internal into ↵ | Valerio Virgillito | 2012-02-28 |
| | | |\ \ \ \ \ | | | |/ / / / | | |/| | | / | | | | |_|/ | | | |/| | | integration-candidate | ||
| | | | * | | | Fix for "jumping" issue when using the selection tool repeatedly. | Nivesh Rajbhandari | 2012-02-28 |
| | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
| | | * | | | | Merge branch 'integration' of https://github.com/ericmueller/ninja-internal ↵ | Valerio Virgillito | 2012-02-28 |
| | | |\ \ \ \ | | | |/ / / | | |/| | | | | | | | | | into integration-candidate | ||
| | | | * | | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into ↵ | hwc487 | 2012-02-28 |
| | | | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | integration | ||
| | | | * | | | | Enable shift key constraint for Pan Tool. | hwc487 | 2012-02-27 |
| | | | | | | | | |||
| | | | * | | | | bug fixes for canvas 2d shape drawing. | hwc487 | 2012-02-23 |
| | | | | | | | | |||
| | | | * | | | | Merge branch 'ToolFixes' of github.com:mqg734/ninja-internal into integration | hwc487 | 2012-02-22 |
| | | | |\ \ \ \ | |||
| | | | * \ \ \ \ | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into ↵ | hwc487 | 2012-02-22 |
| | | | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | integration | ||
| | | | * | | | | | | Adding bug fixes. | hwc487 | 2012-02-22 |
| | | | | | | | | | | |||
| | | * | | | | | | | Reset translation values as well when double-clicking to reset the rotation ↵ | Nivesh Rajbhandari | 2012-02-27 |
| | | | |_|_|/ / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | values. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
| | * | | | | | | | Catmull-Rom spline sampling for the brush stroke, and options for stroke ↵ | Pushkar Joshi | 2012-03-02 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | size, stroke hardness and both stroke colors (left and right --- temporarily using the stroke and fill colors respectively) | ||