aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
...
| * | | | | | | | Merge branch 'refs/heads/FileIO-jose' into FileIO-ananyaAnanya Sen2012-03-06
| |\ \ \ \ \ \ \ \ | | | |/ / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: js/controllers/selection-controller.js Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
| * | | | | | | | removed unnecessary console logsAnanya Sen2012-03-06
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
| * | | | | | | | IKNINJA-1270: fixed browser crashing when you close a document while playing ↵Ananya Sen2012-03-06
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | a video then wait for a while Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
| * | | | | | | | updated file picker image iconsAnanya Sen2012-03-06
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
| * | | | | | | | - detect document style edit [with Eric's input for styles-controller.js]Ananya Sen2012-03-06
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - integrated save as Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
| * | | | | | | | IKNINJA-1256 fix - needed to convert String object to stringAnanya Sen2012-03-06
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
| * | | | | | | | IKNINJA-1238 fix and fixing other js errors on switching and closing documentsAnanya Sen2012-03-06
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
| * | | | | | | | fixed picker address dropdown to backtrace till the logical driveAnanya Sen2012-03-06
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
| * | | | | | | | IKNINJA-1207: added check for design view to fix js errorAnanya Sen2012-03-06
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
* | | | | | | | | Adding I/O functionality to RDGEJose Antonio Marquez2012-03-08
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added webGL/Canvas file I/O for Ninja, it also created routine for saving data for runtime, however, the runtime RDGE library needs an update for runtime to work, so right now I/O will only work for Ninja.
* | | | | | | | | Merge pull request #29 from ericmueller/integrationJose Antonio Marquez Russo2012-03-08
|\ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / |/| | | | | | | / | | |_|_|_|_|_|/ | |/| | | | | | Integration
| * | | | | | | removed an unused parameter to CanvasDataManagerhwc4872012-03-08
| | | | | | | |
| * | | | | | | Commented out code for loading for runtimehwc4872012-03-08
| | | | | | | |
| * | | | | | | Fix for runtime Radial blur materialhwc4872012-03-08
| | | | | | | |
| * | | | | | | Fixed a few problems with Plasma material.hwc4872012-03-07
| | | | | | | |
| * | | | | | | 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
| |<