aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
...
| | | | | * | rewrite: currentSelectedContainer -> domContainerValerio Virgillito2012-06-08
| | | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed the currentSelectedContainer by removing bindings and using property change on the current document added the red outline back. Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* | | | | | Remove obsolete absolute/relative options from timeline config menuJonathan Duran2012-06-15
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com>
* | | | | | Hide timeline zoom slider temporarilyJonathan Duran2012-06-15
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com>
* | | | | | remove console logsJonathan Duran2012-06-15
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com>
* | | | | | Fix sub prop re-open for tweensJonathan Duran2012-06-15
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com>
* | | | | | F6 support for keyframesJonathan Duran2012-06-15
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com>
* | | | | | Timeline: fix serialization error.Jon Reid2012-06-14
| | | | | |
* | | | | | Merge branch 'new-easing-menu' into timeline-localJon Reid2012-06-14
|\ \ \ \ \ \
| * | | | | | Timeline: New easing menu.Jon Reid2012-06-14
| | | | | | |
| * | | | | | Merge remote-tracking branch 'ninja-jduran/TimelineUber' into new-easing-menuJon Reid2012-06-14
| |\ \ \ \ \ \
| * | | | | | | Timeline: More work on new easing menu.Jon Reid2012-06-13
| | | | | | | |
| * | | | | | | Timeline: New popup menu for easing choices.Jon Reid2012-06-12
| | | | | | | |
* | | | | | | | Merge remote-tracking branch 'ninja-jduran/TimelineUber' into Timeline-localJon Reid2012-06-14
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| / / / / / / | |/ / / / / /
| * | | | | | Merge pull request #1 from ntfx47/TimelineUberJonathan Duran2012-06-13
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | Timeline uber
| | * | | | | | Fix the broken animationKruti Shah2012-06-12
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Kruti Shah <kruti.shah@motorola.com>
* | | | | | | Merge remote-tracking branch 'ninja-jduran/TimelineUber' into timeline-localJon Reid2012-06-12
|\| | | | | |
| * | | | | | Clean upKruti Shah2012-06-12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Kruti Shah <kruti.shah@motorola.com>
| * | | | | | Merge branch 'refs/heads/TimelineUberjd' into TimelineUberKruti Shah2012-06-12
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: js/controllers/elements/element-controller.js js/document/_toDelete/html-document.js js/panels/Timeline/Layer.reel/Layer.js Signed-off-by: Kruti Shah <kruti.shah@motorola.com>
| | * | | | | | remove unneeded serializationJonathan Duran2012-06-12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com>
| | * | | | | | montage v10 serialization updates for timelineJonathan Duran2012-06-12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com> Conflicts: js/panels/Timeline/TimelineTrack.reel/TimelineTrack.html js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js Signed-off-by: Jonathan Duran <jduran@motorola.com>
| | * | | | | | remove some console logs and simply the prop tween retrieval conditionsJonathan Duran2012-06-12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com>
| | * | | | | | Squashed commit of the following:Jonathan Duran2012-06-11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | commit 8e98ce012f55576ddb979969a3a1d834301af0c7 Author: Jon Reid <tjh487@motorola.com> Date: Fri Jun 8 18:08:38 2012 -0700 Timeline: New feature: Only one easing menu can be open at a time. Signed-off-by: Jonathan Duran <jduran@motorola.com>
| | * | | | | | Merge branch 'refs/heads/NINJAmaster' into TimelineUberJonathan Duran2012-06-11
| | |\ \ \ \ \ \ | | | | |_|/ / / | | | |/| | | |
| | | * | | | | Merge pull request #285 from joseeight/FileIOValerio Virgillito2012-06-08
| | | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | Remove doc type from files and adding tag check for html
| | | | * | | | | Remove doc type from files and adding tag check for htmlJose Antonio Marquez2012-06-08
| | | | | |_|/ / | | | | |/| | | | | | | | | | | | | | | | | | | Removed the HTML5 doctype from files since it was break the YouTube component, also made a fix to check for the HTML tag to be present when copying attributes.
| | | * | | | | Merge pull request #284 from mencio/timeline-resizer-fixValerio Virgillito2012-06-08
| | | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | IKNINJA-1702: Fix the timeline resized throwing a debugger error
| | | | * | | | | IKNINJA-1702: Fix the timeline resized throwing a debugger error part 2Valerio Virgillito2012-06-08
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| | | | * | | | | Merge branch 'refs/heads/master' into timeline-resizer-fixValerio Virgillito2012-06-08
| | | | |\| | | |
| | | | * | | | | IKNINJA-1702: Fix the timeline resized throwing a debugger errorValerio Virgillito2012-06-07
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| | | * | | | | | Merge pull request #280 from pushkarjoshi/brushtoolValerio Virgillito2012-06-08
| | | |\ \ \ \ \ \ | | | | |_|/ / / / | | | |/| | | | / | | | | | |_|_|/ | | | | |/| | | Brushtool
| | | | * | | | fix compile error that was preventing non-gradient brush strokes from being ↵Pushkar Joshi2012-06-07
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | rendered in runtime
| | | | * | | | change units for smoothing and calligraphic angle in PIPushkar Joshi2012-06-07
| | | | | | | |
| | | | * | | | Merge branch 'master' into brushtoolPushkar Joshi2012-06-07
| | | | |\ \ \ \
| | | | * | | | | change the PI to make it look like the fill color affects the brush stroke colorPushkar Joshi2012-06-07
| | | | | | | | |
| | | | * | | | | enable gradients for brush stroke (in authoring as well as runtime)Pushkar Joshi2012-06-06
| | | | | | | | |
| | | | * | | | | Merge branch 'pentool' into brushtoolPushkar Joshi2012-06-06
| | | | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: assets/canvas-runtime.js
| | | | * \ \ \ \ \ Merge branch 'pentool' into brushtoolPushkar Joshi2012-06-06
| | | | |\ \ \ \ \ \
| | | | * | | | | | | removed repeated declarations in brush stroke runtime classPushkar Joshi2012-06-04
| | | | | | | | | | |
| | | | * | | | | | | runtime version of the brush stroke (similar to the pen paths, this seems to ↵Pushkar Joshi2012-05-31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | not work unless we run it through the debugger)
| | | | * | | | | | | Merge branch 'pentool' into brushtoolPushkar Joshi2012-05-31
| | | | |\ \ \ \ \ \ \
| | | | * \ \ \ \ \ \ \ Merge branch 'pentool' into brushtoolPushkar Joshi2012-05-22
| | | | |\ \ \ \ \ \ \ \
| | | | * \ \ \ \ \ \ \ \ Merge branch 'master' into brushtoolPushkar Joshi2012-05-22
| | | | |\ \ \ \ \ \ \ \ \
| | | *