Commit message (Collapse) | Author | Age | |
---|---|---|---|
* | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into ↵ | hwc487 | 2012-04-26 |
|\ | | | | | | | Textures | ||
| * | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal | Valerio Virgillito | 2012-04-26 |
| |\ | |||
| * | | Fixing the eye dropper shortcut. | Valerio Virgillito | 2012-04-26 |
| | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
* | | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into ↵ | hwc487 | 2012-04-26 |
|\ \ \ | | |/ | |/| | | | | Textures | ||
| * | | 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 |
| |\ \ \ | | | |/ | | |/| | |||
| | * | | 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> | ||
| * | | | | 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 |
| |\| | | | |||
| | * | | | Merge branch 'master' into pentool | Pushkar Joshi | 2012-04-24 |
| | |\ \ \ | | | | |/ | | | |/| | |||
| | | * | | Merge branch 'refs/heads/master' into stage-document-architecture | Valerio Virgillito | 2012-04-23 |
| | | |\| | |||
| | | | * | Merge branch 'refs/heads/master' into cleanup | Valerio Virgillito | 2012-04-19 |
| | | | |\ | |||
| | | | * | | cleanup unused code. | Valerio Virgillito | 2012-04-19 |
| | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| | | * | | | Temporary fix for the PI and Stage when opening the new template. | Valerio Virgillito | 2012-04-23 |
| | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| | | * | | | adjusting the bread crumb to work with the new template | Valerio Virgillito | 2012-04-23 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Initial container get setup in ninja now. Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| | | * | | | more backup fixes for the old stage | Valerio Virgillito | 2012-04-20 |
| | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| | | * | | | reverting old template to current working status. New template work. | Valerio Virgillito | 2012-04-20 |
| | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| | | * | | | Merge branch 'refs/heads/Document' into stage-document-architecture | Valerio Virgillito | 2012-04-19 |
| | | |\ \ \ | |||
| | | | * \ \ | Merge branch 'refs/heads/Ninja-Internal' into Document | Jose Antonio Marquez | 2012-04-16 |
| | | | |\ \ \ | |||
| | | | * \ \ \ | Merge branch 'refs/heads/Ninja-Internal' into Document | Jose Antonio Marquez | 2012-04-11 |
| | | | |\ \ \ \ | |||
| | | | * \ \ \ \ | Merge branch 'refs/heads/Ninja-Internal' into Document | Jose Antonio Marquez | 2012-04-10 |
| | | | |\ \ \ \ \ | |||
| | | | * \ \ \ \ \ | Merge branch 'refs/heads/Ninja-Internal' into Document | Jose Antonio Marquez | 2012-04-04 |
| | | | |\ \ \ \ \ \ | |||
| | | | * \ \ \ \ \ \ | Merge branch 'refs/heads/Ninja-Internal' into Document | Jose Antonio Marquez | 2012-04-04 |
| | | | |\ \ \ \ \ \ \ | |||
| | | | * | | | | | | | | Backup for merge | Jose Antonio Marquez | 2012-04-04 |
| | | | | | | | | | | | | |||
| | | | * | | | | | | | | Merge branch 'refs/heads/Ninja-Internal' into Document | Jose Antonio Marquez | 2012-04-02 |
| | | | |\ \ \ \ \ \ \ \ | |||
| | | | * | | | | | | | | | Setting up document rework | Jose Antonio Marquez | 2012-04-02 |
| | | | | | | | | | | | | | |||
| | | * | | | | | | | | | | typo fix | Valerio Virgillito | 2012-04-19 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| | | * | | | | | | | | | | initial stage web template | Valerio Virgillito | 2012-04-18 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| | * | | | | | | | | | | | 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) | ||
| | * | | | | | | |