| Commit message (Collapse) | Author | Age | ||
|---|---|---|---|---|
| ... | ||||
| * | | | | | | | Merge remote-tracking branch 'ninja-jduran/TimelineUber' into timeline-local | Jon Reid | 2012-04-26 | |
| |\ \ \ \ \ \ \ | ||||
| | * \ \ \ \ \ \ | Merge branch 'refs/heads/NINJAmaster' into TimelineUber | Jonathan Duran | 2012-04-26 | |
| | |\ \ \ \ \ \ \ | | | |/ / / / / | | |/| | | | | | ||||
| | | * | | | | | | Merge pull request #179 from joseeight/FileIO | Valerio Virgillito | 2012-04-26 | |
| | | |\ \ \ \ \ \ | | | |/ / / / / | | |/| | | | | | Fixing duplicate layer bug | |||
| | | | * | | | | | Merge branch 'refs/heads/Ninja-Internal' into FileIO | Jose Antonio Marquez | 2012-04-26 | |
| | | | |\| | | | | ||||
| | | | * | | | | | Fixing duplicate layer error | Jose Antonio Marquez | 2012-04-26 | |
| | | | | | | | | | ||||
| | | | * | | | | | Fixing duplicate layer bug | Jose Antonio Marquez | 2012-04-26 | |
| | | | | |_|/ / | | | |/| | | | ||||
| | | * | | | | | Merge branch 'refs/heads/ninja-internal' into WebGLMaterials | Nivesh Rajbhandari | 2012-04-25 | |
| | | |\ \ \ \ \ | | | | |/ / / | | | |/| | | | ||||
| | | * | | | | | Updating the canvas runtime files for gradient and rectangle radius fixes. | Nivesh Rajbhandari | 2012-04-25 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | |||
| | | * | | | | | IKNinja-406 - Strange behavior when changing the corner radius to the ↵ | Nivesh Rajbhandari | 2012-04-25 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | maximum value. IKNinja-1236 - Corner radius is not applied if stroke size is >= 2 times the corner radius. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | |||
| | | * | | | | | Changing canvas-2d gradient drawing to more closely match div's ↵ | Nivesh Rajbhandari | 2012-04-25 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | background-image gradient support. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | |||
| | | * | | | | | Merge branch 'refs/heads/ninja-internal' into WebGLMaterials | Nivesh Rajbhandari | 2012-04-25 | |
| | | |\ \ \ \ \ | | | | |_|/ / | | | |/| | | | ||||
| | | * | | | | | Fixed materials editor popup not refreshing correctly. | Nivesh Rajbhandari | 2012-04-16 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | |||
| | * | | | | | | Merge branch 'refs/heads/timeline-local' into TimelineUber | Jonathan Duran | 2012-04-26 | |
| | |\ \ \ \ \ \ | ||||
| | * \ \ \ \ \ \ | Merge branch 'refs/heads/NINJAmaster' into TimelineUber | Jonathan Duran | 2012-04-26 | |
| | |\ \ \ \ \ \ \ | | | |_|_|/ / / | | |/| | | | | | ||||
| | | * | | | | | | Merge pull request #175 from mqg734/BoundsCalculation | Valerio Virgillito | 2012-04-25 | |
| | | |\ \ \ \ \ \ | | | |_|_|/ / / | | |/| | | | | | Allow users to toggle application of stroke and border settings when using the ink bottle tool. Also, fixed translate tool's handles to draw without stage's zoom. | |||
| | | | * | | | | | Fixed issue with setting stroke when using the PI. | Nivesh Rajbhandari | 2012-04-24 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | |||
| | | | * | | | | | Merge branch 'refs/heads/ninja-internal' into AllFixes | Nivesh Rajbhandari | 2012-04-24 | |
| | | | |\ \ \ \ \ | | | | | |_|/ / | | | | |/| | | | ||||
| | | | * | | | | | Allow users to toggle application of stroke and border settings when using ↵ | Nivesh Rajbhandari | 2012-04-24 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | the ink bottle tool. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | |||
| | | | * | | | | | Fixing translate handles to draw without zoom value. Also fixed some typos ↵ | Nivesh Rajbhandari | 2012-04-20 | |
| | | | | |_|_|/ | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | in zoom code. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | |||
| * | | | | | | | Timeline: Decouple Timeline and Breadcrumb. Remove most document change | Jon Reid | 2012-04-26 | |
| | |_|_|_|/ / |/| | | | | | | | | | | | | | | | | | event handlers. Bind Timeline to currentSelectedElement. Various bug fixes. | |||
| * | | | | | | Merge remote-tracking branch 'ninja-jduran/TimelineUber' into timeline-local | Jon Reid | 2012-04-25 | |
| |\| | | | | | ||||
| | * | | | | | Timeline Bug Fix : 1541 | Kruti Shah | 2012-04-25 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Kruti Shah <kruti.shah@motorola.com> | |||
| * | | | | | | Timeline: Handling of multiselect of elements from stage. | Jon Reid | 2012-04-25 | |
| | | | | | | | ||||
| * | | | | | | Timeline: New tracking for multiple selected layers. | Jon Reid | 2012-04-25 | |
| |/ / / / / | ||||
| * | | | | | Merge branch 'refs/heads/NINJAmaster' into TimelineUber | Jonathan Duran | 2012-04-25 | |
| |\| | | | | ||||
| | * | | | | Merge branch 'master' into pentool | Pushkar Joshi | 2012-04-24 | |
| | |\ \ \ \ | | | |/ / | | |/| | | ||||
| | * | | | | re-compute and store the center of the subpath in local coordinates upon ↵ | Pushkar Joshi | 2012-04-24 | |
| | | | | | | | | | | | | | | | | | | | | | file open | |||
| | * | | | | allow the addition of the pen tool to the timeline | Pushkar Joshi | 2012-04-23 | |
| | | | | | | ||||
| | * | | | | Merge branch 'master' into pentool | Pushkar Joshi | 2012-04-19 | |
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: js/helper-classes/3D/view-utils.js | |||
| | * | | | | | get the canvas plane matrix before multiplying it with the translation due ↵ | Pushkar Joshi | 2012-04-19 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | to shift in center of rotation | |||
| | * | | | | | correctly maintain canvas position when drawing subpaths off the XY plane ↵ | Pushkar Joshi | 2012-04-19 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | (was a bug with starting drawing in those planes) | |||
| | * | | | | | for subpaths that have not been initialized with a canvas yet (i.e. no local ↵ | Pushkar Joshi | 2012-04-19 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | coordinates), use stage world mouse positions to translate the anchor points while dragging | |||
| | * | | | | | store the canvas center (in local space) per each subpath, instead of ↵ | Pushkar Joshi | 2012-04-19 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | tracking it by the pen tool. This fixes the bug where the canvas transform was incorrectly applied when the stroke width was changed | |||
| | * | | | | | turn off snapping for the pen tool (with an option to turn it back on if we ↵ | Pushkar Joshi | 2012-04-19 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | decide to, later) | |||
| | * | | | | | fix a bug with closing the subpath | Pushkar Joshi | 2012-04-18 | |
| | | | | | | | ||||
| | * | | | | | re-enable dragging and editing of anchor point handles for bezier path ↵ | Pushkar Joshi | 2012-04-18 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | editing in 3D | |||
| | * | | | | | compute the translation to new center of bounding of the subpath --- this ↵ | Pushkar Joshi | 2012-04-18 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | preserves the correct transformation applied to the subpath. This is a good snapshot of the polyline drawing in 3D (with some minor bugs). | |||
| | * | | | | | allow drawing polylines in YZ and XZ planes as well as XY. In those planes, ↵ | Pushkar Joshi | 2012-04-18 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | still have bug with shift when the bbox of the path grows (due to missing translation) | |||
| | * | | | | | Fairly stable version of polyline drawing code that works for paths on XY, ↵ | Pushkar Joshi | 2012-04-17 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | YZ, XZ planes. Current bugs: if the new point increases the bbox of the canvas, the entire canvas is shifted (due to inconsistency with center of rotation) AND the first two points added to planes other than XY have incorrect local coordinates (due to missing local coordinates) | |||
| | * | | | | | took out bad merge line and use different function for converting points ↵ | Pushkar Joshi | 2012-04-17 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | from local to global coords (the latter should be a temporary change as I will significantly change this) | |||
| | * | | | | | Merge branch 'master' into pentool | Pushkar Joshi | 2012-04-17 | |
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: js/tools/PenTool.js | |||
| | * | | | | | | Snapshot for pen tool before merging with master....can draw polylines (no ↵ | Pushkar Joshi | 2012-04-17 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | prev, next) handles and hit testing in 3D. Update of the canvas with a transformation on it will modify the canvas incorrectly, and will be completed after merging with master | |||
| | * | | | | | | re-enable some hit testing and change the code for obtaining 3D (stage ↵ | Pushkar Joshi | 2012-04-16 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | world) point when there is no canvas yet | |||
| | * | | | | | | limit the size of the subpath canvas by ignoring the last point added that ↵ | Pushkar Joshi | 2012-04-16 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | tool the canvas size over the specified limit | |||
| | * | | | | | | Allow the path stroke width to be changed without causing a drift in the ↵ | Pushkar Joshi | 2012-04-16 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ||||