aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* Update master track on duration change instead of tween add.Jonathan Duran2012-03-01
| | | | | | Adds support for updating the master track duration on file open as well as when adding tweens to already opened files. Signed-off-by: Jonathan Duran <jduran@motorola.com>
* Timeline: Track Duration FixJonathan Duran2012-03-01
| | | | | Signed-off-by: Kruti Shah <kruti.shah@motorola.com> Signed-off-by: Jonathan Duran <jduran@motorola.com>
* Merge branch 'refs/heads/NINJAmaster' into TimelineJonathan Duran2012-03-01
|\
| * Merge branch 'refs/heads/integration-candidate'Valerio Virgillito2012-02-29
| |\
| | * Merge pull request #88 from mqg734/ToolFixesValerio Virgillito2012-02-29
| | |\ | | | | | | | | Fix for performance issue when moving shapes.
| | | * Fix for performance issue when moving shapes. We don't need to call render ↵Nivesh Rajbhandari2012-02-29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | except if the geometry and materials change. This is more easy to see with shapes like the brush tool. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| | * | Merge branch 'SnapManagerFixes' of https://github.com/mqg734/ninja-internal ↵Valerio Virgillito2012-02-29
| | |\ \ | | | | | | | | | | | | | | | into integration-candidate
| | * \ \ 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-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
| | | | |\ \ \ \ \ \ \ \ \
| | | | * \ \ \ \ \ \ \ \ \ Merge branch 'pentool' 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>
| * | | | | | | | | | | | | | Merge pull request #84 from mqg734/SnapManagerFixesValerio Virgillito2012-02-29
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / / / / | |/| | | | | | | | | | | / / | | | |_|_|_|_|_|_|_|_|_|/ / | | |/| | | | | | | | | | | SnapManager fixes for svg tags.
| | * | | | | | | | | | | | SnapManager fixes for sag tags.Nivesh Rajbhandari2012-02-29
| |/ / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
* | | | | | | | | | | | | Squashed commit of the following:Jonathan Duran2012-02-29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |