Commit message (Expand) | Author | Age | ||
---|---|---|---|---|
... | ||||
| * | | | | | | | | | | Merge remote-tracking branch 'ninja-internal/master' into timeline-local | Jon Reid | 2012-06-20 | |
| |\ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / | | |/| | | / / / / / | | |_|_|_|/ / / / / | |/| | | | | | | | | ||||
* | | | | | | | | | | 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 | |
| | | |_|_|_|_|_|/ | | |/| | | | | | | ||||
| * | | | | | | | | remove the un-used css file | Valerio Virgillito | 2012-06-20 | |
| * | | | | | | | | fixing the last instances of the old montage components in the css panel | Valerio Virgillito | 2012-06-20 | |
| * | | | | | | | | Merge branch 'refs/heads/master' into montage-v11-integration | Valerio Virgillito | 2012-06-20 | |
| |\| | | | | | | | ||||
| * | | | | | | | | fixing the css bugs with montage v11 | Valerio Virgillito | 2012-06-18 | |
| * | | | | | | | | fixing the components. | Valerio Virgillito | 2012-06-18 | |
| * | | | | | | | | 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 | |
* | | | | | | | | | | remove unneeded files | Jonathan Duran | 2012-06-20 | |
| |_|_|/ / / / / / |/| | | | | | | | | ||||
* | | | | | | | | | remove obsolete functions | Jonathan Duran | 2012-06-19 | |
* | | | | | | | | | Merge remote-tracking branch 'ninja-jduran/TimelineUber' into timeline-local | Jon Reid | 2012-06-19 | |
|\ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / | |/| | | | | | | | ||||
| * | | | | | | | | prop tween splitting | Jonathan Duran | 2012-06-19 | |
| * | | | | | | | | Lock Position and Size keyframes to main track keyframes | Jonathan Duran | 2012-06-19 | |
| * | | | | | | | | Fix position tracks collapser to use unique element | Jonathan Duran | 2012-06-19 | |
| | |_|_|/ / / / | |/| | | | | | | ||||
* / | | | | | | | Timeline: Re-enable drag-and-drop of layers, now with bonus DOM | Jon Reid | 2012-06-19 | |
|/ / / / / / / | ||||
* | | | | | | | 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 | |
| * | | | | | | | Timeline: Default easing for new animation keyframes set to "none" per CSS | Jon Reid | 2012-06-18 | |
| * | | | | | | | Timeline: Bug Fixes | Jon Reid | 2012-06-18 | |
* | | | | | | | | Merge branch 'refs/heads/NINJAmaster' into TimelineUber | Jonathan Duran | 2012-06-19 | |
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | / / / / | | |_|/ / / / | |/| | | | | | ||||
| * | | | | | | Merge pull request #298 from ericmueller/Textures | Valerio Virgillito | 2012-06-19 | |
| |\ \ \ \ \ \ | | |_|/ / / / | |/| | | | | | ||||
| | * | | | | | 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 instan... | hwc487 | 2012-06-15 | |
| | * | | | | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into Tex... | hwc487 | 2012-06-14 | |
| | |\| | | | | ||||
| | * | | | | | Fix for line color. | hwc487 | 2012-06-14 | |
| | * | | | | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into Tex... | hwc487 | 2012-06-13 | |
| | |\ \ \ \ \ | ||||
| | * \ \ \ \ \ | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into Tex... | hwc487 | 2012-06-13 | |
| | |\ \ \ \ \ \ | | | | |_|_|_|/ | | | |/| | | | | ||||
| | * | | | | | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into Tex... | hwc487 | 2012-06-12 | |
| | |\ \ \ \ \ \ | | | | |_|_|_|/ | | | |/| | | | | ||||
| | * | | | | | | Disabled the add, copy, and delete buttons in the material library panel. Al... | hwc487 | 2012-06-12 | |
| | * | | | | | | material cleanup and rearchitecture | hwc487 | 2012-06-06 | |
| | * | | | | | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into Tex... | hwc487 | 2012-06-05 | |
| | |\ \ \ \ \ \ | ||||
| | * \ \ \ \ \ \ | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into Tex... | hwc487 | 2012-06-04 | |
| | |\ \ \ \ \ \ \ | ||||
| | * \ \ \ \ \ \ \ | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into Tex... | hwc487 | 2012-06-04 | |
| | |\ \ \ \ \ \ \ \ | ||||
| | * | | | | | | | | | Correction for texture paths. | hwc487 | 2012-06-01 | |
| | * | | | | | | | | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into Tex... | hwc487 | 2012-05-31 | |
| | |\ \ \ \ \ \ \ \ \ | ||||
| | * | | | | | | | | | | 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 Tex... | hwc487 | 2012-05-17 | |
| | |\ \ \ \ \ \ \ \ \ \ | ||||
| | * | | | | | | | | | | | Exposing parameters in Water Material | hwc487 | 2012-05-16 | |
| | * | | | | | | | | | | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into Tex... | hwc487 | 2012-05-11 | |
| | |\ \ \ \ \ \ \ \ \ \ \ | ||||
| | * | | | | | | | | | | | | Material editor | hwc487 | 2012-05-02 | |
| | * | | | | | | | | | | | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into Tex... | hwc487 | 2012-04-27 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ | ||||
| | * | | | | | | | | | | | | | Update materials to the new texture model. | hwc487 | 2012-04-26 | |
| * | | | | | | | | | | | | | | Fixing binding of alpha slider/hottext in popup with panel | Jose Antonio Marquez | 2012-06-18 |