aboutsummaryrefslogtreecommitdiff
path: root/js/controllers/elements/shapes-controller.js
Commit message (Expand)AuthorAge
* Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into Tex...hwc4872012-06-12
|\
| * Merge branch 'refs/heads/master' into element-model-fixesValerio Virgillito2012-06-05
| |\
| | * Updated ink bottle tool to support color-chip's checkbox and undo/redo for st...Nivesh Rajbhandari2012-06-05
| | * Fill and Ink-Bottle fixes.Nivesh Rajbhandari2012-06-04
| * | removing all model creators.Valerio Virgillito2012-06-05
| |/
* | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into Tex...hwc4872012-06-04
|\|
| * document bindings phase 1Valerio Virgillito2012-05-29
* | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into Tex...hwc4872012-05-31
|\|
| * Fixing the dirty document flag. Disabling the stylesheets dirty flag because ...Valerio Virgillito2012-05-10
* | Fixing merge issueshwc4872012-05-14
* | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into Tex...hwc4872012-05-11
|\|
| * Refactor creating elements. Removed makeNJElement and separated the model cre...Valerio Virgillito2012-05-03
* | Updated hard-coded linear and radial gradients to use the color values in Lin...Nivesh Rajbhandari2012-05-03
* | Material editorhwc4872012-05-02
|/
* Fixed issue with setting stroke when using the PI.Nivesh Rajbhandari2012-04-24
* Allow users to toggle application of stroke and border settings when using th...Nivesh Rajbhandari2012-04-24
* Merge branch 'refs/heads/ninja-internal' into WebGLFixesNivesh Rajbhandari2012-04-17
|\
| * Fixing the shape borderValerio Virgillito2012-04-13
* | IKNinja-1477 - Cannot preflight Fill color if WebGL Line shape is selected.Nivesh Rajbhandari2012-04-17
|/
* Grow/shrink Line, Oval and Rectangles when changing stroke size.Nivesh Rajbhandari2012-04-06
* -webkit-transform-style needs to be set to preserve-3d for shapes regardless ...Nivesh Rajbhandari2012-04-05
* Fix for line tool not working because PI requests fill color for line as well...Nivesh Rajbhandari2012-04-05
* Removing fill, stroke, fillMaterial and strokeMaterial from the shapeModel ca...Nivesh Rajbhandari2012-04-05
* Merge branch 'refs/heads/ToolFixes' into WebGLMaterialsNivesh Rajbhandari2012-04-04
|\
| * Merge branch 'refs/heads/WebGLFileIO' into ToolFixesNivesh Rajbhandari2012-04-04
| |\
| | * Adjusting line's width and height when changing stroke size.Nivesh Rajbhandari2012-04-04
| | * Switching to Linear/RadialGradient materials will set the corresponding color...Nivesh Rajbhandari2012-04-02
| | * IKNinna-1409 - Should dirty document when changing shape properties. IKNinja-...Nivesh Rajbhandari2012-04-02
| | * Merge branch 'refs/heads/ninja-internal' into WebGLFileIONivesh Rajbhandari2012-03-30
| | |\
| | * | Updated shapes to always check for its stroke and fill colors and materials i...Nivesh Rajbhandari2012-03-29
| * | | Adding replaceElement routine and event so Timeline can avoid removing and ad...Nivesh Rajbhandari2012-04-04
| * | | Squashed commit of Preparing for the montage undo-manager: Architecture changesValerio Virgillito2012-04-04
| | |/ | |/|
| * | Merge branch 'master' into brushtoolPushkar Joshi2012-03-27
| |\|
| * | Merge branch 'master' into brushtoolPushkar Joshi2012-03-27
| |\ \
| * | | revert to using the angle without flipping its sign...fixing some minor bugs ...Pushkar Joshi2012-03-20
| * | | update values in the PI from values of the selected brush stroke or pen tool ...Pushkar Joshi2012-03-15
| * | | PI for pen and brush strokesPushkar Joshi2012-03-14
* | | | Merge branch 'refs/heads/ninja-internal' into WebGLMaterialsNivesh Rajbhandari2012-03-27
|\ \ \ \ | | |_|/ | |/| |
| * | | Reverting change for IKNinja-1355 because it is causing line tool to fail.Nivesh Rajbhandari2012-03-27
| | |/ | |/|
* | | Merge branch 'refs/heads/ninja-internal' into WebGLMaterialsNivesh Rajbhandari2012-03-27
|\| |
| * | Fixed a problem switching from 3D to 2D and back to 3D.hwc4872012-03-23
| * | Respect play/pause WebGL animation when saving files and re-rendering caused ...Nivesh Rajbhandari2012-03-23
| * | Adding checkbox in PI to start/stop WebGL animation preview.Nivesh Rajbhandari2012-03-22
* | | WebGL needs to have 3d styles to render.Nivesh Rajbhandari2012-03-22
* | | IKNINJA-1370 - Toggle WebGL on/off is no longer working in the PI.Nivesh Rajbhandari2012-03-20
|/ /
* / Support button control in Properties Panel and use them for edit fill and str...Nivesh Rajbhandari2012-03-20
|/
* gradient support for canvas-2d shapes.Nivesh Rajbhandari2012-03-07
* Gradient support for canvas-2d rectangle.Nivesh Rajbhandari2012-03-07
* preliminary support for setting gradients on webgl shapes.Nivesh Rajbhandari2012-03-07
* Squashed commit of preload-fix into MasterValerio Virgillito2012-03-06