aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
...
| * | | | | | | File IOhwc4872012-03-07
| | | | | | | |
| * | | | | | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into ↵hwc4872012-03-06
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | integration Conflicts: js/preloader/Preloader.js
| * | | | | | | | IOhwc4872012-03-06
| | | | | | | | |
| * | | | | | | | Updated buildShapeModel to set PI and selection values too and also avoid ↵Nivesh Rajbhandari2012-03-06
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fill material for lines. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| * | | | | | | | update the shapeModel after importhwc4872012-03-06
| | | | | | | | |
| * | | | | | | | 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.
| * | | | | | | File IOhwc4872012-03-06
| | | | | | | |
| * | | | | | | Create element models based on nodeName.Nivesh Rajbhandari2012-03-06
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| * | | | | | | Corrections for canvas file IOhwc4872012-03-05
| | | | | | | |
| * | | | | | | WebGL & Canvas2D file IOhwc4872012-03-05
| | | | | | | |
| * | | | | | | Added more materials/canvas2D drawing to runtime.hwc4872012-03-05
| | | | | | | |
| * | | | | | | WebGL File IOhwc4872012-03-02
| | | | | | | |
| * | | | | | | Merge branch 'ToolFixes' of github.com:mqg734/ninja-internal into integrationhwc4872012-02-29
| |\ \ \ \ \ \ \
| * | | | | | | | WebGL file I/Ohwc4872012-02-29
| | | | | | | | |
* | | | | | | | | Image data fix on OpenJose Antonio Marquez2012-03-07
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed a bug with data-uris not opening correctly.
* | | | | | | | | Adding To-do comments for CDN stylesheetsJose Antonio Marquez2012-03-07
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Removed inserting CDN styles into head as it was proper because the hierarchy would be lost, and there is no current fast-alternative to achieve a preview.
* | | | | | | | | Removing temp viewing of CDN stylesJose Antonio Marquez2012-03-07
| |_|_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | It's not done correctly, we really need the proxy for this.
* | | | | | | | Merge pull request #99 from joseeight/FileIO-Build-CandidateValerio Virgillito2012-03-06
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ |/| | | | | | | File IO Updates
| * | | | | | | Merge branch 'refs/heads/FileIO' into FileIO-Build-CandidateJose Antonio Marquez2012-03-06
| |\ \ \ \ \ \ \
| | * | | | | | | Adding CDN support for URLs in linked CSSJose Antonio Marquez2012-03-06
| | | | | | | | |
| | * | | | | | | Merge branch 'refs/heads/Ninja-Internal' into FileIOJose Antonio Marquez2012-03-06
| | |\ \ \ \ \ \ \ | |_|/ / / / / / / |/| | | | | | | / | | | |_|_|_|_|/ | | |/| | | | | Conflicts: js/controllers/selection-controller.js
* | | | | | | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internalValerio Virgillito2012-03-06
|\ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ | |/| | | | | |
| * | | | | | | Merge pull request #98 from mencio/panelsValerio Virgillito2012-03-06
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Panels - removing repetition from the panel container and using a static list of panels.
| | * \ \ \ \ \ \ Merge branch 'refs/heads/master' into panelsValerio Virgillito2012-03-06
| | |\ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | |
| | * | | | | | | Merge branch 'refs/heads/master' into panelsValerio Virgillito2012-03-06
| | |\ \ \ \ \ \ \
| | * | | | | | | | Adding drag and dropValerio Virgillito2012-03-05
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| | * | | | | | | | remove console logValerio Virgillito2012-03-05
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| | * | | | | | | | removing repetition from the panel container and using a static list of panels.Valerio Virgillito2012-03-05
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Fixing the bugs associated with the repetition of component and PI problems. Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* | | | | | | | | | Squashed commit FileIO-Build-Candidate into MasterValerio Virgillito2012-03-06