| Commit message (Collapse) | Author | Age | |
|---|---|---|---|
| * | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into ↵ | hwc487 | 2012-05-17 |
| |\ | | | | | | | Textures | ||
| | * | Add color to tag tool | Valerio Virgillito | 2012-05-15 |
| | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| | * | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into ↵ | John Mayhew | 2012-05-15 |
| | |\ | | | | | | | | | | WorkingBranch | ||
| | * \ | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into ↵ | John Mayhew | 2012-05-10 |
| | |\ \ | | | | | | | | | | | | | WorkingBranch | ||
| | * | | | put color chips in the inkbottle and fill tool | John Mayhew | 2012-05-10 |
| | | | | | |||
| | * | | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into ↵ | John Mayhew | 2012-05-07 |
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | WorkingBranch Conflicts: js/components/layout/tools-list.reel/tools-list.html js/components/layout/tools-properties.reel/tools-properties.html js/components/tools-properties/brush-properties.reel/brush-properties.html js/components/tools-properties/fill-properties.reel/fill-properties.html js/components/tools-properties/pen-properties.reel/pen-properties.html js/components/tools-properties/pencil-properties.reel/pencil-properties.html js/components/tools-properties/selection-properties.reel/selection-properties.html js/components/tools-properties/shape-properties.reel/shape-properties.html js/components/tools-properties/tag-properties.reel/tag-properties.html js/components/tools-properties/text-properties.reel/text-properties.html | ||
| | * | | | | 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 | ||
| | * | | | | First round of moving color chips into the sub tools. Shape and Pen tool now ↵ | John Mayhew | 2012-05-03 |
| | | | | | | | | | | | | | | | | | | | | | have chips in the sub tool bar. Still need to complete adding chips to the Brush tool and finalizing the subtool bar layout to our spec for all of the subtools. | ||
| * | | | | | Fixing merge issues | hwc487 | 2012-05-14 |
| | | | | | | |||
| * | | | | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into ↵ | hwc487 | 2012-05-11 |
| |\ \ \ \ \ | | |_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Textures Conflicts: js/lib/geom/geom-obj.js js/lib/geom/rectangle.js js/tools/TagTool.js | ||
| | * | | | | Merge branch 'refs/heads/ninja-internal' into WebGLFixes | Nivesh Rajbhandari | 2012-05-10 |
| | |\ \ \ \ | | | |_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | Conflicts: js/io/system/ninjalibrary.json Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
| | | * | | | some code cleanup | Valerio Virgillito | 2012-05-09 |
| | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| | * | | | | Merge branch 'refs/heads/ninja-internal' into WebGLFixes | Nivesh Rajbhandari | 2012-05-08 |
| | |\| | | | |||
| | | * | | | Fixed a snapping issue on the mouse down in drawing tools. | hwc487 | 2012-05-08 |
| | | | | | | |||
| | | * | | | fixes for 2D and 3D translation. | hwc487 | 2012-05-07 |
| | | | |/ | | |/| | |||
| | * | | | Merge branch 'refs/heads/ninja-internal' into WebGLFixes | Nivesh Rajbhandari | 2012-05-07 |
| | |\| | | |||
| | | * | | Refactor creating elements. Removed makeNJElement and separated the model ↵ | Valerio Virgillito | 2012-05-03 |
| | | | | | | | | | | | | | | | | | | | | | | | | | creation Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| | | * | | Merge branch 'refs/heads/master' into tag-2.0 | Valerio Virgillito | 2012-05-03 |
| | | |\ \ | |||
| | | * | | | Nesting absolute element in the Tag tool. Refactoring element creation and ↵ | Valerio Virgillito | 2012-05-02 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | element models Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| | * | | | | Converting geom-obj to object literal notation. | Nivesh Rajbhandari | 2012-05-02 |
| | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
| | * | | | | Converting line, circle and rectangle shapes to object literal notation. | Nivesh Rajbhandari | 2012-05-02 |
| | | |/ / | |/| | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
| * | | | | Merge branch 'Textures' of github.com:ericmueller/ninja-internal into Textures | hwc487 | 2012-05-03 |
| |\ \ \ \ | |||
| | * | | | | Updated hard-coded linear and radial gradients to use the color values in ↵ | Nivesh Rajbhandari | 2012-05-03 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Linear/RadialGradientMaterials. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
| * | | | | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into ↵ | hwc487 | 2012-05-02 |
| |\ \ \ \ \ | |/ / / / |/| / / / | |/ / / | Textures | ||
| | * / / | Support drawing in side and top view. Also, adding back support for drawing ↵ | Nivesh Rajbhandari | 2012-05-01 |
| | |/ / | | | | | | | | | | | | | | | | shapes inside canvas when double-clicked into canvas or when moused over canvas. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
| | * | | webTemplate var gets reset to false, so must check for new stage template ↵ | Nivesh Rajbhandari | 2012-05-01 |
| | | | | | | | | | | | | | | | | | | | differently. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
| | * | | Merge branch 'refs/heads/ninja-internal' into StageWebTemplate | Nivesh Rajbhandari | 2012-05-01 |
| | |\ \ | |||
| | * | | | Get working plane grid to draw for new stage web template workflow. | Nivesh Rajbhandari | 2012-05-01 |
| | | | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
| * | | | | Material editor | hwc487 | 2012-05-02 |
| | |/ / |/| | | |||
| * | | | Removing some console logs | Valerio Virgillito | 2012-04-30 |
| |/ / | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| * / | Squashed commit of stage architecture | Valerio Virgillito | 2012-04-30 |
| |/ | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| * | Merge pull request #182 from ericmueller/Canvas-interaction | Valerio Virgillito | 2012-04-30 |
| |\ | | | | | Canvas interaction | ||
| | * | added a console.log to show the working plane during a drag | hwc487 | 2012-04-27 |
| | | | |||
| | * | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into ↵ | hwc487 | 2012-04-27 |
| | |\ | | | | | | | | | | Canvas-interaction | ||
| | * | | Creating shapes in a container | hwc487 | 2012-04-27 |
| | | | | |||
| | * | | canvas interaction | hwc487 | 2012-04-26 |
| | | | | |||
| | * | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into ↵ | hwc487 | 2012-04-25 |
| | |\ \ | | | | | | | | | | | | | Canvas-interaction | ||
| | * \ \ | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into ↵ | hwc487 | 2012-04-25 |
| | |\ \ \ | | | | | | | | | | | | | | | | Canvas-interaction | ||
| | * | | | | canvas interaction | hwc487 | 2012-04-23 |
| | | | | | | |||
| | * | | | | limits | hwc487 | 2012-04-23 |
| | | | | | | |||
| * | | | | | Merge cleanup | Valerio Virgillito | 2012-04-27 |
| | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| * | | | | | Merge branch 'refs/heads/serialization' | Valerio Virgillito | 2012-04-27 |
| |\ \ \ \ \ | |||
| | * | | | | | Simplifying the getElement method from stage and adding an exclusion list to ↵ | Valerio Virgillito | 2012-04-26 |
| | | |_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | the new template Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| * | | | | | Refix brush tool elementAdded event | Jonathan Duran | 2012-04-27 |
| | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com> | ||
| * | | | | | Merge branch 'refs/heads/NINJAmaster' into TimelineUber | Jonathan Duran | 2012-04-27 |
| |\ \ \ \ \ | | |_|_|/ | |/| | | | |||
| | * | | | | Merge pull request #176 from pushkarjoshi/brushtool | Valerio Virgillito | 2012-04-27 |
| | |\ \ \ \ | | |/ / / | |/| | | | Brushtool | ||
| | | * | | | track the dragging plane based on the hit record so that the file IO works ↵ | Pushkar Joshi | 2012-04-26 |
| | | | | | | | | | | | | | | | | | | | | | again (bug fix) | ||
| | | * | | | render the calligraphic brush stroke in realtime on a rotated canvas | Pushkar Joshi | 2012-04-25 |
| | | | | | | |||
| | | * | | | allow the realtime drawing of brush strokes drawn off the standard XY plane ↵ | Pushkar Joshi | 2012-04-24 |
| | | | |/ | | |/| | | | | | | | | | by passing in the transformation matrix | ||
| * | | | | Revert "Fix Brush tool not broadcasting elementAdded event" | Jonathan Duran | 2012-04-27 |
| | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 12fadd1494a9b5fcdaa17fde2f4847277237cf79. Signed-off-by: Jonathan Duran <jduran@motorola.com> | ||