Commit message (Collapse) | Author | Age | |
---|---|---|---|
* | Fixing merge issues | hwc487 | 2012-05-14 |
| | |||
* | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into ↵ | hwc487 | 2012-05-11 |
|\ | | | | | | | | | | | | | | | | | Textures Conflicts: js/lib/geom/geom-obj.js js/lib/geom/rectangle.js js/tools/TagTool.js | ||
| * | Converting geom-obj to object literal notation. | Nivesh Rajbhandari | 2012-05-02 |
| | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
* | | Updated hard-coded linear and radial gradients to use the color values in ↵ | Nivesh Rajbhandari | 2012-05-03 |
|/ | | | | | | Linear/RadialGradientMaterials. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
* | canvas interaction | hwc487 | 2012-04-23 |
| | |||
* | Switching to Linear/RadialGradient materials will set the corresponding ↵ | Nivesh Rajbhandari | 2012-04-02 |
| | | | | | | color. Also, dispatching an addElement event when toggling shape from WebGL/canvas2d so timeline can draw correctly. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
* | Update PI and Color Panel to reflect default LinearGradient and ↵ | Nivesh Rajbhandari | 2012-03-30 |
| | | | | | | RadialGradient materials' colors. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
* | Updated shapes to always check for its stroke and fill colors and materials ↵ | Nivesh Rajbhandari | 2012-03-29 |
| | | | | | | instead of relying on the shapeModel cache because it can get out of sync. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
* | Squashed commit of preload-fix into Master | Valerio Virgillito | 2012-03-06 |
| | | | | | | | - Requiring all the previously pre-loaded files - RDGE, Codemirror and gl-matrix are not included via a script tag. Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
* | Last-used material (instead of FlatMaterial) is applied to shape when ↵ | Nivesh Rajbhandari | 2012-02-29 |
| | | | | | | turning on use WebGL checkbox in the PI. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
* | Merge branch 'refs/heads/NinjaInternal' into FileIO | Jose Antonio Marquez | 2012-02-08 |
|\ | |||
| * | Updated tools and PI to get/set materials by binding to appModel's materials ↵ | Nivesh Rajbhandari | 2012-02-07 |
| | | | | | | | | | | | | property. This requires us to add FlatMaterial to the list of materials in the MaterialsLibrary. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
| * | Support use WebGL checkbox in the PI. | Nivesh Rajbhandari | 2012-02-06 |
| | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
* | | Merge branch 'refs/heads/NinjaInternal' into FileIO | Jose Antonio Marquez | 2012-02-06 |
|\| | |||
| * | Updated color code in the PI to go through element mediator. | Nivesh Rajbhandari | 2012-02-01 |
| | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
* | | Merged old FileIO | Jose Antonio Marquez | 2012-01-27 |
|/ | |||
* | First commit of Ninja to ninja-internal | Pierre Frisch | 2012-01-27 |
Signed-off-by: Valerio Virgillito <rmwh84@motorola.com> |