| Commit message (Expand) | Author | Age |
* | Undoing mistakes from auto-merge. | Nivesh Rajbhandari | 2012-04-05 |
* | Merge branch 'refs/heads/WebGLFileIO' into ToolFixes | Nivesh Rajbhandari | 2012-04-04 |
|\ |
|
| * | Merge branch 'refs/heads/EricSnapping' into WebGLFileIO | Nivesh Rajbhandari | 2012-04-04 |
| |\ |
|
| | * | Snapping fixes. | hwc487 | 2012-04-02 |
| * | | IKNinna-1409 - Should dirty document when changing shape properties. IKNinja-... | Nivesh Rajbhandari | 2012-04-02 |
| * | | Update PI and Color Panel to reflect default LinearGradient and RadialGradien... | Nivesh Rajbhandari | 2012-03-30 |
| * | | Merge branch 'refs/heads/ninja-internal' into WebGLFileIO | Nivesh Rajbhandari | 2012-03-30 |
| |\| |
|
| * | | Updated shapes to always check for its stroke and fill colors and materials i... | Nivesh Rajbhandari | 2012-03-29 |
* | | | removed unnecessary call to exportMaterials from init(). this call should not... | John Mayhew | 2012-04-04 |
* | | | removed old unused import and export functions. | John Mayhew | 2012-04-03 |
* | | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into Wor... | John Mayhew | 2012-04-02 |
|\ \ \
| | |/
| |/| |
|
| * | | turn off changing the left and top of the brush stroke canvas | Pushkar Joshi | 2012-03-28 |
| * | | Merge branch 'master' into brushtool | Pushkar Joshi | 2012-03-27 |
| |\| |
|
| | * | Fixed issue with WebGL materials not working after file-save or chrome-previe... | Nivesh Rajbhandari | 2012-03-26 |
| * | | File IO for the brush stroke AND changing the data type of brush stroke from ... | Pushkar Joshi | 2012-03-27 |
| * | | add a setfillcolor to brush stroke so the default fillcolor handler does not ... | Pushkar Joshi | 2012-03-27 |
| * | | Merge branch 'master' into brushtool | Pushkar Joshi | 2012-03-27 |
| |\| |
|
| | * | Fixed a problem switching from 3D to 2D and back to 3D. | hwc487 | 2012-03-23 |
| | * | Added Paris and Raiders materials | hwc487 | 2012-03-22 |
| | * | Bug Fixes for Canvas & WebGL File IO | hwc487 | 2012-03-20 |
| | * | Supporting new and old GL data formats. | hwc487 | 2012-03-16 |
| | * | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into int... | hwc487 | 2012-03-16 |
| | |\ |
|
| | * | | Conversion to JSON based file IO for canvas2D and WebGL rendering | hwc487 | 2012-03-16 |
| * | | | correctly update the brush stroke canvas size and position when the stroke pa... | Pushkar Joshi | 2012-03-26 |
| * | | | correctly update the brush stroke canvas size and position when the stroke si... | Pushkar Joshi | 2012-03-23 |
| * | | | Almost working version of brush tool that uses only local coordinates to stor... | Pushkar Joshi | 2012-03-23 |
| * | | | revert to using the angle without flipping its sign...fixing some minor bugs ... | Pushkar Joshi | 2012-03-20 |
| * | | | draw the brush stroke in realtime | Pushkar Joshi | 2012-03-19 |
| * | | | first pass for file IO of brush strokes | Pushkar Joshi | 2012-03-19 |
| * | | | Merge branch 'master' into brushtool | Pushkar Joshi | 2012-03-16 |
| |\ \ \
| | | |/
| | |/| |
|
| | * | | Merge pull request #34 from ericmueller/integration | Jose Antonio Marquez Russo | 2012-03-15 |
| | |\| |
|
| | | * | Uber material changes for IO | hwc487 | 2012-03-12 |
| * | | | update values in the PI from values of the selected brush stroke or pen tool ... | Pushkar Joshi | 2012-03-15 |
| * | | | PI for pen and brush strokes | Pushkar Joshi | 2012-03-14 |
| * | | | Merge branch 'pentool' into brushtool | Pushkar Joshi | 2012-03-13 |
| |\| | |
|
| | * | | Merge branch 'master' into pentool | Pushkar Joshi | 2012-03-13 |
| | |\ \ |
|
| | | * \ | Merge pull request #110 from mqg734/WebGLFixes | Valerio Virgillito | 2012-03-13 |
| | | |\ \ |
|
| | | | * | | Support import/export of gradient materials. This fixes the eyedropper not b... | Nivesh Rajbhandari | 2012-03-12 |
| | | | * | | Fixing radial gradient for rectangle. | Nivesh Rajbhandari | 2012-03-09 |
| | | | * | | Fixing radial gradients for line and circle. | Nivesh Rajbhandari | 2012-03-09 |
| | | | * | | gradient support for canvas-2d shapes. | Nivesh Rajbhandari | 2012-03-07 |
| | | | * | | Change linear gradient to go from left to right instead of top-left to bottom... | Nivesh Rajbhandari | 2012-03-07 |
| | | | * | | Gradient support for canvas-2d rectangle. | Nivesh Rajbhandari | 2012-03-07 |
| | | | * | | Fix for stroke and fill gradients not being retained when drawing multiple sh... | Nivesh Rajbhandari | 2012-03-07 |
| | | | * | | preliminary support for setting gradients on webgl shapes. | Nivesh Rajbhandari | 2012-03-07 |
| | | * | | | Merge pull request #108 from pushkarjoshi/brushtool | Valerio Virgillito | 2012-03-13 |
| | | |\ \ \
| | | | |_|/
| | | |/| | |
|
| | | * | | | Canvas IO | hwc487 | 2012-03-08 |
| | | * | | | File IO | hwc487 | 2012-03-07 |
| | | | |/
| | | |/| |
|
| * | / | | Add a smoothing amount parameter, and hide options based on checkboxes | Pushkar Joshi | 2012-03-13 |
| |/ / / |
|
| * | / | turn off the fill color for pen tool paths by default | Pushkar Joshi | 2012-03-13 |
| | |/
| |/| |
|