| Commit message (Collapse) | Author | Age | |
|---|---|---|---|
| * | Merge branch 'refs/heads/NINJAmaster' into Timeline-merge-candidate | Jonathan Duran | 2012-06-20 |
| |\ | |||
| | * | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal | Valerio Virgillito | 2012-06-20 |
| | |\ | |||
| | | * | Fixing logic to close color panel popup | Jose Antonio Marquez | 2012-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 file | Valerio Virgillito | 2012-06-20 |
| | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| | * | | fixing the last instances of the old montage components in the css panel | Valerio Virgillito | 2012-06-20 |
| | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| | * | | Merge branch 'refs/heads/master' into montage-v11-integration | Valerio Virgillito | 2012-06-20 |
| | |\| | | | | | | | | | | | | | | | | | | | Conflicts: js/io/system/ninjalibrary.json Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| | * | | fixing the css bugs with montage v11 | Valerio Virgillito | 2012-06-18 |
| | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| | * | | fixing the components. | Valerio Virgillito | 2012-06-18 |
| | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| | * | | Merge branch 'refs/heads/master' into montage-v11-integration | Valerio Virgillito | 2012-06-18 |
| | |\ \ | |||
| | * | | | updating the components and descriptor.json to support montage v.11 | Valerio Virgillito | 2012-06-17 |
| | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| * | | | | remove unneeded files | Jonathan Duran | 2012-06-20 |
| | | | | | | | | | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com> | ||
| * | | | | remove obsolete functions | Jonathan Duran | 2012-06-19 |
| | | | | | | | | | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com> | ||
| * | | | | Merge remote-tracking branch 'ninja-jduran/TimelineUber' into timeline-local | Jon Reid | 2012-06-19 |
| |\ \ \ \ | |||
| | * | | | | prop tween splitting | Jonathan Duran | 2012-06-19 |
| | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com> | ||
| | * | | | | Lock Position and Size keyframes to main track keyframes | Jonathan Duran | 2012-06-19 |
| | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com> | ||
| | * | | | | Fix position tracks collapser to use unique element | Jonathan Duran | 2012-06-19 |
| | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com> | ||
| * | | | | | Timeline: Re-enable drag-and-drop of layers, now with bonus DOM | Jon Reid | 2012-06-19 |
| |/ / / / | | | | | | | | | | | | | manipulation! | ||
| * | | | | Merge branch 'refs/heads/timeline-local' into TimelineUber | Jonathan Duran | 2012-06-19 |
| |\ \ \ \ | |||
| | * | | | | Timeline: Enable splitting of keyframes with F6 interaction. | Jon Reid | 2012-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 CSS | Jon Reid | 2012-06-18 |
| | | | | | | | | | | | | | | | | | | | | | standard. | ||
| | * | | | | Timeline: Bug Fixes | Jon Reid | 2012-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 TimelineUber | Jonathan Duran | 2012-06-19 |
| |\ \ \ \ \ | |/ / / / |/| | | / | | |_|/ | |/| | | |||
| | * | | | Merge pull request #298 from ericmueller/Textures | Valerio Virgillito | 2012-06-19 |
| | |\ \ \ | | |_|/ | |/| | | Textures | ||
| | | * | | Removed Flat material from the materials library | hwc487 | 2012-06-15 |
| | | | | | |||
| | | * | | Re-added Raiders material | hwc487 | 2012-06-15 |
| | | | | | |||
| | | * | | Re-added Paris material | hwc487 | 2012-06-15 |
| | | | | | |||
| | | * | | Added correct 'Cancel' behavior to the material editor | hwc487 | 2012-06-15 |
| | | | | | |||
| | | * | | Material changes through the popup editor can effect multiple material ↵ | hwc487 | 2012-06-15 |
| | | | | | | | | | | | | | | | | | instances within a single object. | ||
| | | * | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into ↵ | hwc487 | 2012-06-14 |
| | | |\| | | | | | | | | | | | | | Textures | ||
| | | * | | Fix for line color. | hwc487 | 2012-06-14 |
| | | | | | | | | | | | | | | | | | Name change for all materials | ||
| | | * | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into ↵ | hwc487 | 2012-06-13 |
| | | |\ \ | | | | | | | | | | | | | | | | Textures | ||
| | | * \ \ | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into ↵ | hwc487 | 2012-06-13 |
| | | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Textures Conflicts: js/io/system/ninjalibrary.json | ||
| | | * \ \ \ | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into ↵ | hwc487 | 2012-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. ↵ | hwc487 | 2012-06-12 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also removed the Custom Materials section. | ||
| | | * | | | | | material cleanup and rearchitecture | hwc487 | 2012-06-06 |
| | | | | | | | | |||
| | | * | | | | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into ↵ | hwc487 | 2012-06-05 |
| | | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Textures | ||
| | | * \ \ \ \ \ | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into ↵ | hwc487 | 2012-06-04 |
| | | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Textures | ||
| | | * \ \ \ \ \ \ | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into ↵ | hwc487 | 2012-06-04 |
| | | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Textures | ||
| | | * | | | | | | | | Correction for texture paths. | hwc487 | 2012-06-01 |
| | | | | | | | | | | | |||
| | | * | | | | | | | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into ↵ | hwc487 | 2012-05-31 |
| | | |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Textures Conflicts: js/io/system/ninjalibrary.json | ||
| | | * | | | | | | | | | Parameters for twistVertex material | hwc487 | 2012-05-25 |
| | | | | | | | | | | | | |||
| | | * | | | | | | | | | Editable material properties | hwc487 | 2012-05-22 |
| | | | | | | | | | | | | |||
| | | * | | | | | | | | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into ↵ | hwc487 | 2012-05-17 |
| | | |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Textures | ||
| | | * | | | | | | | | | | Exposing parameters in Water Material | hwc487 | 2012-05-16 |
| | | | | | | | | | | | | | |||
| | | * | | | | | | | | | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into ↵ | hwc487 | 2012-05-11 |
| | | |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Textures Conflicts: js/lib/geom/geom-obj.js js/lib/geom/rectangle.js js/tools/TagTool.js | ||
| | | * | | | | | | | | | | | Material editor | hwc487 | 2012-05-02 |
| | | | | | | | | | | | | | | |||
| | | * | | | | | | | | | | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into ↵ | hwc487 | 2012-04-27 |
| | | |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Textures | ||
| | | * | | | | | | | | | | | | Update materials to the new texture model. | hwc487 | 2012-04-26 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |||