aboutsummaryrefslogtreecommitdiff
path: root/js
Commit message (Collapse)AuthorAge
* Authortime import of 2d & 3d canvaseshwc4872012-03-06
|
* Merge branch 'TimelineUber' of github.com:imix23ways/ninja-internal into ↵hwc4872012-03-06
|\ | | | | | | integration
| * Timeline Fix for layer/element selectionJonathan Duran2012-03-06
| | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com>
| * Support writing and reading of animation duration with millsecondsJonathan Duran2012-03-02
| | | | | | | | | | | | Removed math rounding so that animation durations won't round to full seconds anymore. Signed-off-by: Jonathan Duran <jduran@motorola.com>
| * Timeline Fix timing functionJonathan Duran2012-03-02
| | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com>
| * Timeline: Fix for animation iteration countJonathan Duran2012-03-02
| | | | | | | | | | | | Add default webkit css properties to allow animations with integer iteration counts. Signed-off-by: Jonathan Duran <jduran@motorola.com>
| * Remove console logJonathan Duran2012-03-02
| | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com>
| * CleanupJonathan Duran2012-03-02
| | | | | | | | | | | | remove commented lines Signed-off-by: Jonathan Duran <jduran@motorola.com>
| * Start looping over tweened properties genericallyJonathan Duran2012-03-02
| | | | | | | | | | | | No longer hard coding for top and left properties. Instead, looping over all tweened properties generically and building keyframe strings. Signed-off-by: Jonathan Duran <jduran@motorola.com>
| * Timeline bug fixes and cleanupJonathan Duran2012-03-01
| | | | | | | | | | | | Deselect tweens on every selection change. Replace JS alerts with console logs. Cleanup obsolete models and references. Signed-off-by: Jonathan Duran <jduran@motorola.com>
| * Fix for selection change event handlerJonathan Duran2012-03-01
| | | | | | | | | | | | event handler wasn't being executed because of incorrect handler function name Signed-off-by: Jonathan Duran <jduran@motorola.com>
| * Merge branch 'refs/heads/Timeline-local' into TimelineUberJonathan Duran2012-03-01
| |\
| | * Timeline: Merge arrlayers and arrtracks into one object.Jon Reid2012-03-01
| | | | | | | | | | | | Redefine collapser to use property binding instead of events.
| * | Merge branch 'refs/heads/NINJAmaster' into TimelineJonathan Duran2012-03-01
| |\ \ | | |/ | |/|
| | * Merge branch 'refs/heads/master' into stage-fixesValerio Virgillito2012-03-01
| | |\
| | | * Squashed commit of the workspace-bugsValerio Virgillito2012-03-01
| | | | | | | | | | | | | | | | | | | | | | | | - Panels fixes. Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| | * | revert removing the webkit transform from elements.Valerio Virgillito2012-03-01
| | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| | * | stage and elements fixesValerio Virgillito2012-03-01
| | |/ | | | | | | | | | | | | | | | | | | | | | - Resizing the iframe container when resizing the stage - Removing 3d rules from elements when adding them - Adding a name property in the pi Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| | * Merge pull request #88 from mqg734/ToolFixesValerio Virgillito2012-02-29
| | |\ | | | | | | | | Fix for performance issue when moving shapes.
| | * \ Merge branch 'SnapManagerFixes' of https://github.com/mqg734/ninja-internal ↵Valerio Virgillito2012-02-29
| | |\ \ | | | | | | | | | | | | | | | into integration-candidate
| | | * | SnapManager fixes for sag tags.Nivesh Rajbhandari2012-02-29
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| | * | | Merge branch 'integration-candidate' of ↵Valerio Virgillito2012-02-29
| | |\ \ \ | | | | | | | | | | | | | | | | | | github.com:Motorola-Mobility/ninja-internal into integration-candidate
| | | * \ \ Merge pull request #87 from joseeight/FileIO-Build-CandidateValerio Virgillito2012-02-29
| | | |\ \ \ | | | | | | | | | | | | | | Fixes to preview caching issues
| | | | * \ \ Merge branch 'refs/heads/FileIO' into FileIO-Build-CandidateJose Antonio Marquez2012-02-29
| | | | |\ \ \
| | | | | * | | Preview FixJose Antonio Marquez2012-02-29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adding save all logic before preview, temporary fix.
| | | | * | | | Merge branch 'refs/heads/FileIO' into FileIO-Build-CandidateJose Antonio Marquez2012-02-29
| | | | |\| | |
| | | | | * | | Fix: Caching issue with chrome tab APIJose Antonio Marquez2012-02-29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Using window.open to test movie.
| | | | | * | | Making class level url template variableJose Antonio Marquez2012-02-29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Created a class level variable for the URL to be parsed out of the user files.
| | | * | | | | Merge pull request #86 from imix23ways/TimelineValerio Virgillito2012-02-29
| | | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | Timeline
| | | * \ \ \ \ \ Merge pull request #85 from pushkarjoshi/brushtoolValerio Virgillito2012-02-29
| | | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Brushtool
| | | | * | | | | | prevent extremely long path rendering (temporary fix)Pushkar Joshi2012-02-29
| | | | | | | | | |
| | | | * | | | | | changed the registration point of the brush tool icon andPushkar Joshi2012-02-29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | added a temporary check to prevent extremely long brush strokes
| | | | * | | | | | change in comment onlyPushkar Joshi2012-02-29
| | | | | | | | | |
| | | | * | | | | | resample the brush stroke so we don't have gaps if the path is drawn rapidly,Pushkar Joshi2012-02-29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | and, allow to change the stroke color, and, more efficient stroke rendering by drawing translated radial gradients (instead of creating new gradients for each stroke sample)
| | | | * | | | | | Merge branch 'pentool' into brushtoolPushkar Joshi2012-02-28
| | | | |\ \ \ \ \ \
| | | | * \ \ \ \ \ \ Merge branch 'pentool' into brushtoolPushkar Joshi2012-02-24
| | | | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: imports/codemirror/mode/scheme/scheme.js js/tools/BrushTool.js
| | | | * | | | | | | | render the brush stroke as a sequence of rectangles, with each rectangle ↵Pushkar Joshi2012-02-10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | having its own linear gradient
| | | | * | | | | | | | Merge branch 'master' into brushtoolPushkar Joshi2012-02-09
| | | | |\ \ \ \ \ \ \ \
| | | | * | | | | | | | | first phase of simple resampling to prevent tiny segmentsPushkar Joshi2012-02-09
| | | | | | | | | | | | |
| | * | | | | | | | | | | Merge branch 'NiveshColor' of https://github.com/mqg734/ninja-internal into ↵Valerio Virgillito2012-02-29
| | |\ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | integration-candidate
| | | * | | | | | | | | | We need to remove color buttons from the color model when updating the PI ↵Nivesh Rajbhandari2012-02-28
| | | | |_|_|_|_|_|_|/ / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | for selection change. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| | * | | | | | | | | | putting the color panel on top when opening ninjaValerio Virgillito2012-02-28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| | * | | | | | | | | | Merge branch 'nested-selection' of https://github.com/mencio/ninja-internal ↵Valerio Virgillito2012-02-28
| | |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into integration-candidate Conflicts: js/ninja.reel/ninja.html Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| | | * | | | | | | | | | revert changes to the timelineValerio Virgillito2012-02-28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |