| Commit message (Collapse) | Author | Age | |
|---|---|---|---|
| * | Binding View :Requested Changes for Pull Request | Armen Kesablyan | 2012-06-21 |
| | | | | | Signed-off-by: Armen Kesablyan <armen@motorola.com> | ||
| * | Merge branch 'refs/heads/master' into binding | Armen Kesablyan | 2012-06-11 |
| |\ | | | | | | | | | | | | | | | | | Conflicts: js/document/models/html.js js/document/views/design.js js/ninja.reel/ninja.js Signed-off-by: Armen Kesablyan <armen@motorola.com> | ||
| | * | Merge branch 'master' into pentool | Pushkar Joshi | 2012-05-31 |
| | |\ | |||
| | * | | allow changes in the pen subtool in options to be seen by the pen tool code ↵ | Pushkar Joshi | 2012-05-22 |
| | | | | | | | | | | | | | | | | | | | (can now select the pen plus, pen minus subtools) AND add keyboard shortcut for brush tool | ||
| * | | | Binding tool subtool issues | Armen Kesablyan | 2012-05-23 |
| | | | | | | | | | | | | | Signed-off-by: Armen Kesablyan <armen@motorola.com> | ||
| * | | | Merge branch 'refs/heads/dom-architecture' into binding | Armen Kesablyan | 2012-05-23 |
| |\ \ \ | | |/ | |/| | | | | | | | | | | | | | Conflicts: js/data/panels-data.js Signed-off-by: Armen Kesablyan <armen@motorola.com> | ||
| | * | | fixed the shape subtool not refreshing the icon | Valerio Virgillito | 2012-05-18 |
| | |/ | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| * | | Merge branch 'refs/heads/dom-architecture' into binding | Armen Kesablyan | 2012-05-17 |
| |\| | | | | | | | | | | | | | | | Conflicts: css/ninja.css scss/imports/scss/_toolbar.scss Signed-off-by: Armen Kesablyan <armen@motorola.com> | ||
| | * | Removed unused SubSelect Tool | John Mayhew | 2012-05-08 |
| | | | |||
| | * | More implementation of moving color chips to the individual subtools. | John Mayhew | 2012-05-07 |
| | | | | | | | | | | | | | | | | | | | Removed the tool color bar Added new icons for inkbottle Removed Pencil tool Removed Inkbottle tool Added chips to the pen, brush and tag tools Aligned controls in several subtools | ||
| * | | Initial Setup of the binding Tool | Armen Kesablyan | 2012-05-07 |
| |/ | | | | Signed-off-by: Armen Kesablyan <armen@motorola.com> | ||
| * | IKNinja-1022 - PaintBucket tooltip is incorrect. Also added kb shortcuts for ↵ | Nivesh Rajbhandari | 2012-04-13 |
| | | | | | | | PaintBucket, InkBottle and Eyedropper tools. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
| * | Merge pull request #85 from pushkarjoshi/brushtool | Valerio Virgillito | 2012-02-29 |
| |\ | | | | | Brushtool | ||
| | * | 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 | ||
| * | | Fixing tooltips and keyboard shortcuts for 3d tools. | Nivesh Rajbhandari | 2012-02-27 |
| |/ | | | | | | IKNinja-1014 and IKNinja-1015. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
| * | Marking inkbottle as the final tool in the set. | Nivesh Rajbhandari | 2012-02-24 |
| | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
| * | Adding back Ink Bottle tool in the tool bar so QE can test ink bottle ↵ | Nivesh Rajbhandari | 2012-02-24 |
| | | | | | | | functionality without having to wait for the new icon and location of the tool. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
| * | Merge branch 'refs/heads/ninja-internal' into WebGLMaterials | Nivesh Rajbhandari | 2012-02-22 |
| |\ | |||
| | * | Merge branch 'refs/heads/master' into new-tool-icons | Armen Kesablyan | 2012-02-22 |
| | |\ | |||
| | * | | New Icons: Last set had imperfections | Armen Kesablyan | 2012-02-15 |
| | | | | | | | | | | | | | Signed-off-by: Armen Kesablyan <armen@motorola.com> | ||
| | * | | Tool Icons : New layout | Armen Kesablyan | 2012-02-15 |
| | | | | | | | | | | | | | Signed-off-by: Armen Kesablyan <armen@motorola.com> | ||
| * | | | Merge branch 'refs/heads/ninja-internal' into ToolFixes | Nivesh Rajbhandari | 2012-02-20 |
| |\ \ \ | | |/ | |/| | |||
| | * | | Merge branch 'refs/heads/NinjaInternal' into FileIO | Jose Antonio Marquez | 2012-02-06 |
| | |\| | |||
| | * | | Merged old FileIO | Jose Antonio Marquez | 2012-01-27 |
| | | | | |||
| * | | | Get color under mouse point from image or canvas. | Nivesh Rajbhandari | 2012-02-14 |
| | |/ |/| | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
| * | | Fixing keyboard shortcut and tooltip for hand and 3d tools. | Nivesh Rajbhandari | 2012-02-02 |
| |/ | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
| * | First commit of Ninja to ninja-internal | Pierre Frisch | 2012-01-27 |
| Signed-off-by: Valerio Virgillito <rmwh84@motorola.com> | |||