aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
...
* | | | | | | | | | Merge pull request #357 from ericmueller/GridFixesValerio Virgillito2012-07-09
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | Fixes for incorrect line/polygon intersections.
* \ \ \ \ \ \ \ \ \ \ Merge pull request #346 from mqg734/MaterialsUIValerio Virgillito2012-07-09
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | | UI support for preview, edit, duplicate and delete of WebGL Materials.
| * | | | | | | | | | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | commit 89ccb55130e67c4516e616ccc56d2a649a2b9160 Author: Nivesh Rajbhandari <mqg734@motorola.com> Date: Wed Jun 27 14:20:01 2012 -0700 Position Materials Editor popup and change buttons' text color. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> commit 89bca82adc781f4913f8d302a49a8baa907631c5 Author: Nivesh Rajbhandari <mqg734@motorola.com> Date: Wed Jun 27 12:00:51 2012 -0700 Support deleting and editing custom materials. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> commit 5be5160c4786beb70e8ad4d75562adb135718c6c Merge: 1d9d9f6 2ebf3e3 Author: Nivesh Rajbhandari <mqg734@motorola.com> Date: Wed Jun 27 11:11:37 2012 -0700 Merge branch 'refs/heads/ninja-internal' into WebGLMaterials Conflicts: js/data/panels-data.js Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> commit 1d9d9f6e66ea7585f07ed461cebba99e71f65de0 Author: Nivesh Rajbhandari <mqg734@motorola.com> Date: Tue Jun 26 22:01:22 2012 -0700 "Save as" support to duplicate material with modified settings. Also removed Add button and disabled Reset button for now. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> commit bf1037508dbc686f2884765344832f906cbf06d0 Author: Nivesh Rajbhandari <mqg734@motorola.com> Date: Tue Jun 26 17:23:31 2012 -0700 Added UI for duplicating and deleting materials in the Materials Library. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> commit 54930792f9c417df5f739831164aa1f96a41d67a Author: Nivesh Rajbhandari <mqg734@motorola.com> Date: Tue Jun 26 14:29:17 2012 -0700 Added preview of material in materials editor popup and fixed some styling. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| | | | | | | | | | * Grid drawing fixes.hwc4872012-07-09
| | | | | | | | | | |
| | | | | | | | | | * Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into ↵hwc4872012-07-09
| | | | | | | | | | |\ | |_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | GridFixes
* | | | | | | | | | | adding missing copyright to the feed reader.Valerio Virgillito2012-07-06
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* | | | | | | | | | | Merge pull request #373 from kriskowal/bsdValerio Virgillito2012-07-06
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / / |/| | | | | | | | | | Update copyright boilerplate
| * | | | | | | | | | Update copyright boilerplateKris Kowal2012-07-06
|/ / / / / / / / / /
* | | | | | | | | | adding missing montage to the user library and temporary fix for picas ↵Valerio Virgillito2012-07-03
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | screen trash Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| | | | | | | | | * fix for grid drawing.hwc4872012-07-09
| | | | | | | | | |
| | | | | | | | | * Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into ↵hwc4872012-07-03
| | | | | | | | | |\ | |_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | GridFixes
* | | | | | | | | | Merge pull request #369 from aadsm/gh-329_template-creator-restores-elementValerio Virgillito2012-07-03
|\ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / |/| | | | | | | | | gh-329 Make Template Creator restore the elements after serialization
| * | | | | | | | | gh-329 Make Template Creator restore the elements after serializationAntónio Afonso2012-07-03
|/ / / / / / / / / | | | | | | | | | | | | | | | | | | To create the serialization the element of each component needs to point to a new one, since the code was not restoring these elements the components were left in an undefined state.
| | | | | | | | * fixes for grid drawing.hwc4872012-07-03
| | | | | | | | |
| | | | | | | | * Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into ↵hwc4872012-07-02
| | | | | <