| Commit message (Collapse) | Author | Age | |
|---|---|---|---|
| * | Merge branch 'refs/heads/NINJAmaster' into Timeline | Jonathan Duran | 2012-03-01 |
| |\ | |||
| | * | Merge pull request #91 from mayhewinator/WorkingBranch | mayhewinator | 2012-03-01 |
| | |\ | | | | | | | updated name in our manifest and incremented base build number | ||
| | | * | updated name in our manifest and incremented base build number | John Mayhew | 2012-03-01 |
| | |/ | |||
| | * | Merge pull request #90 from mencio/stage-fixes | Valerio Virgillito | 2012-03-01 |
| | |\ | | | | | | | Stage fixes | ||
| | | * | Merge branch 'refs/heads/master' into stage-fixes | Valerio Virgillito | 2012-03-01 |
| | | |\ | | |/ | |/| | |||
| | * | | Squashed commit of the workspace-bugs | Valerio Virgillito | 2012-03-01 |
| | | | | | | | | | | | | | | | | | | | - Panels fixes. Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| | | * | Merge branch 'stage-fixes' of github.com:mencio/ninja-internal into stage-fixes | Valerio Virgillito | 2012-03-01 |
| | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: js/tools/TagTool.js Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| | | | * | revert removing the webkit transform from elements. | Valerio Virgillito | 2012-03-01 |
| | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| | | * | | revert removing the webkit transform from elements. | Valerio Virgillito | 2012-03-01 |
| | | |/ | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| | | * | stage and elements fixes | Valerio Virgillito | 2012-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 branch 'Timeline-main' into Timeline-local | Jon Reid | 2012-03-01 |
| |\ \ | |||
| | * | | Set doc dirty flag when adding tweens or modifying animations | Jonathan Duran | 2012-03-01 |
| | | | | | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com> | ||
| | * | | Update master track on duration change instead of tween add. | Jonathan Duran | 2012-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 Fix | Jonathan Duran | 2012-03-01 |
| | | | | | | | | | | | | | | | | Signed-off-by: Kruti Shah <kruti.shah@motorola.com> Signed-off-by: Jonathan Duran <jduran@motorola.com> | ||
| * | | | Timeline: efficiency improvements to collapser. Document switching. | Jon Reid | 2012-03-01 |
| | | | | |||
| * | | | Timeline: Merge. Set collapser heights. | Jon Reid | 2012-03-01 |
| | | | | |||
| * | | | Merge branch 'Timeline-main' into Timeline-newdoc | Jon Reid | 2012-03-01 |
| |\| | | |||
| | * | | Merge branch 'refs/heads/NINJAmaster' into Timeline | Jonathan Duran | 2012-03-01 |
| | |\| | |||
| | | * | Merge branch 'refs/heads/integration-candidate' | Valerio Virgillito | 2012-02-29 |
| | | |\ | |||
| | | | * | Merge pull request #88 from mqg734/ToolFixes | Valerio Virgillito | 2012-02-29 |
| | | | |\ | | | | | | | | | | | Fix for performance issue when moving shapes. | ||
| | | | | * | Fix for performance issue when moving shapes. We don't need to call render ↵ | Nivesh Rajbhandari | 2012-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 Virgillito | 2012-02-29 |
| | | | |\ \ | | | | | | | | | | | | | | | | | | | into integration-candidate | ||
| | | | * \ \ | Merge branch 'integration-candidate' of ↵ | Valerio Virgillito | 2012-02-29 |
| | | | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | github.com:Motorola-Mobility/ninja-internal into integration-candidate | ||
| | | | | * \ \ | Merge pull request #87 from joseeight/FileIO-Build-Candidate | Valerio Virgillito | 2012-02-29 |
| | | | | |\ \ \ | | | | | | | | | | | | | | | | | Fixes to preview caching issues | ||
| | | | | | * \ \ | Merge branch 'refs/heads/FileIO' into FileIO-Build-Candidate | Jose Antonio Marquez | 2012-02-29 |
| | | | | | |\ \ \ | |||
| | | | | | | * | | | Preview Fix | Jose Antonio Marquez | 2012-02-29 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adding save all logic before preview, temporary fix. | ||
| | | | | | * | | | | Merge branch 'refs/heads/FileIO' into FileIO-Build-Candidate | Jose Antonio Marquez | 2012-02-29 |
| | | | | | |\| | | | |||
| | | | | | | * | | | Fix: Caching issue with chrome tab API | Jose Antonio Marquez | 2012-02-29 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Using window.open to test movie. | ||
| | | | | | | * | | | Making class level url template variable | Jose Antonio Marquez | 2012-02-29 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Created a class level variable for the URL to be parsed out of the user files. | ||
| | | | | * | | | | | Merge pull request #86 from imix23ways/Timeline | Valerio Virgillito | 2012-02-29 |
| | | | | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | Timeline | ||
| | | | | * \ \ \ \ \ | Merge pull request #85 from pushkarjoshi/brushtool | Valerio Virgillito | 2012-02-29 |
| | | | | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | Brushtool | ||
| | | | | | * | | | | | | prevent extremely long path rendering (temporary fix) | Pushkar Joshi | 2012-02-29 |
| | | | | | | | | | | | | |||
| | | | | | * | | | | | | changed the registration point of the brush tool icon and | Pushkar Joshi | 2012-02-29 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | added a temporary check to prevent extremely long brush strokes | ||
| | | | | | * | | | | | | change in comment only | Pushkar Joshi | 2012-02-29 |
| | | | | | | | | | | | | |||
| | | | | | * | | | | | | resample the brush stroke so we don't have gaps if the path is drawn rapidly, | Pushkar Joshi | 2012-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 brushtool | Pushkar Joshi | 2012-02-28 |
| | | | | | |\ \ \ \ \ \ | |||
| | | | | | * \ \ \ \ \ \ | Merge branch 'pentool' into brushtool | Pushkar Joshi | 2012-02-28 |
| | | | | | |\ \ \ \ \ \ \ | |||
| | | | | | * \ \ \ \ \ \ \ | Merge branch 'pentool' into brushtool | Pushkar Joshi | 2012-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 Joshi | 2012-02-10 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | having its own linear gradient | ||
| | | | | | * | | | | | | | | | Merge branch 'master' into brushtool | Pushkar Joshi | 2012-02-09 |
| | | | | | |\ \ \ \ \ \ \ \ \ | |||
| | | | | | * \ \ \ \ \ \ \ \ \ | Merge branch 'pentool' into brushtool | Pushkar Joshi | 2012-02-09 |
| | | | | | |\ \ \ \ \ \ \ \ \ \ | |||
| | | | | | * | | | | | | | | | | | first phase of simple resampling to prevent tiny segments | Pushkar Joshi | 2012-02-09 |
| | | | | | | | | | | | | | | | | | |||
| | | | * | | | | | | | | | | | | | Merge branch 'NiveshColor' of https://github.com/mqg734/ninja-internal into ↵ | Valerio Virgillito | 2012-02-29 |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | integration-candidate | ||
| | | | | * | | | | | | | | | | | | We need to remove color buttons from the color model when updating the PI ↵ | Nivesh Rajbhandari | 2012-02-28 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | for selection change. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
| | | * | | | | | | | | | | | | | | Merge pull request #84 from mqg734/SnapManagerFixes | Valerio Virgillito | 2012-02-29 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / / / | |||