aboutsummaryrefslogtreecommitdiff
path: root/js/controllers
Commit message (Expand)AuthorAge
...
| * | Merge pull request #159 from mqg734/WebGLMaterialsValerio Virgillito2012-04-09
| |\ \
| * \ \ Merge pull request #155 from ericguzman/PresetsPIValerio Virgillito2012-04-05
| |\ \ \
| | * | | Presets Controller - Update to not use "_element" property of selection.Eric Guzman2012-04-04
| | | |/ | | |/|
| * | | Merge pull request #153 from mencio/componentsValerio Virgillito2012-04-05
| |\ \ \
| | * | | Merge branch 'refs/heads/master' into componentsValerio Virgillito2012-04-04
| | |\| |
| | * | | Merge branch 'refs/heads/master' into componentsValerio Virgillito2012-03-30
| | |\ \ \
| | * \ \ \ Merge branch 'refs/heads/master' into componentsValerio Virgillito2012-03-28
| | |\ \ \ \
| | * | | | | removed trace statementValerio Virgillito2012-03-27
| * | | | | | [CR] Keep Save related menu items always enabled, if there is an open documentAnanya Sen2012-04-04
| | |_|_|/ / | |/| | | |
* | | | | | Single perspective fix.Nivesh Rajbhandari2012-04-09
| |_|_|_|/ |/| | | |
* | | | | 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
| | |_|/ / | |/| | |
| * | | | Merge branch 'refs/heads/master' into PresetsPIEric Guzman2012-04-04
| |\ \ \ \
| | * | | | Squashed commit of Preparing for the montage undo-manager: Architecture changesValerio Virgillito2012-04-04
| | | |/ / | | |/| |
| * | | | Animation Presets - Only combine animations if pre-existing animations existEric Guzman2012-04-02
| * | | | Presets Controller - Remove unused method callEric Guzman2012-03-30
| * | | | Merge branch 'refs/heads/master' into PresetsPIEric Guzman2012-03-29
| |\| | |
| | * | | Merge pull request #147 from pushkarjoshi/brushtoolValerio Virgillito2012-03-29
| | |\ \ \ | | | |/ / | | |/| |
| | | * | Merge branch 'master' into brushtoolPushkar Joshi2012-03-28
| | | |\ \
| | | * \ \ 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
| | | * | | | Merge branch 'master' into brushtoolPushkar Joshi2012-03-16
| | | |\ \ \ \
| | | * | | | | update values in the PI from values of the selected brush stroke or pen tool ...Pushkar Joshi2012-03-15
| | | * | | | | Merge branch 'master' into pentoolPushkar Joshi2012-03-14
| | | |\ \ \ \ \
| | | * | | | | | PI for pen and brush strokesPushkar Joshi2012-03-14
| | * | | | | | | Merge pull request #131 from ananyasen/integration-candidateValerio Virgillito2012-03-28
| | |\ \ \ \ \ \ \ | | | |_|_|_|_|_|/ | | |/| | | | | |
| | | * | | | | | - enable/disable save, saveAs, saveAll, close, closeAll as per documents openAnanya Sen2012-03-22
| | * | | | | | | Merge pull request #145 from ericguzman/PresetsPIValerio Virgillito2012-03-28
| | |\ \ \ \ \ \ \ | | | |_|_|_|_|_|/ | | |/| | | | | |
| * | | | | | | | Presets - Remove style transition when transition doesn't start. Also added t...Eric Guzman2012-03-29
| | |/ / / / / / | |/| | | | | |
| * | | | | | | Merge branch 'refs/heads/master' into PresetsPIEric Guzman2012-03-27
| |\ \ \ \ \ \ \ | | | |_|_|_|_|/ | | |/| | | | |
| * | | | | | | Presets Panel - Adding presets controller and removing functionality from pan...Eric Guzman2012-03-22
| | |_|/ / / / | |/| | | | |
* | | | | | | 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
| | |/ / / / | |/| | | |
* | | | | | Check for Viewport case in StageController styles lookup.Nivesh Rajbhandari2012-03-27
* | | | | | Merge branch 'refs/heads/ninja-internal' into WebGLMaterialsNivesh Rajbhandari2012-03-27
|\| | | | |
| * | | | | Merge pull request #142 from joseeight/ColorValerio Virgillito2012-03-26
| |\ \ \ \ \
| | * | | | | Fix: IKNINJA-1355Jose Antonio Marquez2012-03-26
| | |/ / / /
| * | | | | Fixed a problem switching from 3D to 2D and back to 3D.hwc4872012-03-23
| * | | | | Merge branch 'refs/heads/Ninja-Montage-Integration' into FileIO-Montage-Compo...Jose Antonio Marquez2012-03-23
| |\ \ \ \ \