aboutsummaryrefslogtreecommitdiff
path: root/js
Commit message (Collapse)AuthorAge
...
| | | * | Merge branch 'refs/heads/master' into GIO-TextToolArmen Kesablyan2012-07-03
| | | |\ \
| | | * | | Text Tool 2Armen Kesablyan2012-07-03
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Armen Kesablyan <armen@motorola.com>
| | | * | | Merge branch 'refs/heads/master' into GIO-TextToolArmen Kesablyan2012-07-02
| | | |\ \ \
| | | * | | | Bug: Font Name & Size not updating text toolArmen Kesablyan2012-07-02
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Armen Kesablyan <armen@motorola.com>
| | | * | | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internalArmen Kesablyan2012-06-28
| | | |\ \ \ \
| | * | \ \ \ \ Merge branch 'Taper' of https://github.com/ericmueller/ninja-internalValerio Virgillito2012-07-09
| | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: js/lib/geom/circle.js js/lib/rdge/materials/linear-gradient-material.js Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| | | * | | | | | 'V' texture map coordinate was inverted in some cases.hwc4872012-06-29
| | | | | | | | |
| | | * | | | | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into Taperhwc4872012-06-29
| | | |\ \ \ \ \ \
| | | * \ \ \ \ \ \ Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into Taperhwc4872012-06-28
| | | |\ \ \ \ \ \ \ | | | | | |_|/ / / / | | | | |/| | | | |
| | | * | | | | | | Added capability to split a mesh into multiiple parts to avoid buffer ↵hwc4872012-06-28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | overflow situations.
| | * | | | | | | | Merge pull request #372 from mencio/youtube-fixValerio Virgillito2012-07-09
| | |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | Removing the youtube hack now that we have the proper fix from montage
| | | * | | | | | | | Removing the youtube hack now that we have the proper fix from montageValerio Virgillito2012-07-03
| | | | |_|_|_|_|/ / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Removing the saved instance of the component when opening a file containing the youtube component. Montage made the fix where the instance is now serialized property. Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| | * | | | | | | | Merge pull request #371 from ananyasen/menu-bug-fixValerio Virgillito2012-07-09
| | |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | fixed IKNINJA-1877 : Clicking on a menu item should commit on mouse up a...
| | | * | | | | | | | fixed IKNINJA-1877 : Clicking on a menu item should commit on mouse up and ↵Ananya Sen2012-07-03
| | | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | not on mouse down. Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
| | * | | | | | | | Merge pull request #368 from mqg734/CopyPasteWebGLValerio Virgillito2012-07-09
| | |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | IKNinja-1736 and IKNinja-1802 - Copy paste WebGL bugs.
| | | * | | | | | | | IKNinja-1736 and IKNinja-1802 - Copy paste WebGL bugs.Nivesh Rajbhandari2012-07-02
| | | | |_|_|_|_|/ / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| | * | | | | | | | Merge pull request #366 from joseeight/ColorValerio Virgillito2012-07-09
| | |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | Fix: IKNINJA-1634
| | | * | | | | | | | Fix: IKNINJA-1634Jose Antonio Marquez2012-07-02
| | | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixing reference error for gradient stops on click.
| | * | | | | | | | Merge pull request #364 from ananyasen/bugfix-masterValerio Virgillito2012-07-09
| | |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | Fixed IKNINJA-1763, IKNINJA-1807 - refresh stage after loading image/svg
| | | * | | | | | | | removing unnecessary variableAnanya Sen2012-06-29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
| | | * | | | | | | | Fixed IKNINJA-1763, IKNINJA-1807 - refresh stage after loading is done for ↵Ananya Sen2012-06-29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | image and svg Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
| | * | | | | | | | | Merge pull request #357 from ericmueller/GridFixesValerio Virgillito2012-07-09
| | |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Fixes for incorrect line/polygon intersections.
| | * \ \ \ \ \ \ \ \ \ Merge branch 'refs/heads/ninja-internal' into MaterialsUINivesh Rajbhandari2012-07-09
| | |\ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|_|/ | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: js/panels/Materials/materials-library-panel.reel/materials-library-panel.css js/panels/Materials/materials-popup.reel/materials-popup.css Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| | * | | | | | | | | | PI, drawing and editing fixes for shapes and materials.Nivesh Rajbhandari2012-07-09
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | IKNinja-1841 - Cannot change webgl shape with LinearGradient and RadialGradient to solid color. IKNINJA-1851 - Cannot draw webgl shapes with Linear/RadialGradient material. IKNINJA-1864 - PI doesn't update the color of shape if WebGL material switches to Flat. IKNINJA-1886 - Gradient edits not applied to WebGL Stage object. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| | * | | | | | | | | | IKNINJA-1246 - Line drawing feedback disappears when using no-color or ↵Nivesh Rajbhandari2012-07-09
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | gradient for stroke color. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| | * | | | | | | | | | Merge branch 'refs/heads/ninja-internal' into MaterialsUINivesh Rajbhandari2012-07-02
| | |\ \ \ \ \ \ \ \ \ \ | | | | |_|_|/ / / / / / | | | |/| | | | | | | |
| | * | | | | | | | | | Performance fix for WebGL materials playing even when the dialog/file is no ↵Nivesh Rajbhandari2012-06-27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | longer in view. Also pausing videos when switching documents. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| | * | | | | | | | | | Integrating Materials UI changes. Squashed commit of the following:Nivesh Rajbhandari2012-06-27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |