aboutsummaryrefslogtreecommitdiff
path: root/js/panels
Commit message (Expand)AuthorAge
* Merge branch 'refs/heads/timeline-local' into Timeline-merge-candidateJonathan Duran2012-06-20
|\
| * Timeline: Bug fix: Keyframe animation now works with 3D elements.Jon Reid2012-06-20
| * Merge remote-tracking branch 'ninja-internal/master' into timeline-localJon Reid2012-06-20
| |\
* | \ Merge branch 'refs/heads/NINJAmaster' into Timeline-merge-candidateJonathan Duran2012-06-20
|\ \ \ | | |/ | |/|
| * | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internalValerio Virgillito2012-06-20
| |\ \
| | * | Fixing logic to close color panel popupJose Antonio Marquez2012-06-19
| * | | remove the un-used css fileValerio Virgillito2012-06-20
| * | | fixing the last instances of the old montage components in the css panelValerio Virgillito2012-06-20
| * | | Merge branch 'refs/heads/master' into montage-v11-integrationValerio Virgillito2012-06-20
| |\| |
| * | | fixing the css bugs with montage v11Valerio Virgillito2012-06-18
| * | | fixing the components.Valerio Virgillito2012-06-18
| * | | Merge branch 'refs/heads/master' into montage-v11-integrationValerio Virgillito2012-06-18
| |\ \ \
| * | | | updating the components and descriptor.json to support montage v.11Valerio Virgillito2012-06-17
* | | | | remove unneeded filesJonathan Duran2012-06-20
| |_|_|/ |/| | |
* | | | remove obsolete functionsJonathan Duran2012-06-19
* | | | Merge remote-tracking branch 'ninja-jduran/TimelineUber' into timeline-localJon Reid2012-06-19
|\ \ \ \
| * | | | prop tween splittingJonathan Duran2012-06-19
| * | | | Lock Position and Size keyframes to main track keyframesJonathan Duran2012-06-19
| * | | | Fix position tracks collapser to use unique elementJonathan Duran2012-06-19
* | | | | Timeline: Re-enable drag-and-drop of layers, now with bonus DOMJon Reid2012-06-19
|/ / / /
* | | | Merge branch 'refs/heads/timeline-local' into TimelineUberJonathan Duran2012-06-19
|\ \ \ \
| * | | | Timeline: Enable splitting of keyframes with F6 interaction.Jon Reid2012-06-18
| * | | | Timeline: Default easing for new animation keyframes set to "none" per CSSJon Reid2012-06-18
| * | | | Timeline: Bug FixesJon Reid2012-06-18
* | | | | Merge branch 'refs/heads/NINJAmaster' into TimelineUberJonathan Duran2012-06-19
|\ \ \ \ \ | |/ / / / |/| | | / | | |_|/ | |/| |
| * | | Merge pull request #298 from ericmueller/TexturesValerio Virgillito2012-06-19
| |\ \ \ | | |_|/ | |/| |
| | * | Removed Flat material from the materials libraryhwc4872012-06-15
| | * | Re-added Raiders materialhwc4872012-06-15
| | * | Re-added Paris materialhwc4872012-06-15
| | * | Added correct 'Cancel' behavior to the material editorhwc4872012-06-15
| | * | Material changes through the popup editor can effect multiple material instan...hwc4872012-06-15
| | * | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into Tex...hwc4872012-06-14
| | |\|
| | * | Fix for line color.hwc4872012-06-14
| | * | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into Tex...hwc4872012-06-13
| | |\ \
| | * \ \ Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into Tex...hwc4872012-06-13
| | |\ \ \
| | * \ \ \ Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into Tex...hwc4872012-06-12
| | |\ \ \ \
| | * | | | | Disabled the add, copy, and delete buttons in the material library panel. Al...hwc4872012-06-12
| | * | | | | material cleanup and rearchitecturehwc4872012-06-06
| | * | | | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into Tex...hwc4872012-06-05
| | |\ \ \ \ \
| | * \ \ \ \ \ Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into Tex...hwc4872012-06-04
| | |\ \ \ \ \ \
| | * \ \ \ \ \ \ Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into Tex...hwc4872012-06-04
| | |\ \ \ \ \ \ \
| | * | | | | | | | Correction for texture paths.hwc4872012-06-01
| | * | | | | | | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into Tex...hwc4872012-05-31
| | |\ \ \ \ \ \ \ \
| | * | | | | | | | | Parameters for twistVertex materialhwc4872012-05-25
| | * | | | | | | | | Editable material propertieshwc4872012-05-22
| | * | | | | | | | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into Tex...hwc4872012-05-17
| | |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | | Exposing parameters in Water Materialhwc4872012-05-16
| | * | | | | | | | | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into Tex...hwc4872012-05-11
| | |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | Material editorhwc4872012-05-02
| | * | | | | | | | | | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into Tex...hwc4872012-04-27
| | |\ \ \ \ \ \ \ \ \ \ \