aboutsummaryrefslogtreecommitdiff
path: root/js
Commit message (Expand)AuthorAge
* Merge branch 'refs/heads/master' into CSSPanelUpdatesEric Guzman2012-04-09
|\
| * Merge pull request #159 from mqg734/WebGLMaterialsValerio Virgillito2012-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
| | * Fixing 3d tool reset to redraw handles.Nivesh Rajbhandari2012-04-05
| | * Adding back fix in mediator to not set 3d styles unless necessary.Nivesh Rajbhandari2012-04-05
| | * Undoing bad auto-merge resize-composer.js.Nivesh Rajbhandari2012-04-05
| | * Fixing curly brackets from auto-merge.Nivesh Rajbhandari2012-04-05
| | * Undoing some minor spacing differences from auto-merge.Nivesh Rajbhandari2012-04-05
| | * Undoing mistakes from auto-merge.Nivesh Rajbhandari2012-04-05
| | * Removing unnecessary code element = element.Nivesh Rajbhandari2012-04-05
| | * Commenting out console logs.Nivesh Rajbhandari2012-04-05
| | * Merge branch 'refs/heads/ToolFixes' into WebGLMaterialsNivesh Rajbhandari2012-04-04
| | |\
| | | * Merge branch 'refs/heads/WebGLFileIO' into ToolFixesNivesh Rajbhandari2012-04-04
| | | |\
| | | | * We should require VecUtils instead of referring to the global reference since...Nivesh Rajbhandari2012-04-04
| | | | * Merge branch 'refs/heads/EricSnapping' into WebGLFileIONivesh Rajbhandari2012-04-04
| | | | |\
| | | | | * Snapping fixes.hwc4872012-04-02
| | | | | * Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into Sna...hwc4872012-03-29
| | | | | |\
| | | | | * | merge from mainhwc4872012-03-29
| | | | * | | Adjusting line's width and height when changing stroke size.Nivesh Rajbhandari2012-04-04
| | | | * | | IKNinja-635 - Can't see 3d handles if div is red, green or blue color.Nivesh Rajbhandari2012-04-03
| | | | * | | Give user feedback about which element the Fill/InkBottle tools will act on.Nivesh Rajbhandari2012-04-03
| | | | * | | IKNinja-1375 - After WebGL conversion from PI, Selection tool gets deactivate...Nivesh Rajbhandari2012-04-03
| | | | * | | IKNinja-1376 - 3D values reverted when using Selection tool to move the objec...Nivesh Rajbhandari2012-04-02
| | | | * | | IKNinja-1399 - [Eyedropper] Not sampling WebGL gradients after file open.Nivesh Rajbhandari2012-04-02
| | | | * | | 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
| | | | * | | IKNinja-1410 - Inner Radius should be restricted to 99%.Nivesh Rajbhandari2012-04-02
| | | | * | | Merge branch 'refs/heads/ninja-internal' into WebGLFileIONivesh Rajbhandari2012-04-02
| | | | |\ \ \
| | | | * | | | Update PI and Color Panel to reflect default LinearGradient and RadialGradien...Nivesh Rajbhandari2012-03-30
| | | | * | | | 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
| | | | * | | | We shouldn't set z to 0 for translate tool snapping because user may want to ...Nivesh Rajbhandari2012-03-29
| | | | | |_|/ | | | | |/| |
| | | * | | | Styling PI's Materials edit button.Nivesh Rajbhandari2012-04-04
| | | * | | | Merge branch 'refs/heads/ninja-internal' into ToolFixesNivesh Rajbhandari2012-04-04
| | | |\ \ \ \
| | | * | | | | Adding replaceElement routine and event so Timeline can avoid removing and ad...Nivesh Rajbhandari2012-04-04
| | * | | | | | IKNINJA-764 - The Local/Global options are not in synced with both 3D object ...Nivesh Rajbhandari2012-03-27
| | * | | | | | IKNINJA-1378 - Line Tool's drawing preview changes tool canvas's line style.Nivesh Rajbhandari2012-03-27
| | * | | | | | Merge branch 'refs/heads/ninja-internal' into WebGLMaterialsNivesh Rajbhandari2012-03-27
| | |\ \ \ \ \ \
| | * | | | | | | Check for Viewport case in StageController styles lookup.Nivesh Rajbhandari2012-03-27
| | * | | | | | | Build elements' properties3d values on file open.Nivesh Rajbhandari2012-03-27
| | * | | | | | | Merge branch 'refs/heads/WebGLFileIO' into WebGLMaterialsNivesh Rajbhandari2012-03-27
| | |\ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ Merge branch 'refs/heads/ninja-internal' into WebGLMaterialsNivesh Rajbhandari2012-03-27
| | |\ \ \ \ \ \ \ \
| | * | | | | | | | | Adding logic for flatten checkbox in PI.Nivesh Rajbhandari2012-03-24
| | * | | | | | | | | Tweaking some styles in the materials popup.Nivesh Rajbhandari2012-03-23
| | * | | | | | | | | WebGL needs to have 3d styles to render.Nivesh Rajbhandari2012-03-22
| | * | | | | | | | | IKNinja-1368 - Moving multiple selection of 2d elements starts changing the o...Nivesh Rajbhandari2012-03-22
| | * | | | | | | | | IKNINJA-758 - The rotation value of the stage is not updated in the propertie...Nivesh Rajbhandari2012-03-22