aboutsummaryrefslogtreecommitdiff
path: root/js/panels
Commit message (Collapse)AuthorAge
* Sub Property ADding KEyframe fixedKruti Shah2012-06-21
| | | | Signed-off-by: Kruti Shah <kruti.shah@motorola.com>
* Merge branch 'refs/heads/TimelineUberJD' into Timeline-local-krutiKruti Shah2012-06-20
|\
| * 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
| | | | | | | | | | | | | | | | | | | | This resolves closing the color panel popup when a user make a click outside the popup area or resizes the Ninja window. This should be tested prior to merging.
| | * | | remove the un-used css fileValerio Virgillito2012-06-20
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| | * | | fixing the last instances of the old montage components in the css panelValerio Virgillito2012-06-20
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| | * | | Merge branch 'refs/heads/master' into montage-v11-integrationValerio Virgillito2012-06-20
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: js/io/system/ninjalibrary.json Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| | * | | fixing the css bugs with montage v11Valerio Virgillito2012-06-18
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| | * | | fixing the components.Valerio Virgillito2012-06-18
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| | * | | 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
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * | | | | remove unneeded filesJonathan Duran2012-06-20
| | |_|_|/ | |/| | | | | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com>
* | | | | Merge branch 'refs/heads/TimelineUberJD' into Timeline-local-krutiKruti Shah2012-06-20
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js Signed-off-by: Kruti Shah <kruti.shah@motorola.com>
| * | | | remove obsolete functionsJonathan Duran2012-06-19
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com>
| * | | | Merge remote-tracking branch 'ninja-jduran/TimelineUber' into timeline-localJon Reid2012-06-19
| |\ \ \ \
| * | | | | Timeline: Re-enable drag-and-drop of layers, now with bonus DOMJon Reid2012-06-19
| | | | | | | | | | | | | | | | | | | | | | | | manipulation!
* | | | | | Merge branch 'refs/heads/TimelineUberJD' into Timeline-local-krutiKruti Shah2012-06-19
|\ \ \ \ \ \ | | |/ / / / | |/| | | |
| * | | | | prop tween splittingJonathan Duran2012-06-19
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com>
| * | | | | Lock Position and Size keyframes to main track keyframesJonathan Duran2012-06-19
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com>
| * | | | | Fix position tracks collapser to use unique elementJonathan Duran2012-06-19
| |/ / / / | | | | | | | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com>
* | | | | LockedElements - LayersKruti Shah2012-06-19
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Kruti Shah <kruti.shah@motorola.com>
* | | | | Layer LockKruti Shah2012-06-19
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Kruti Shah <kruti.shah@motorola.com>
* | | | | Lock ElementsKruti Shah2012-06-19
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Kruti Shah <kruti.shah@motorola.com>
* | | | | Lock ELementsKruti Shah2012-06-19
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Kruti Shah <kruti.shah@motorola.com>
* | | | | Locked Elements. Layer ControlsKruti Shah2012-06-19
|/ / / / | | | | | | | | | | | | Signed-off-by: Kruti Shah <kruti.shah@motorola.com>
* | | | Merge branch 'refs/heads/timeline-local' into TimelineUberJonathan Duran2012-06-19
|\ \ \ \
| * | | | Timeline: Enable splitting of keyframes with F6 interaction.Jon Reid2012-06-18
| | | | | | | | | | | | | | | | | | | | Bug fix: Error on console if you press F6 with no layer selected.
| * | | | Timeline: Default easing for new animation keyframes set to "none" per CSSJon Reid2012-06-18
| | | | | | | | | | | | | | | | | | | | standard.
| * | | | Timeline: Bug FixesJon Reid2012-06-18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Splitting tweens now works again for shift-click interaction - Fixed visual "jump" in keyframes and spans when splitting tweens - Set default easing to "none" to match CSS standard.
* | | | | Merge branch 'refs/heads/NINJAmaster' into TimelineUberJonathan Duran2012-06-19
|\ \ \ \ \ | |/ / / / |/| | | / | | |_|/ | |/| |
| * | | Merge pull request #298 from ericmueller/TexturesValerio Virgillito2012-06-19
| |\ \ \ | | |_|/ | |/| | Textures
| | * | 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 ↵hwc4872012-06-15
| | | | | | | | | | | | | | | | instances within a single object.
| | * | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into ↵hwc4872012-06-14
| | |\| | | | | | | | | | | | | Textures
| | * | Fix for line color.hwc4872012-06-14
| | | | | | | | | | | | | | | | Name change for all materials
| | * | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into ↵hwc4872012-06-13
| | |\ \ | | | | | | | | | | | | | | | Textures
| | * \ \ Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into ↵hwc4872012-06-13
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Textures Conflicts: js/io/system/ninjalibrary.json
| | * \ \ \ Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into ↵hwc4872012-06-12
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Textures Conflicts: assets/canvas-runtime.js js/io/system/ninjalibrary.json js/mediators/element-mediator.js
| | * | | | | Disabled the add, copy, and delete buttons in the material library panel. ↵hwc4872012-06-12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Also removed the Custom Materials section.
| | * | | | | material cleanup and rearchitecturehwc4872012-06-06
| | | | | | |
| | * | | | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into ↵hwc4872012-06-05
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Textures
| | * \ \ \ \ \ Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into ↵hwc4872012-06-04
| | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | Textures
| | * \ \ \ \ \ \ Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into ↵hwc4872012-06-04
| | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Textures