| Commit message (Collapse) | Author | Age | ||
|---|---|---|---|---|
| ... | ||||
| | * | | | Reverting change for IKNinja-1355 because it is causing line tool to fail. | Nivesh Rajbhandari | 2012-03-27 | |
| | | |/ | |/| | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | |||
| * | | | Merge branch 'refs/heads/ninja-internal' into WebGLMaterials | Nivesh Rajbhandari | 2012-03-27 | |
| |\| | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | |||
| | * | | Fixed a problem switching from 3D to 2D and back to 3D. | hwc487 | 2012-03-23 | |
| | | | | ||||
| | * | | Respect play/pause WebGL animation when saving files and re-rendering caused ↵ | Nivesh Rajbhandari | 2012-03-23 | |
| | | | | | | | | | | | | | | | | | | | by geometry changes. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | |||
| | * | | Adding checkbox in PI to start/stop WebGL animation preview. | Nivesh Rajbhandari | 2012-03-22 | |
| | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | |||
| * | | | WebGL needs to have 3d styles to render. | Nivesh Rajbhandari | 2012-03-22 | |
| | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | |||
| * | | | IKNINJA-1370 - Toggle WebGL on/off is no longer working in the PI. | Nivesh Rajbhandari | 2012-03-20 | |
| |/ / | | | | | | | | | | | This bug was injected by some changes in GLWorld.import. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | |||
| * / | Support button control in Properties Panel and use them for edit fill and ↵ | Nivesh Rajbhandari | 2012-03-20 | |
| |/ | | | | | | stroke material. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | |||
| * | gradient support for canvas-2d shapes. | Nivesh Rajbhandari | 2012-03-07 | |
| | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | |||
| * | Gradient support for canvas-2d rectangle. | Nivesh Rajbhandari | 2012-03-07 | |
| | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | |||
| * | preliminary support for setting gradients on webgl shapes. | Nivesh Rajbhandari | 2012-03-07 | |
| | | | | | 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> | |||
| * | Fix for performance issue when moving shapes. We don't need to call render ↵ | Nivesh Rajbhandari | 2012-02-29 | |
| | | | | | | | | | except if the geometry and materials change. This is more easy to see with shapes like the brush tool. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | |||
| * | Merge branch 'refs/heads/ninja-internal' into ToolFixes | Nivesh Rajbhandari | 2012-02-20 | |
| |\ | ||||
| | * | 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 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 | |
| | | | | | | | | ||||
| * | | | | | | | Working around inconsistent color object when getting/setting WebGL values. | Nivesh Rajbhandari | 2012-02-13 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | |||
| * | | | | | | | Updated ink bottle tool to use new setColor routine in the mediator and ↵ | Nivesh Rajbhandari | 2012-02-13 | |
| | |_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | controllers. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | |||
| * | | | | | | 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> | |||
| * | | | | 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> | |||
| | * | | 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> | |||
| * / | 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> | |||
| * | First commit of Ninja to ninja-internal | Pierre Frisch | 2012-01-27 | |
| Signed-off-by: Valerio Virgillito <rmwh84@motorola.com> | ||||