| Commit message (Expand) | Author | Age | |
|---|---|---|---|
| * | Merge branch 'refs/heads/ToolFixes' into WebGLMaterials | Nivesh Rajbhandari | 2012-02-22 |
| |\ | |||
| | * | Merge branch 'refs/heads/ninja-internal' into ToolFixes | Nivesh Rajbhandari | 2012-02-22 |
| | |\ | |||
| | * | | Fixing eyedropper tool to get color from image data. This required us to work... | Nivesh Rajbhandari | 2012-02-22 |
| * | | | Do not use color object for stage's border since we don't allow users to modi... | Nivesh Rajbhandari | 2012-02-22 |
| * | | | Color chips expect a color object, not a css value. | Nivesh Rajbhandari | 2012-02-22 |
| * | | | Merge branch 'refs/heads/ninja-internal' into WebGLMaterials | Nivesh Rajbhandari | 2012-02-22 |
| |\ \ \ | |/ / |/| / | |/ | |||
| | * | enabling nested selection | Valerio Virgillito | 2012-02-20 |
| * | | Merge branch 'refs/heads/ninja-internal' into ToolFixes | Nivesh Rajbhandari | 2012-02-20 |
| |\| | |||
| | * | Merge branch 'refs/heads/master' into components | Valerio Virgillito | 2012-02-16 |
| | |\ | |||
| | | * | Adding a data-RDGE-id attribute to each canvas to save/load canvas data | Valerio Virgillito | 2012-02-16 |
| | * | | Merge branch 'refs/heads/master' into components | Valerio Virgillito | 2012-02-15 |
| | |\| | |||
| | | * | Merge branch 'live-preview-fix' of https://github.com/mencio/ninja-internal i... | Valerio Virgillito | 2012-02-14 |
| | | |\ | |||
| | | * \ | Merge branch 'components' of https://github.com/mencio/ninja-internal into in... | Valerio Virgillito | 2012-02-14 |
| | | |\ \ | |||
| | | * \ \ | Merge branch 'refs/heads/NinjaInternal' into FileIO | Jose Antonio Marquez | 2012-02-13 |
| | | |\ \ \ | |||
| | | * \ \ \ | Merge branch 'refs/heads/NinjaInternal' into FileIO | Jose Antonio Marquez | 2012-02-11 |
| | | |\ \ \ \ | |||
| | | * \ \ \ \ | 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 |
| | | |\ \ \ \ \ \ \ \ | |||
| | | * | | | | | | | | | Updated canvas controller to override setProperties so we don't set styles wh... | Nivesh Rajbhandari | 2012-01-29 |
| | | * | | | | | | | | | Merged old FileIO | Jose Antonio Marquez | 2012-01-27 |
| | * | | | | | | | | | | Adding more components pi | Valerio Virgillito | 2012-02-15 |
| | * | | | | | | | | | | fixing the controller to handle all properties | Valerio Virgillito | 2012-02-14 |
| | * | | | | | | | | | | Merge branch 'refs/heads/master' into components | Valerio Virgillito | 2012-02-14 |
| | |\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|/ / | |/| | | | | | | | / | | | |_|_|_|_|_|_|/ | | |/| | | | | | | | |||
| | * | | | | | | | | | Merge branch 'refs/heads/master' into components | Valerio Virgillito | 2012-02-13 |
| | |\ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|/ | | |/| | | | | | | | |||
| | * | | | | | | | | | Setting defaults and more cleanup | Valerio Virgillito | 2012-02-09 |
| | * | | | | | | | | | Merge branch 'refs/heads/master' into components | Valerio Virgillito | 2012-02-09 |
| | |\ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|/ / | | |/| | | | | | | | |||
| | * | | | | | | | | | Merge branch 'refs/heads/master' into components | Valerio Virgillito | 2012-02-08 |
| | |\ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|/ / | | |/| | | | | | | | |||
| | * | | | | | | | | | Merge branch 'master' into components | Valerio Virgillito | 2012-02-06 |
| | |\ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|/ / | | |/| | | | | | | | |||
| | * | | | | | | | | | button component using json data | Valerio Virgillito | 2012-02-03 |
| | * | | | | | | | | | Merge branch 'master' into components | Valerio Virgillito | 2012-02-03 |
| | |\ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|/ / | | |/| | | | | | | | |||
| | * | | | | | | | | | Simple button native widget test. Added a controller, pi and panel code. | Valerio Virgillito | 2012-02-01 |
| * | | | | | | | | | | Merge branch 'refs/heads/ninja-internal' into ToolFixes | Nivesh Rajbhandari | 2012-02-14 |
| |\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / / | |/| | | | | | | | | |||
| | * | | | | | | | | | Fixing the live preview background issue. | Valerio Virgillito | 2012-02-14 |
| | | |_|_|_|_|/ / / | |/| | | | | | | | |||
| * | | | | | | | | | Merge branch 'refs/heads/ninja-internal' into ToolFixes | Nivesh Rajbhandari | 2012-02-14 |
| |\| | | | | | | | | |||
| | * | | | | | | | | Cleaning up the stage background color chip. | Valerio Virgillito | 2012-02-13 |
| | * | | | | | | | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into sta... | Valerio Virgillito | 2012-02-12 |
| | |\ \ \ \ \ \ \ \ | | | |_|_|_|_|_|/ | | |/| | | | | | | |||
| | * | | | | | | | | initial color chip for the stage | Valerio Virgillito | 2012-02-10 |
| | | |_|_|_|_|/ / | |/| | | | | | | |||
| * | | | | | | | | Working around inconsistent color object when getting/setting WebGL values. | Nivesh Rajbhandari | 2012-02-13 |
| * | | | | | | | | Updated ink bottle tool to use new setColor routine in the mediator and contr... | Nivesh Rajbhandari | 2012-02-13 |
| | |/ / / / / / |/| | | | | | | |||
| * | | | | | | | Support export/import of GLLine data. | Nivesh Rajbhandari | 2012-02-10 |
| * | | | | | | | Fixed switching between webGL and canvas 2d modes. | Nivesh Rajbhandari | 2012-02-09 |
| |/ / / / / / | |||
| * | | | / / | Fixed several typos in Materials import/export code to support toggling betwe... | Nivesh Rajbhandari | 2012-02-08 |
| | |_|_|/ / |/| | | | | |||
| * | | | | | Fixing some typos and undeclared variables in GLRectangle and ShapesController. | Nivesh Rajbhandari | 2012-02-07 |
| * | | | | | Supporting switching materials in the PI. Also, moved makeFillMaterial and ma... | Nivesh Rajbhandari | 2012-02-07 |
| * | | | | | Fixed PI to support WebGL materials. | Nivesh Rajbhandari | 2012-02-07 |
| * | | | | | Force layout canvas and SelectionController to update their info when a 2d ca... | Nivesh Rajbhandari | 2012-02-06 |
| * | | | | | Support toggling between 2d and 3d canvas context. This requires us to create... | Nivesh Rajbhandari | 2012-02-06 |
| * | | | | | Add enabled property for ComboBox to support enabling/disabling materials dro... | Nivesh Rajbhandari | 2012-02-06 |
| * | | | | | Allow users to switch between 2d and webGL mode. Note that this doesn't curre... | Nivesh Rajbhandari | 2012-02-06 |