| Commit message (Collapse) | Author | Age | |
|---|---|---|---|
| * | Need to set elementModel.isIn2DSnapCache flag to false when removing element ↵ | Nivesh Rajbhandari | 2012-04-04 |
| | | | | | | | from SnapManager's cache. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
| * | Squashed commit of Preparing for the montage undo-manager: Architecture changes | Valerio Virgillito | 2012-04-04 |
| | | | | | | | | | | Reworked the add and remove elements into 1 function which can take 1 or more elements. Removed the _element from the selection array Many other changes related to those 2 changes Undo/Redo shortcuts are now using montage undo/redo manager. Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| * | File IO for the brush stroke AND changing the data type of brush stroke from ↵ | Pushkar Joshi | 2012-03-27 |
| | | | | | GEOM_TYPE_CUBIC_BEZIER to GEOM_TYPE_BRUSH_STROKE | ||
| * | Merge branch 'master' into brushtool | Pushkar Joshi | 2012-03-27 |
| |\ | | | | | | | | | Conflicts: js/controllers/elements/shapes-controller.js | ||
| | * | Squashed commit of the following GL integration | Valerio Virgillito | 2012-03-22 |
| | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| | * | Merge branch 'refs/heads/master' into montage-integration | Valerio Virgillito | 2012-03-21 |
| | |\ | |||
| | | * | Fixing error in drawUtils when closing document - should set _eltArray and ↵ | Nivesh Rajbhandari | 2012-03-20 |
| | | | | | | | | | | | | | | | | | | | _planesArray's length to 0 instead of setting the arrays to null. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
| | * | | Fixed snap-manager to stop snapping after first level children. | Nivesh Rajbhandari | 2012-03-17 |
| | |/ | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
| * / | Almost working version of brush tool that uses only local coordinates to ↵ | Pushkar Joshi | 2012-03-23 |
| |/ | | | | store the brush stroke points. Current version does not yet update the width and height of the brush stroke canvas upon changing the brush stroke through the PI. Also, current version does not obtain 3D position of points properly from the drawing tool base (see BrushTool _getUnsnappedPosition) | ||
| * | Merge branch 'refs/heads/Ninja-Internal' into FileIO-Build-Candidate | Jose Antonio Marquez | 2012-03-15 |
| |\ | |||
| | * | Removing the backup-delete folder and the RDGE tools directory. | Valerio Virgillito | 2012-03-15 |
| | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| * | | Merge pull request #34 from ericmueller/integration | Jose Antonio Marquez Russo | 2012-03-15 |
| |\ \ | |/ |/| | Integration | ||
| | * | Fixed BumpMetal material | hwc487 | 2012-03-13 |
| | | | |||
| | * | Uber material changes for IO | hwc487 | 2012-03-12 |
| | | | |||
| * | | Fixed drawing of multiple selection bounds when in flat case. | Nivesh Rajbhandari | 2012-03-13 |
| | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
| * | | 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 | ||
| | * \ | Merge branch 'refs/heads/ninja-internal' into WebGLFixes | Nivesh Rajbhandari | 2012-03-09 |
| | |\ \ | |||
| | | * | | IKNINJA-1270: fixed browser crashing when you close a document while playing ↵ | Ananya Sen | 2012-03-08 |
| | | | | | | | | | | | | | | | | | | | | | | | | | a video Signed-off-by: Ananya Sen <Ananya.Sen@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> | ||
| * | | | | Merge pull request #108 from pushkarjoshi/brushtool | Valerio Virgillito | 2012-03-13 |
| |\ \ \ \ | |_|_|/ |/| | | | Brushtool | ||
| | * | | | Merge branch 'pentool' into brushtool | Pushkar Joshi | 2012-03-06 |
| | |\ \ \ | |||
| | | * \ \ | Merge branch 'master' into pentool | Pushkar Joshi | 2012-03-06 |
| | | |\ \ \ | | | | |/ | | | |/| | |||
| | | * | | | Merge branch 'master' into pentool | Pushkar Joshi | 2012-03-05 |
| | | |\ \ \ | | | | |/ | | | |/| | |||
| | | * | | | Merge branch 'brushtool' into pentool | Pushkar Joshi | 2012-03-02 |
| | | |\ \ \ | |||
| | | * | | | | show feedback on mouseover on a part of the path where a new anchor will be ↵ | Pushkar Joshi | 2012-03-01 |
| | | | | | | | | | | | | | | | | | | | | | | | | | added if clicked | ||
| | * | | | | | Merge branch 'master' into brushtool | Pushkar Joshi | 2012-03-06 |
| | |\ \ \ \ \ | | | |_|_|/ | | |/| | | | |||
| | * | | | | | draw brush stroke as concentric paths overlaid on top of each other...allows ↵ | Pushkar Joshi | 2012-03-06 |
| | | | | | | | | | | | | | | | | | | | | | | | | | us to simulate softness for circular brushes | ||
| | * | | | | | Merge branch 'master' into brushtool | Pushkar Joshi | 2012-03-05 |
| | |\ \ \ \ \ | | |_|_|/ / | |/| | | / | | | |_|/ | | |/| | | |||
| | * | | | | Merge branch 'master' into brushtool | Pushkar Joshi | 2012-03-02 |
| | |\ \ \ \ | |||
| | * | | | | | 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) | ||
| | * | | | | | first attempt at rendering the brush stroke as a collection of polylines ↵ | Pushkar Joshi | 2012-03-01 |
| | | |_|_|/ | |/| | | | | | | | | | | | | | (number of polylines equals the stroke width) | ||
| * | | | | | remap hard coded strings in rdge internal code. | hwc487 | 2012-03-09 |
| | | | | | | |||
| * | | | | | Merge pull request #30 from ananyasen/FileIO-ananya | Jose Antonio Marquez Russo | 2012-03-08 |
| |\ \ \ \ \ | | | | | | | | | | | | | FileIO branch pull request | ||
| | * | | | | | null the arrays on all documents closed, so that they get garbage collected | Ananya Sen | 2012-03-08 |
| | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com> | ||
| | * | | | | | IKNINJA-1270: fixed browser crashing when you close a document while playing ↵ | Ananya Sen | 2012-03-06 |
| | | |_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | a video then wait for a while Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com> | ||
| * | | | | | File IO | hwc487 | 2012-03-07 |
| | | | | | | |||
| * | | | | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into ↵ | hwc487 | 2012-03-06 |
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | integration Conflicts: js/preloader/Preloader.js | ||
| | * | | | | 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> | ||
| | * | | | 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> | ||
| | * | | Merge branch 'SnapManagerFixes' of https://github.com/mqg734/ninja-internal ↵ | Valerio Virgillito | 2012-02-29 |
| | |\ \ | | | | | | | | | | | | | into integration-candidate | ||
| | | * | | SnapManager fixes for sag tags. | Nivesh Rajbhandari | 2012-02-29 |
| | | | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
| | * | | | Merge pull request #85 from pushkarjoshi/brushtool | Valerio Virgillito | 2012-02-29 |
| | |\ \ \ | | | |/ | | |/| | Brushtool | ||
| | | * | | prevent extremely long path rendering (temporary fix) | Pushkar Joshi | 2012-02-29 |
| | | | | | |||
| | | * | | 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 | ||
| | | * | | change in comment only | Pushkar Joshi | 2012-02-29 |
| | | | | | |||
| | | * | | 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 'pentool' into brushtool | Pushkar Joshi | 2012-02-24 |
| | | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: imports/codemirror/mode/scheme/scheme.js js/tools/BrushTool.js | ||