aboutsummaryrefslogtreecommitdiff
path: root/js/panels
Commit message (Collapse)AuthorAge
...
| | | * | | | Merge branch 'refs/heads/master' into stage-document-architectureValerio Virgillito2012-04-26
| | | |\ \ \ \
| | | * \ \ \ \ Merge branch 'refs/heads/master' into stage-document-architectureValerio Virgillito2012-04-26
| | | |\ \ \ \ \ | | | | | |_|_|/ | | | | |/| | |
| | | * | | | | Fixing the element model and adding get elementValerio Virgillito2012-04-26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| | * | | | | | Merge branch 'master' of https://github.com/mayhewinator/ninja-internal into ↵Valerio Virgillito2012-04-26
| | |\ \ \ \ \ \ | | | |_|_|/ / / | | |/| | | | | | | | | | | | | serialization
| | | * | | | | Removing all "module" declarations and replaced with "prototype" in ↵John Mayhew2012-04-26
| | | | |/ / / | | | |/| | | | | | | | | | | | | | | | | preparation for montage converting to the new "prototype" format fully
| * | | | | | Merge branch 'refs/heads/NINJAmaster' into TimelineUberJonathan Duran2012-04-27
| |\| | | | |
| | * | | | | Merge pull request #178 from mqg734/PerspectiveFixValerio Virgillito2012-04-26
| | |\ \ \ \ \ | | | |/ / / / | | |/| | | | IKNINJA-1511 - We don't currently support perspective values on individual elements, so removing perspective values from the animation presets.
| | | * | | | We don't currently support perspective values on individual elements, so ↵Nivesh Rajbhandari2012-04-26
| | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | removing perspective values from the animation presets. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| * | | | | Fix WEbGL not rendering on stage with timelineJonathan Duran2012-04-26
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com>
| * | | | | Timeline: Deleting elements now deletes associated layers.Jon Reid2012-04-26
| | | | | |
| * | | | | Timeline: comment out a conditional debugger; re-enable layer name storage.Jon Reid2012-04-26
| | | | | |
| * | | | | Merge remote-tracking branch 'ninja-jduran/TimelineUber' into timeline-localJon Reid2012-04-26
| |\ \ \ \ \
| | * | | | | Merge branch 'refs/heads/NINJAmaster' into TimelineUberJonathan Duran2012-04-26
| | |\| | | |
| | | * | | | Merge branch 'refs/heads/ninja-internal' into WebGLMaterialsNivesh Rajbhandari2012-04-25
| | | |\| | |
| | | * | | | Fixed materials editor popup not refreshing correctly.Nivesh Rajbhandari2012-04-16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| * | | | | | Timeline: Decouple Timeline and Breadcrumb. Remove most document changeJon Reid2012-04-26
| |/ / / / / | | | | | | | | | | | | | | | | | | event handlers. Bind Timeline to currentSelectedElement. Various bug fixes.
| * | | | | Merge remote-tracking branch 'ninja-jduran/TimelineUber' into timeline-localJon Reid2012-04-25
| |\ \ \ \ \
| | * | | | | Timeline Bug Fix : 1541Kruti Shah2012-04-25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Kruti Shah <kruti.shah@motorola.com>
| * | | | | | Timeline: Handling of multiselect of elements from stage.Jon Reid2012-04-25
| | | | | | |
| * | | | | | Timeline: New tracking for multiple selected layers.Jon Reid2012-04-25
| |/ / / / /
| * | | | | Merge branch 'refs/heads/NINJAmaster' into TimelineUberJonathan Duran2012-04-24
| |\ \ \ \ \ | | | |/ / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: js/components/layout/bread-crumb.reel/bread-crumb.js Signed-off-by: Jonathan Duran <jduran@motorola.com>
| * | | | | Turn on width and height as tweenable propertiesJonathan Duran2012-04-24
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com>
| * | | | | Change sublayer property names to match css property namesJonathan Duran2012-04-23
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com>
| * | | | | Fix Select All bug and remove debuggersJonathan Duran2012-04-23
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com>
| * | | | | Breadcrumb FixKruti Shah2012-04-20
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Kruti Shah <kruti.shah@motorola.com>
| * | | | | Merge branch 'refs/heads/timeline-local' into TimelineUberJonathan Duran2012-04-20
| |\ \ \ \ \
| | * | | | | Timeline: More bug fixes for selection with multiple documents opening andJon Reid2012-04-19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | closing.
| | * | | | | Timeline: Bug fix: check for uninitialized currentDocument in intializationJon Reid2012-04-19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | routine.
| | * | | | | Merge remote-tracking branch 'ninja-jduran/TimelineUber' into timeline-localJon Reid2012-04-19
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js Used mine.
| | * | | | | | Timeline: Bug fix: Maintain selection between document switching.Jon Reid2012-04-19
| | | | | | | |
| * | | | | | | Merge branch 'refs/heads/NINJAmaster' into TimelineUberJonathan Duran2012-04-20
| |\ \ \ \ \ \ \ | | |_|/ / / / / | |/| | | | | / | | | |_|_|_|/ | | |/| | | |
| * | | | | | Merge branch 'timeline-local' of github.com:ntfx47/ninja-internal into ↵Jonathan Duran2012-04-19
| |\ \ \ \ \ \ | | |_|/ / / / | |/| | | | | | | | | | | | TimelineUber
| | * | | | | BreadCrumb Bug FixKruti Shah2012-04-19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Kruti Shah <kruti.shah@motorola.com>
| * | | | | | Remove more unneeded requiresJonathan Duran2012-04-19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com>
| * | | | | | Remove unneeded requireJonathan Duran2012-04-19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com>
| * | | | | | Merge branch 'refs/heads/NINJAmaster' into TimelineUberJonathan Duran2012-04-19
| |\ \ \ \ \ \
| * | | | | | | Remove TODOsJonathan Duran2012-04-18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com>
| * | | | | | | Add flag for abs/rel positionJonathan Duran2012-04-18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com>
| * | | | | | | FIX for layer selection when adding a keyframe in unselected layerJonathan Duran2012-04-18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com>
| * | | | | | | Merge branch 'refs/heads/timeline-local' into TimelineUberJonathan Duran2012-04-18
| |\ \ \ \ \ \ \ | | | |/ / / / / | | |/| | | | |
| | * | | | | | Timeline: Bug fix: changing layer name didn't save in some circumstances.Jon Reid2012-04-17
| | | | | | | |
| | * | | | | | Timeline: Further fixes to new document/breadcrumb interactions.Jon Reid2012-04-17
| | | | | | | |
| * | | | | | | Merge branch 'refs/heads/NINJAmaster' into TimelineUberJonathan Duran2012-04-18
| |\ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | / | | | |_|_|_|/ | | |/| | | |
| * | | | | | Fix tweens not updating keyframe rulesJonathan Duran2012-04-16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com>
| * | | | | | Timeline: Bug fixes for restoring tweens on new document and breadcrumb.Jon Reid2012-04-13
| | | | | | |
| * | | | | | Timeline: Remove default style track.Jon Reid2012-04-13
| | | | | | |
| * | | | | | Timeline: More bug fixes for document switching.Jon Reid2012-04-13
| | | | | | |
| * | | |