Commit message (Expand) | Author | Age | ||
---|---|---|---|---|
... | ||||
| | | | * | | | | | | | | | | | | Merge branch 'ToolFixes' of github.com:mqg734/ninja-internal into working | hwc487 | 2012-02-02 | |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ | ||||
| | | | * | | | | | | | | | | | | | Added the 'animate' flag to the pulse material | hwc487 | 2012-02-02 | |
| | | | * | | | | | | | | | | | | | added some additional shaders | hwc487 | 2012-02-02 | |
| | | * | | | | | | | | | | | | | | Merge branch 'refs/heads/ninja-internal' into WebGLFixes | Nivesh Rajbhandari | 2012-02-09 | |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | |_|_|_|_|_|_|_|_|_|/ / / | | | | |/| | | | | | | | | | | | | ||||
| | | * | | | | | | | | | | | | | | Undoing experimental changes from the basic webgl shaders. | Nivesh Rajbhandari | 2012-02-09 | |
| | | * | | | | | | | | | | | | | | Removing image assets that were being used by deleted WebGL materials. | Nivesh Rajbhandari | 2012-02-09 | |
| | | * | | | | | | | | | | | | | | Removed unused materials. | Nivesh Rajbhandari | 2012-02-09 | |
| | | * | | | | | | | | | | | | | | Merging WebGL changes that allow users to modify different shape instances. A... | Nivesh Rajbhandari | 2012-02-09 | |
| | | | | | | | | | | | | * | | | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into Wor... | John Mayhew | 2012-02-10 | |
| | | | | | | | | | | | | |\ \ \ \ | | | |_|_|_|_|_|_|_|_|_|_|/ / / / | | |/| | | | | | | | | | | | | | | ||||
| | * | | | | | | | | | | | | | | | Merge branch 'text-tool' of https://github.com/dhg637/ninja-internal into fea... | Valerio Virgillito | 2012-02-09 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'code-cleanup' of https://github.com/mencio/ninja-internal into ... | Valerio Virgillito | 2012-02-09 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||
| | | * | | | | | | | | | | | | | | | | Removing the un-used context menu style | Valerio Virgillito | 2012-02-09 | |
| | | * | | | | | | | | | | | | | | | | deleted old utils file and move single method into NJUtils | Valerio Virgillito | 2012-02-09 | |
| | | * | | | | | | | | | | | | | | | | Removing the un-used package.json | Valerio Virgillito | 2012-02-09 | |
| | | | |_|/ / / / / / / / / / / / / | | | |/| | | | | | | | | | | | | | | ||||
| | * | | | | | | | | | | | | | | | | Merge branch 'Timeline' of https://github.com/imix23ways/ninja-internal into ... | Valerio Virgillito | 2012-02-09 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | ||||
| | | * | | | | | | | | | | | | | | | Squashed commit of the following: | Jonathan Duran | 2012-02-09 | |
| | | * | | | | | | | | | | | | | | | Fix layer/element selection on first click select | Jonathan Duran | 2012-02-09 | |
| | | * | | | | | | | | | | | | | | | Squashed commit of the following: | Jonathan Duran | 2012-02-09 | |
| | | * | | | | | | | | | | | | | | | Merge branch 'refs/heads/NINJAmaster' into Timeline | Jonathan Duran | 2012-02-09 | |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||
| | | * | | | | | | | | | | | | | | | | Fixes for animation element assignment | Jonathan Duran | 2012-02-09 | |
| | | * | | | | | | | | | | | | | | | | Cleanup | Jonathan Duran | 2012-02-09 | |
| | | * | | | | | | | | | | | | | | | | Cleaning up more code and adding more models for timeline | Jonathan Duran | 2012-02-09 | |
| | | * | | | | | | | | | | | | | | | | Squashed commit of the following: | Jonathan Duran | 2012-02-08 | |
| | | * | | | | | | | | | | | | | | | | Display time reading above layers and code clean up | Jonathan Duran | 2012-02-08 | |
| | | * | | | | | | | | | | | | | | | | Merge branch 'refs/heads/Timeline_updated' into Timeline | Jonathan Duran | 2012-02-08 | |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||
| | | | * | | | | | | | | | | | | | | | | Numbering of layers between different selectedContainers starts from 1 | Kruti Shah | 2012-02-08 | |
| | | | * | | | | | | | | | | | | | | | | Merge branch 'refs/heads/Timeline' into Timeline_updated | Kruti Shah | 2012-02-08 | |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||
| | | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'refs/heads/Timeline' into Timeline_updated | Kruti Shah | 2012-02-08 | |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||
| | | * | | | | | | | | | | | | | | | | | | | Squashed commit of the following: | Jonathan Duran | 2012-02-08 | |
| | | * | | | | | | | | | | | | | | | | | | | Squashed commit of the following: | Jonathan Duran | 2012-02-08 | |
| | | * | | | | | | | | | | | | | | | | | | | Make Stage work after live preview | Jonathan Duran | 2012-02-08 | |
| | | * | | | | | | | | | | | | | | | | | | | Squashed commit of the following: | Jonathan Duran | 2012-02-08 | |
| | | * | | | | | | | | | | | | | | | | | | | Squashed commit of the following: | Jonathan Duran | 2012-02-08 | |
| | | | |_|/ / / / / / / / / / / / / / / / | | | |/| | | | | | | | | | | | | | | | | | ||||
| | | * | | | | | | | | | | | | | | | | | | Merge branch 'refs/heads/Timeline-jreid' into Timeline | Jonathan Duran | 2012-02-08 | |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||
| | | | * | | | | | | | | | | | | | | | | | | Timeline: restore method incorrectly removed in last commit. | Jon Reid | 2012-02-08 | |
| | | * | | | | | | | | | | | | | | | | | | | Keyframe and span style updates and change time marker times | Jonathan Duran | 2012-02-08 | |
| | | |/ / / / / / / / / / / / / / / / / / | ||||
| | | * | | | | | | | | | | | | | | | | | | Timeline: Feature: select first layer by default. Bug fix: Remove left panel ... | Jon Reid | 2012-02-08 | |
| | | * | | | | | | | | | | | | | | | | | | Merge branch 'Timeline-jduran' into Timeline-jreid | Jon Reid | 2012-02-08 | |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | |/ / / / / / / / / / / / / / / / | | | | |/| | | | | | | | | | | | | | | | | ||||
| | | | * | | | | | | | | | | | | | | | | | Merge branch 'refs/heads/Timeline_updated' into Timeline | Jonathan Duran | 2012-02-08 | |
| | | | |\| | | | | | | | | | | | | | | | | ||||
| | | | | * | | | | | | | | | | | | | | | | Timeline : Adding functionality to unable deletion when a single layer remain... | Kruti Shah | 2012-02-07 | |
| | | | | * | | | | | | | | | | | | | | | | Timeline : Layers & DOM enchancement | Kruti Shah | 2012-02-07 | |
| | | | | * | | | | | | | | | | | | | | | | Timeline : Change in the Hooking up of DOM/Layers | Kruti Shah | 2012-02-06 | |
| | | | * | | | | | | | | | | | | | | | | | Layer Undo enhancements | Jonathan Duran | 2012-02-07 | |
| | | | * | | | | | | | | | | | | | | | | | Add Span color highlight for animated spans and restyle keyframes | Jonathan Duran | 2012-02-07 | |
| | | * | | | | | | | | | | | | | | | | | | Timeline: Comment updates. | Jon Reid | 2012-02-07 | |
| | | * | | | | | | | | | | | | | | | | | | Timeline: Finish focus/blur for left side of panel. Add new methods selectLa... | Jon Reid | 2012-02-07 | |
| | | * | | | | | | | | | | | | | | | | | | Timeline: select/deselect layers. Work on focus/blur for layers. | Jon Reid | 2012-02-07 | |
| | | * | | | | | | | | | | | | | | | | | | Timeline: fix linked scrolling between tracks and layers (vertical) and track... | Jon Reid | 2012-02-07 | |
| | | |/ / / / / / / / / / / / / / / / / | ||||
| | | * | | | | | | | | | | | | | | | | | Hookup track animations to layer element | Jonathan Duran | 2012-02-07 | |
| | | * | | | | | | | | | | | | | | | | | Fix timeline time markers | Jonathan Duran | 2012-02-07 |