| Commit message (Collapse) | Author | Age | |
|---|---|---|---|
| * | 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 | ||
| | | * | | | | render the brush stroke as a sequence of rectangles, with each rectangle ↵ | Pushkar Joshi | 2012-02-10 |
| | | | | | | | | | | | | | | | | | | | | | | | | | having its own linear gradient | ||
| | | * | | | | Merge branch 'master' into brushtool | Pushkar Joshi | 2012-02-09 |
| | | |\ \ \ \ | |||
| | | * | | | | | first phase of simple resampling to prevent tiny segments | Pushkar Joshi | 2012-02-09 |
| | | | | | | | | |||
| | * | | | | | | Merge pull request #79 from pushkarjoshi/pentool | Valerio Virgillito | 2012-02-28 |
| | |\ \ \ \ \ \ | | | |_|_|/ / | | |/| | | | | Pentool | ||
| | | * | | | | | Merge branch 'master' into pentool | Pushkar Joshi | 2012-02-28 |
| | | |\ \ \ \ \ | | | | |_|_|/ | | | |/| | | | | | | | | | | | | | | | | | Conflicts: manifest.json | ||
| | | * | | | | | 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 | ||
| * | | | | | | IO | hwc487 | 2012-03-06 |
| | | | | | | | |||
| * | | | | | | Authortime import of 2d & 3d canvases | hwc487 | 2012-03-06 |
| | | | | | | | |||
| * | | | | | | Merge branch 'TimelineUber' of github.com:imix23ways/ninja-internal into ↵ | hwc487 | 2012-03-06 |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | integration | ||
| | * | | | | | | Squashed commit of the following: | Jonathan Duran | 2012-02-29 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |||