aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAge
* Merge pull request #29 from ericmueller/integrationJose Antonio Marquez Russo2012-03-08
|\
| * 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 int...hwc4872012-03-06
| |\
| * | IOhwc4872012-03-06
| * | Updated buildShapeModel to set PI and selection values too and also avoid fil...Nivesh Rajbhandari2012-03-06
| * | 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 inte...hwc4872012-03-06
| |\ \
| | * | Timeline Fix for layer/element selectionJonathan Duran2012-03-06
| | * | Support writing and reading of animation duration with millsecondsJonathan Duran2012-03-02
| | * | Timeline Fix timing functionJonathan Duran2012-03-02
| | * | Timeline: Fix for animation iteration countJonathan Duran2012-03-02
| | * | Remove console logJonathan Duran2012-03-02
| | * | CleanupJonathan Duran2012-03-02
| | * | Start looping over tweened properties genericallyJonathan Duran2012-03-02
| | * | Timeline bug fixes and cleanupJonathan Duran2012-03-01
| | * | Fix for selection change event handlerJonathan Duran2012-03-01
| | * | Merge branch 'refs/heads/Timeline-local' into TimelineUberJonathan Duran2012-03-01
| | |\ \
| | | * | Timeline: Merge arrlayers and arrtracks into one object.Jon Reid2012-03-01
| * | | | File IOhwc4872012-03-06
| * | | | Create element models based on nodeName.Nivesh Rajbhandari2012-03-06
| * | | | 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
* | | | | | Adding To-do comments for CDN stylesheetsJose Antonio Marquez2012-03-07
* | | | | | Removing temp viewing of CDN stylesJose Antonio Marquez2012-03-07
* | | | | | Merge pull request #99 from joseeight/FileIO-Build-CandidateValerio Virgillito2012-03-06
|\ \ \ \ \ \
| * \ \ \ \ \ 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
| | |\ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | |
* | | | | | | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internalValerio Virgillito2012-03-06
|\ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ | |/| | | | | |
| * | | | | | | Merge pull request #98 from mencio/panelsValerio Virgillito2012-03-06
| |\ \ \ \ \ \ \
| | * \ \ \ \ \ \ 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
| | * | | | | | | | remove console logValerio Virgillito2012-03-05
| | * | | | | | | | removing repetition from the panel container and using a static list of panels.Valerio Virgillito2012-03-05
* | | | | | | | | | Squashed commit FileIO-Build-Candidate into MasterValerio Virgillito2012-03-06
|/ / / / / / / / /
* | / / / / / / / Fixing WebGL not available bugJose Antonio Marquez2012-03-06
| |/ / / / / / / |/| | | | | | |
| | | * | | | | Fixing WebGL not available bugJose Antonio Marquez2012-03-06
| | | * | | | | Merge branch 'refs/heads/Ninja-Internal' into FileIOJose Antonio Marquez2012-03-06
| | | |\ \ \ \ \ | |_|_|/ / / / / |/| | | | | | |
* | | | | | | | Squashed commit of preload-fix into MasterValerio Virgillito2012-03-06
|/ / / / / / /