aboutsummaryrefslogtreecommitdiff
path: root/js/tools
Commit message (Expand)AuthorAge
* Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into Tex...hwc4872012-05-17
|\
| * Add color to tag toolValerio Virgillito2012-05-15
| * Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into Wor...John Mayhew2012-05-15
| |\
| * \ Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into Wor...John Mayhew2012-05-10
| |\ \
| * | | put color chips in the inkbottle and fill toolJohn Mayhew2012-05-10
| * | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into Wor...John Mayhew2012-05-07
| |\ \ \
| * | | | More implementation of moving color chips to the individual subtools.John Mayhew2012-05-07
| * | | | First round of moving color chips into the sub tools. Shape and Pen tool now ...John Mayhew2012-05-03
* | | | | Fixing merge issueshwc4872012-05-14
* | | | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into Tex...hwc4872012-05-11
|\ \ \ \ \ | | |_|_|/ | |/| | |
| * | | | Merge branch 'refs/heads/ninja-internal' into WebGLFixesNivesh Rajbhandari2012-05-10
| |\ \ \ \ | | | |_|/ | | |/| |
| | * | | some code cleanupValerio Virgillito2012-05-09
| * | | | Merge branch 'refs/heads/ninja-internal' into WebGLFixesNivesh Rajbhandari2012-05-08
| |\| | |
| | * | | Fixed a snapping issue on the mouse down in drawing tools.hwc4872012-05-08
| | * | | fixes for 2D and 3D translation.hwc4872012-05-07
| | | |/ | | |/|
| * | | Merge branch 'refs/heads/ninja-internal' into WebGLFixesNivesh Rajbhandari2012-05-07
| |\| |
| | * | Refactor creating elements. Removed makeNJElement and separated the model cre...Valerio Virgillito2012-05-03
| | * | Merge branch 'refs/heads/master' into tag-2.0Valerio Virgillito2012-05-03
| | |\ \
| | * | | Nesting absolute element in the Tag tool. Refactoring element creation and el...Valerio Virgillito2012-05-02
| * | | | Converting geom-obj to object literal notation.Nivesh Rajbhandari2012-05-02
| * | | | Converting line, circle and rectangle shapes to object literal notation.Nivesh Rajbhandari2012-05-02
| | |/ / | |/| |
* | | | Merge branch 'Textures' of github.com:ericmueller/ninja-internal into Textureshwc4872012-05-03
|\ \ \ \
| * | | | Updated hard-coded linear and radial gradients to use the color values in Lin...Nivesh Rajbhandari2012-05-03
* | | | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into Tex...hwc4872012-05-02
|\ \ \ \ \ | |/ / / / |/| / / / | |/ / /
| * / / Support drawing in side and top view. Also, adding back support for drawing s...Nivesh Rajbhandari2012-05-01
| |/ /
| * | webTemplate var gets reset to false, so must check for new stage template dif...Nivesh Rajbhandari2012-05-01
| * | Merge branch 'refs/heads/ninja-internal' into StageWebTemplateNivesh Rajbhandari2012-05-01
| |\ \
| * | | Get working plane grid to draw for new stage web template workflow.Nivesh Rajbhandari2012-05-01
* | | | Material editorhwc4872012-05-02
| |/ / |/| |
* | | Removing some console logsValerio Virgillito2012-04-30
|/ /
* / Squashed commit of stage architectureValerio Virgillito2012-04-30
|/
* Merge pull request #182 from ericmueller/Canvas-interactionValerio Virgillito2012-04-30
|\
| * added a console.log to show the working plane during a draghwc4872012-04-27
| * Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into Can...hwc4872012-04-27
| |\
| * | Creating shapes in a containerhwc4872012-04-27
| * | canvas interactionhwc4872012-04-26
| * | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into Can...hwc4872012-04-25
| |\ \
| * \ \ Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into Can...hwc4872012-04-25
| |\ \ \
| * | | | canvas interactionhwc4872012-04-23
| * | | | limitshwc4872012-04-23
* | | | | Merge cleanupValerio Virgillito2012-04-27
* | | | | Merge branch 'refs/heads/serialization'Valerio Virgillito2012-04-27
|\ \ \ \ \
| * | | | | Simplifying the getElement method from stage and adding an exclusion list to ...Valerio Virgillito2012-04-26
| | |_|/ / | |/| | |
* | | | | Refix brush tool elementAdded eventJonathan Duran2012-04-27
* | | | | Merge branch 'refs/heads/NINJAmaster' into TimelineUberJonathan Duran2012-04-27
|\ \ \ \ \ | | |_|_|/ | |/| | |
| * | | | Merge pull request #176 from pushkarjoshi/brushtoolValerio Virgillito2012-04-27
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | track the dragging plane based on the hit record so that the file IO works ag...Pushkar Joshi2012-04-26
| | * | | render the calligraphic brush stroke in realtime on a rotated canvasPushkar Joshi2012-04-25
| | * | | allow the realtime drawing of brush strokes drawn off the standard XY plane b...Pushkar Joshi2012-04-24
| | | |/ | | |/|
* | | | Revert "Fix Brush tool not broadcasting elementAdded event"Jonathan Duran2012-04-27