aboutsummaryrefslogtreecommitdiff
path: root/js/panels
Commit message (Expand)AuthorAge
* Merge branch 'refs/heads/TimelineUberJD' into Timeline-local-krutiKruti Shah2012-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
* | LockedElements - LayersKruti Shah2012-06-19
* | Layer LockKruti Shah2012-06-19
* | Lock ElementsKruti Shah2012-06-19
* | Lock ELementsKruti Shah2012-06-19
* | Locked Elements. Layer ControlsKruti Shah2012-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
| | |\ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | Update materials to the new texture model.hwc4872012-04-26
| * | | | | | | | | | | | | Fixing binding of alpha slider/hottext in popup with panelJose Antonio Marquez2012-06-18
| * | | | | | | | | | | | | More cleaning upJose Antonio Marquez2012-06-16
| * | | | | | | | | | | | | Fixed slider/hottext bindingsJose Antonio Marquez2012-06-16
| * | | | | | | | | | | | | Fixing apply 'no color'Jose Antonio Marquez2012-06-15
| * | | | | | | | | | | | | Cleaning up referencesJose Antonio Marquez2012-06-14
| | |_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | |
* | | | | | | | | | | | | Timeline: Bug fix: Document switching no longer causes multiple styles to beJon Reid2012-06-15
* | | | | | | | | | | | | Timeline: Bug fix: Correctly maintain expand/collapse state of layers andJon Reid2012-06-15
* | | | | | | | | | | | | Timeline: Bug fix: When adding a new keyframe, easing is set to "undefined".Jon Reid2012-06-15
* | | | | | | | | | | | | Timeline: Bug fix IKNINJA 1716, "Ease options are not correctly displayed inJon Reid2012-06-15
* | | | | | | | | | | | | Timeline: fix for IKNINJA-1676, "Timeline: Can't insert a keyframe to a CSSJon Reid2012-06-15