| Commit message (Collapse) | Author | Age | |
|---|---|---|---|
| * | Merge branch 'refs/heads/NinjaInternal' into Color | Jose Antonio Marquez | 2012-02-17 |
| |\ | |||
| | * | Adding a data-RDGE-id attribute to each canvas to save/load canvas data | Valerio Virgillito | 2012-02-16 |
| | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| * | | Merge branch 'refs/heads/NinjaInternal' into Color | Jose Antonio Marquez | 2012-02-15 |
| |\| | |||
| | * | Merge branch 'refs/heads/NinjaInternal' into FileIO | Jose Antonio Marquez | 2012-02-11 |
| | |\ | | | | | | | | | | | | | Conflicts: js/ninja.reel/ninja.html | ||
| | * \ | Merge branch 'refs/heads/NinjaInternal' into FileIO | Jose Antonio Marquez | 2012-02-09 |
| | |\ \ | |||
| | * \ \ | Merge branch 'refs/heads/NinjaInternal' into FileIO | Jose Antonio Marquez | 2012-02-08 |
| | |\ \ \ | |||
| | * \ \ \ | Merge branch 'refs/heads/NinjaInternal' into FileIO | Jose Antonio Marquez | 2012-02-06 |
| | |\ \ \ \ | |||
| | * \ \ \ \ | Merge branch 'refs/heads/NinjaInternal' into FileIO | Jose Antonio Marquez | 2012-02-02 |
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: .gitignore js/ninja.reel/ninja.js | ||
| | * | | | | | | Merged old FileIO | Jose Antonio Marquez | 2012-01-27 |
| | | | | | | | | |||
| * | | | | | | | Merge branch 'refs/heads/NinjaInternal' into Color | Jose Antonio Marquez | 2012-02-11 |
| |\ \ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | | | |||
| | * | | | | | | Support export/import of GLLine data. | Nivesh Rajbhandari | 2012-02-10 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
| | * | | | | | | Fixed switching between webGL and canvas 2d modes. | Nivesh Rajbhandari | 2012-02-09 |
| | | |_|_|_|/ | |/| | | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
| | * | | | | | Fixed several typos in Materials import/export code to support toggling ↵ | Nivesh Rajbhandari | 2012-02-08 |
| | | |_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | between 2d and 3d shape modes. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
| * | | | | | Merge branch 'refs/heads/NinjaInternal' into Color | Jose Antonio Marquez | 2012-02-08 |
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: js/controllers/elements/shapes-controller.js js/data/pi/pi-data.js js/panels/properties/content.reel/content.js | ||
| | * | | | | Fixing some typos and undeclared variables in GLRectangle and ShapesController. | Nivesh Rajbhandari | 2012-02-07 |
| | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
| | * | | | | Supporting switching materials in the PI. Also, moved makeFillMaterial and ↵ | Nivesh Rajbhandari | 2012-02-07 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | makeStrokeMaterial functions into GLGeomObj so shapes other than GLRectangle can use these routines. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
| | * | | | | Fixed PI to support WebGL materials. | Nivesh Rajbhandari | 2012-02-07 |
| | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
| | * | | | | Force layout canvas and SelectionController to update their info when a 2d ↵ | Nivesh Rajbhandari | 2012-02-06 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | canvas is replaced by a 3d canvas (and vice-versa). Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
| | * | | | | Support toggling between 2d and 3d canvas context. This requires us to ↵ | Nivesh Rajbhandari | 2012-02-06 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | create a new canvas with all the same values as the canvas being replaced and copying over all the shape data. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
| | * | | | | Add enabled property for ComboBox to support enabling/disabling materials ↵ | Nivesh Rajbhandari | 2012-02-06 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | dropdowns in the PI. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
| | * | | | | Allow users to switch between 2d and webGL mode. Note that this doesn't ↵ | Nivesh Rajbhandari | 2012-02-06 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | currently work. 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/NiveshColor' into ToolFixes | Nivesh Rajbhandari | 2012-02-03 |
| | |\ \ \ | |/ / / |/| | / | | |/ | |/| | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
| | * | | Updating Shapes PI to support corner radii. Also fixed PI bug where we were ↵ | Nivesh Rajbhandari | 2012-02-02 |
| | |/ | | | | | | | | | | | always updating custom section 0. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
| * | | Updated color code in the PI to go through element mediator. | Nivesh Rajbhandari | 2012-02-01 |
| | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
| * | | Updated color code to handle shapes. | Nivesh Rajbhandari | 2012-01-31 |
| |/ | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
| * | First commit of Ninja to ninja-internal | Pierre Frisch | 2012-01-27 |
| Signed-off-by: Valerio Virgillito <rmwh84@motorola.com> | |||