aboutsummaryrefslogtreecommitdiff
path: root/js
Commit message (Collapse)AuthorAge
...
| | | * | | | | | | | | | | | | | | | | | 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
| | | * | | | | | | | | | | | | | | | | | | 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
| | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | Merge dhg637 DisabledState into master.Valerio Virgillito2012-03-12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Committing Disabled states for tool-bar, tool-options, viewbar, breadcrumb Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * | | | | | | | | | | | | | | | | | | | | | Committing Disabled states for tool-bar, tool-options, viewbar, breadcrumbArmen Kesablyan2012-03-12
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Armen Kesablyan <armen@motorola.com>
* | | | | | | | | | | | | | | | | | | | | | turn off the fill color for pen tool paths by defaultPushkar Joshi2012-03-13
| | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | Merge branch 'master' into brushtoolPushkar Joshi2012-03-12
|\| | | | | | | | | | | | | | | | | | | | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / |/| | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | reverting old pi dataValerio Virgillito2012-03-09
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * | | | | | | | | | | | | | | | | | | Temp Gradient FixJose Antonio