| Commit message (Collapse) | Author | Age | |
|---|---|---|---|
| * | Merge branch 'refs/heads/ninja-internal' into MaterialsUI | Nivesh Rajbhandari | 2012-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> | ||
| | * | Update copyright boilerplate | Kris Kowal | 2012-07-06 |
| | | | |||
| * | | PI, drawing and editing fixes for shapes and materials. | Nivesh Rajbhandari | 2012-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> | ||
| * | | Merge branch 'refs/heads/ninja-internal' into MaterialsUI | Nivesh Rajbhandari | 2012-07-02 |
| |\| | |||
| | * | Merge pull request #358 from jreid01/timeline-pr | Valerio Virgillito | 2012-06-28 |
| | |\ | | | | | | | Timeline: Fix for deselect bug. | ||
| | | * | Timeline: Better deselection of tweens when selecting/deselecting layers. | Jon Reid | 2012-06-28 |
| | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js Resolved: use mine (doesn't matter, affected code block is in commented out section) | ||
| | * | | Merge pull request #361 from ericguzman/PresetsUpdate_6_28 | Valerio Virgillito | 2012-06-28 |
| | |\ \ | | | | | | | | | Presets/CSS Panel - Update css panel with preset class. | ||
| | | * | | Presets/CSS Panel - Update css panel with preset class. | Eric Guzman | 2012-06-28 |
| | | |/ | |||
| | * | | Merge pull request #354 from mencio/IKNINJA-1829 | Valerio Virgillito | 2012-06-28 |
| | |\ \ | | |/ | |/| | Fixing the button for the shape pi | ||
| | | * | removing some comments | Valerio Virgillito | 2012-06-28 |
| | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| | | * | Fixing the button for the shape pi | Valerio Virgillito | 2012-06-28 |
| | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| | * | | Fixing body PI background getter | Jose Antonio Marquez | 2012-06-28 |
| | | | | |||
| | * | | Fixing chips updating with alpha change | Jose Antonio Marquez | 2012-06-28 |
| | | | | |||
| | * | | Merge branch 'refs/heads/Ninja-Internal' into Color | Jose Antonio Marquez | 2012-06-28 |
| | |\| | |||
| | | * | FIX layer selection bug | Jonathan Duran | 2012-06-28 |
| | | | | | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com> | ||
| | * | | Fixing body background bug | Jose Antonio Marquez | 2012-06-28 |
| | | | | |||
| | * | | Fixing init alpha issue | Jose Antonio Marquez | 2012-06-28 |
| | | | | |||
| | * | | Fixing color panel sliders updating | Jose Antonio Marquez | 2012-06-28 |
| | | | | |||
| | * | | Merge branch 'refs/heads/Ninja-Internal' into Color | Jose Antonio Marquez | 2012-06-28 |
| | |\| | |||
| | | * | Timeline: bug fix IKNINJA-1843 | Jon Reid | 2012-06-27 |
| | | | | |||
| | * | | Fixing history bug | Jose Antonio Marquez | 2012-06-27 |
| | | | | |||
| | * | | Merge branch 'refs/heads/Ninja-Internal' into Color | Jose Antonio Marquez | 2012-06-27 |
| | |\| | |||
| | | * | Merge pull request #347 from mqg734/ComponentShapeToolBug | Valerio Virgillito | 2012-06-27 |
| | | |\ | | | | | | | | | Temporarily disable ElementMediator's addDelegate when adding components. | ||
| | | | * | Temporarily disable ElementMediator's addDelegate when adding components. | Nivesh Rajbhandari | 2012-06-27 |
| | | | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
| | * | | | Fixing minor color history bug | Jose Antonio Marquez | 2012-06-27 |
| | | | | | |||
| | * | | | Merge branch 'refs/heads/Ninja-Internal' into Color | Jose Antonio Marquez | 2012-06-27 |
| | |\| | | |||
| | | * | | Merge pull request #342 from imix23ways/Timeline-pullrequest | Valerio Virgillito | 2012-06-27 |
| | | |\ \ | | | | | | | | | | | Timeline Bugfixes | ||
| | | | * | | Bug Fix : Hot Text change from the CSS panel | Kruti Shah | 2012-06-27 |
| | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Kruti Shah <kruti.shah@motorola.com> | ||
| | | | * | | Merge branch 'refs/heads/TimelineUberJD' into Timeline-local-kruti | Kruti Shah | 2012-06-27 |
| | | | |\ \ | |||
| | | | | * \ | Merge branch 'refs/heads/timeline-local' into TimelineUber | Jonathan Duran | 2012-06-27 |
| | | | | |\ \ | |||
| | | | | | * | | Timeline: Bug fix: Hintable should work better now. | Jon Reid | 2012-06-27 |
| | | | | | | | | |||
| | | | | * | | | Fix animation names breaking | Jonathan Duran | 2012-06-27 |
| | | | | |/ / | | | | | | | | | | | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com> | ||
| | | | | * | | Merge branch 'refs/heads/NINJAmaster' into TimelineUber | Jonathan Duran | 2012-06-27 |
| | | | | |\| | |||
| | | | * | | | Merge branch 'refs/heads/ninjainternalmaster' into Timeline-local-kruti | Kruti Shah | 2012-06-27 |
| | | | |\ \ \ | | | | | |/ | | | | |/| | |||
| | | | * | | | Bug Fix : PI changes in Position updates the hottest in timeline & Keyframes ↵ | Kruti Shah | 2012-06-27 |
| | | | | |/ | | | |/| | | | | | | | | | | | | | | | | | | | | | deselection help apply style property Signed-off-by: Kruti Shah <kruti.shah@motorola.com> | ||
| | | | * | | Merge branch 'refs/heads/TimelineUberJD' into Timeline-local-kruti | Kruti Shah | 2012-06-27 |
| | | | |\ \ | |||
| | | | | * | | FIx - hook up play button in timeline to live preview | Jonathan Duran | 2012-06-26 |
| | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com> | ||
| | | | | * | | Fix keyframe selection stickiness | Jonathan Duran | 2012-06-26 |
| | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com> | ||
| | | | | * | | Merge branch 'refs/heads/timeline-local' into TimelineUber | Jonathan Duran | 2012-06-26 |
| | | | | |\ \ | |||
| | | | | | * | | Timeline: Bug fix: Adding or splitting tweens on multiple layers at once | Jon Reid | 2012-06-26 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | will no longer change the selection. | ||
| | | | | | * | | Merge remote-tracking branch 'ninja-jduran/TimelineUber' into timeline-local | Jon Reid | 2012-06-26 |
| | | | | | |\ \ | |||
| | | | | | * | | | Timeline: Bug fix: Keyboard shortcut now works for adding keyframes, | Jon Reid | 2012-06-26 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | including splitting tweens. | ||
| | | | | * | | | | Fix missing serialization in Layer.js | Jonathan Duran | 2012-06-26 |
| | | | | | |/ / | | | | |/| | | | | | | | | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com> | ||
| | | | | * | | | Merge branch 'refs/heads/timeline-local' into TimelineUber | Jonathan Duran | 2012-06-26 |
| | | | | |\| | | |||
| | | | | | * | | Timeline: Bug fix: Indexing on styles when loading files. | Jon Reid | 2012-06-26 |
| | | | | | | | | |||
| | | | | | * | | Merge remote-tracking branch 'ninja-jduran/TimelineUber' into timeline-local | Jon Reid | 2012-06-26 |
| | | | | | |\ \ | |||
| | | | | | * | | | Timeline: Bug fix IKNINJA-1816 | Jon Reid | 2012-06-26 |
| | | | | | | | | | |||
| | | | | * | | | | Fix - deselect tweens when selecting a layer | Jonathan Duran | 2012-06-26 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com> | ||
| | | | | * | | | | Merge branch 'refs/heads/NINJAmaster' into TimelineUber | Jonathan Duran | 2012-06-26 |
| | | | | |\ \ \ \ | |||
| | | | * | \ \ \ \ | Merge branch 'refs/heads/ninjainternalmaster' into Timeline-local-kruti | Kruti Shah | 2012-06-27 |
| | | | |\ \ \ \ \ \ | | | | | |/ / / / | | | | |/| | | | | |||