Commit message (Expand) | Author | Age | |
---|---|---|---|
* | Merge pull request #29 from ericmueller/integration | Jose Antonio Marquez Russo | 2012-03-08 |
|\ | |||
| * | removed an unused parameter to CanvasDataManager | hwc487 | 2012-03-08 |
| * | Commented out code for loading for runtime | hwc487 | 2012-03-08 |
| * | Fix for runtime Radial blur material | hwc487 | 2012-03-08 |
| * | Fixed a few problems with Plasma material. | hwc487 | 2012-03-07 |
| * | File IO | hwc487 | 2012-03-07 |
| * | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into int... | hwc487 | 2012-03-06 |
| |\ | |||
| * | | IO | hwc487 | 2012-03-06 |
| * | | Updated buildShapeModel to set PI and selection values too and also avoid fil... | Nivesh Rajbhandari | 2012-03-06 |
| * | | update the shapeModel after import | hwc487 | 2012-03-06 |
| * | | Authortime import of 2d & 3d canvases | hwc487 | 2012-03-06 |
| * | | Merge branch 'TimelineUber' of github.com:imix23ways/ninja-internal into inte... | hwc487 | 2012-03-06 |
| |\ \ | |||
| | * | | Timeline Fix for layer/element selection | Jonathan Duran | 2012-03-06 |
| | * | | Support writing and reading of animation duration with millseconds | Jonathan Duran | 2012-03-02 |
| | * | | Timeline Fix timing function | Jonathan Duran | 2012-03-02 |
| | * | | Timeline: Fix for animation iteration count | Jonathan Duran | 2012-03-02 |
| | * | | Remove console log | Jonathan Duran | 2012-03-02 |
| | * | | Cleanup | Jonathan Duran | 2012-03-02 |
| | * | | Start looping over tweened properties generically | Jonathan Duran | 2012-03-02 |
| | * | | Timeline bug fixes and cleanup | Jonathan Duran | 2012-03-01 |
| | * | | Fix for selection change event handler | Jonathan Duran | 2012-03-01 |
| | * | | Merge branch 'refs/heads/Timeline-local' into TimelineUber | Jonathan Duran | 2012-03-01 |
| | |\ \ | |||
| | | * | | Timeline: Merge arrlayers and arrtracks into one object. | Jon Reid | 2012-03-01 |
| * | | | | File IO | hwc487 | 2012-03-06 |
| * | | | | Create element models based on nodeName. | Nivesh Rajbhandari | 2012-03-06 |
| * | | | | Corrections for canvas file IO | hwc487 | 2012-03-05 |
| * | | | | WebGL & Canvas2D file IO | hwc487 | 2012-03-05 |
| * | | | | Added more materials/canvas2D drawing to runtime. | hwc487 | 2012-03-05 |
| * | | | | WebGL File IO | hwc487 | 2012-03-02 |
| * | | | | Merge branch 'ToolFixes' of github.com:mqg734/ninja-internal into integration | hwc487 | 2012-02-29 |
| |\ \ \ \ | |||
| * | | | | | WebGL file I/O | hwc487 | 2012-02-29 |
* | | | | | | Image data fix on Open | Jose Antonio Marquez | 2012-03-07 |
* | | | | | | Adding To-do comments for CDN stylesheets | Jose Antonio Marquez | 2012-03-07 |
* | | | | | | Removing temp viewing of CDN styles | Jose Antonio Marquez | 2012-03-07 |
* | | | | | | Merge pull request #99 from joseeight/FileIO-Build-Candidate | Valerio Virgillito | 2012-03-06 |
|\ \ \ \ \ \ | |||
| * \ \ \ \ \ | Merge branch 'refs/heads/FileIO' into FileIO-Build-Candidate | Jose Antonio Marquez | 2012-03-06 |
| |\ \ \ \ \ \ | |||
| | * | | | | | | Adding CDN support for URLs in linked CSS | Jose Antonio Marquez | 2012-03-06 |
| | * | | | | | | Merge branch 'refs/heads/Ninja-Internal' into FileIO | Jose Antonio Marquez | 2012-03-06 |
| | |\ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | | | |||
* | | | | | | | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal | Valerio Virgillito | 2012-03-06 |
|\ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ | |/| | | | | | | |||
| * | | | | | | | Merge pull request #98 from mencio/panels | Valerio Virgillito | 2012-03-06 |
| |\ \ \ \ \ \ \ | |||
| | * \ \ \ \ \ \ | Merge branch 'refs/heads/master' into panels | Valerio Virgillito | 2012-03-06 |
| | |\ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | | | |||
| | * | | | | | | | Merge branch 'refs/heads/master' into panels | Valerio Virgillito | 2012-03-06 |
| | |\ \ \ \ \ \ \ | |||
| | * | | | | | | | | Adding drag and drop | Valerio Virgillito | 2012-03-05 |
| | * | | | | | | | | remove console log | Valerio Virgillito | 2012-03-05 |
| | * | | | | | | | | removing repetition from the panel container and using a static list of panels. | Valerio Virgillito | 2012-03-05 |
* | | | | | | | | | | Squashed commit FileIO-Build-Candidate into Master | Valerio Virgillito | 2012-03-06 |
|/ / / / / / / / / | |||
* | / / / / / / / | Fixing WebGL not available bug | Jose Antonio Marquez | 2012-03-06 |
| |/ / / / / / / |/| | | | | | | | |||
| | | * | | | | | Fixing WebGL not available bug | Jose Antonio Marquez | 2012-03-06 |
| | | * | | | | | Merge branch 'refs/heads/Ninja-Internal' into FileIO | Jose Antonio Marquez | 2012-03-06 |
| | | |\ \ \ \ \ | |_|_|/ / / / / |/| | | | | | | | |||
* | | | | | | | | Squashed commit of preload-fix into Master | Valerio Virgillito | 2012-03-06 |
|/ / / / / / / |